diff options
| author |  Peter Krefting <peter@softwolves.pp.se> | 2017-10-11 11:35:11 +0100 |
|---|---|---|
| committer | Peter Krefting <peter@softwolves.pp.se> | 2017-10-11 11:35:34 +0100 |
| commit | 34e65a069f0c9ce7e32ca8300771fcce74ec75e6 (patch) | |
| tree | 0091bb02f69b39a583d77b206b443b825f59d826 /po/sv.po | |
| parent | Merge branch 'master' of https://github.com/vnwildman/git (diff) | |
| download | tgif-34e65a069f0c9ce7e32ca8300771fcce74ec75e6.tar.xz | |
l10n: sv.po: Update Swedish translation (3245t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Diffstat (limited to 'po/sv.po')
| -rw-r--r-- | po/sv.po | 5149 |
1 files changed, 2674 insertions, 2475 deletions
@@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.14.0\n" +"Project-Id-Version: git 2.15.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-07-19 22:35+0200\n" -"PO-Revision-Date: 2017-07-20 22:56+0200\n" +"POT-Creation-Date: 2017-10-08 09:48+0800\n" +"PO-Revision-Date: 2017-10-11 11:31+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.2\n" +"X-Generator: Gtranslator 2.91.7\n" #: advice.c:58 #, c-format @@ -70,7 +70,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:117 builtin/merge.c:1184 +#: advice.c:117 builtin/merge.c:1211 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." @@ -121,82 +121,82 @@ msgstr "okänt alternativ för whitespace: \"%s\"" msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: apply.c:126 +#: apply.c:125 msgid "--reject and --3way cannot be used together." msgstr "--reject och --3way kan inte användas samtidigt." -#: apply.c:128 +#: apply.c:127 msgid "--cached and --3way cannot be used together." msgstr "--cached och --3way kan inte användas samtidigt." -#: apply.c:131 +#: apply.c:130 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: apply.c:142 +#: apply.c:141 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: apply.c:145 +#: apply.c:144 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: apply.c:836 +#: apply.c:845 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: apply.c:845 +#: apply.c:854 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: apply.c:929 +#: apply.c:928 #, c-format msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen på rad %d" -#: apply.c:967 +#: apply.c:966 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d" -#: apply.c:973 +#: apply.c:972 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d" -#: apply.c:974 +#: apply.c:973 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d" -#: apply.c:979 +#: apply.c:978 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d" -#: apply.c:1008 +#: apply.c:1007 #, c-format msgid "invalid mode on line %d: %s" msgstr "ogiltigt läge på rad %d: %s" -#: apply.c:1326 +#: apply.c:1325 #, c-format msgid "inconsistent header lines %d and %d" msgstr "huvudet är inkonsekvent mellan rad %d och %d" -#: apply.c:1498 +#: apply.c:1497 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: apply.c:1567 +#: apply.c:1566 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: apply.c:1587 +#: apply.c:1586 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -212,82 +212,82 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: apply.c:1600 +#: apply.c:1599 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)" -#: apply.c:1770 +#: apply.c:1787 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: apply.c:1772 +#: apply.c:1789 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: apply.c:1806 +#: apply.c:1823 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: apply.c:1843 +#: apply.c:1860 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: apply.c:1845 +#: apply.c:1862 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: apply.c:1848 +#: apply.c:1865 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** varning: filen %s blir tom men har inte tagits bort" -#: apply.c:1995 +#: apply.c:2012 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: apply.c:2032 +#: apply.c:2049 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: apply.c:2193 +#: apply.c:2209 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: apply.c:2276 +#: apply.c:2295 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: apply.c:2280 +#: apply.c:2299 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: apply.c:2933 +#: apply.c:2958 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: apply.c:3052 +#: apply.c:3077 #, 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:3064 +#: apply.c:3089 #, 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:3070 +#: apply.c:3095 #, c-format msgid "" "while searching for:\n" @@ -296,25 +296,25 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: apply.c:3092 +#: apply.c:3117 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: apply.c:3100 +#: apply.c:3125 #, 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:3146 +#: apply.c:3171 #, 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:3156 +#: apply.c:3181 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -322,419 +322,420 @@ msgstr "" "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande " "innehållet." -#: apply.c:3164 +#: apply.c:3189 #, 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:3182 +#: apply.c:3207 #, 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:3195 +#: apply.c:3220 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: apply.c:3201 +#: apply.c:3226 #, 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:3222 +#: apply.c:3247 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: apply.c:3344 +#: apply.c:3369 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277 +#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" -#: apply.c:3400 +#: apply.c:3426 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk" -#: apply.c:3429 apply.c:3669 +#: apply.c:3455 apply.c:3695 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: apply.c:3512 apply.c:3683 +#: apply.c:3538 apply.c:3709 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: apply.c:3521 apply.c:3691 +#: apply.c:3547 apply.c:3717 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: apply.c:3556 +#: apply.c:3582 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:3559 +#: apply.c:3585 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Faller tillbaka på trevägssammanslagning...\n" -#: apply.c:3575 apply.c:3579 +#: apply.c:3601 apply.c:3605 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kunde inte läsa aktuellt innehåll i \"%s\"" -#: apply.c:3591 +#: apply.c:3617 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n" -#: apply.c:3605 +#: apply.c:3631 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Applicerade patchen på \"%s\" med konflikter.\n" -#: apply.c:3610 +#: apply.c:3636 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Tillämpade patchen på \"%s\" rent.\n" -#: apply.c:3636 +#: apply.c:3662 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: apply.c:3708 +#: apply.c:3734 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: apply.c:3710 +#: apply.c:3736 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: apply.c:3860 apply.c:3862 +#: apply.c:3886 apply.c:3888 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg ”%s”" -#: apply.c:3918 +#: apply.c:3944 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: apply.c:3921 +#: apply.c:3947 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: apply.c:3941 +#: apply.c:3967 #, 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:3946 +#: apply.c:3972 #, 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:3966 +#: apply.c:3992 #, 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:3970 +#: apply.c:3996 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: apply.c:3985 +#: apply.c:4011 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: apply.c:4076 +#: apply.c:4102 #, 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:4083 +#: apply.c:4109 #, 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:4086 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller är oanvändbar (%s)." -#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138 +#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: apply.c:4095 +#: apply.c:4121 #, c-format msgid "could not add %s to temporary index" msgstr "kunde inte lägga till %s till temporärt index" -#: apply.c:4105 +#: apply.c:4131 #, c-format msgid "could not write temporary index to %s" msgstr "kunde inte skriva temporärt index till %s" -#: apply.c:4243 +#: apply.c:4269 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: apply.c:4278 +#: apply.c:4304 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: apply.c:4284 +#: apply.c:4310 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: apply.c:4292 +#: apply.c:4318 #, 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:4298 apply.c:4442 +#: apply.c:4324 apply.c:4468 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: apply.c:4339 +#: apply.c:4365 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" -#: apply.c:4343 +#: apply.c:4369 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: apply.c:4413 +#: apply.c:4439 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: apply.c:4511 +#: apply.c:4537 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: apply.c:4519 +#: apply.c:4545 msgid "internal error" msgstr "internt fel" -#: apply.c:4522 +#: apply.c:4548 #, 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:4533 +#: apply.c:4559 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988 +#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" -#: apply.c:4555 +#: apply.c:4581 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: apply.c:4559 +#: apply.c:4585 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4669 +#: apply.c:4695 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4677 +#: apply.c:4703 msgid "unrecognized input" msgstr "indata känns inte igen" -#: apply.c:4696 +#: apply.c:4722 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4833 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4860 +#: apply.c:4886 #, 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:4866 apply.c:4881 +#: apply.c:4892 apply.c:4907 #, 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:4874 +#: apply.c:4900 #, 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:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391 +#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 -#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187 -#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 -#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 +#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259 +#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187 +#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622 +#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212 #: git-add--interactive.perl:197 msgid "path" msgstr "sökväg" -#: apply.c:4922 +#: apply.c:4948 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:4925 +#: apply.c:4951 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:4927 builtin/am.c:2266 +#: apply.c:4953 builtin/am.c:2265 msgid "num" msgstr "antal" -#: apply.c:4928 +#: apply.c:4954 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:4931 +#: apply.c:4957 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:4933 +#: apply.c:4959 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:4937 +#: apply.c:4963 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:4939 +#: apply.c:4965 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:4941 +#: apply.c:4967 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:4943 +#: apply.c:4969 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:4945 +#: apply.c:4971 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:4947 +#: apply.c:4973 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:4949 +#: apply.c:4975 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:4951 +#: apply.c:4977 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:4953 +#: apply.c:4979 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515 +#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: apply.c:4958 +#: apply.c:4984 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:4959 builtin/am.c:2245 +#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95 +#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 msgid "action" msgstr "åtgärd" -#: apply.c:4960 +#: apply.c:4986 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:4963 apply.c:4966 +#: apply.c:4989 apply.c:4992 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:4969 +#: apply.c:4995 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:4971 +#: apply.c:4997 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:4973 +#: apply.c:4999 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:4975 +#: apply.c:5001 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21 -#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651 -#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125 +#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21 +#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640 +#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "var pratsam" -#: apply.c:4978 +#: apply.c:5004 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:4981 +#: apply.c:5007 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:4983 builtin/am.c:2254 +#: apply.c:5009 builtin/am.c:2253 msgid "root" msgstr "rot" -#: apply.c:4984 +#: apply.c:5010 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" @@ -757,108 +758,108 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300 +#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" -#: archive.c:418 +#: archive.c:436 msgid "fmt" msgstr "fmt" -#: archive.c:418 +#: archive.c:436 msgid "archive format" msgstr "arkivformat" -#: archive.c:419 builtin/log.c:1446 +#: archive.c:437 builtin/log.c:1452 msgid "prefix" msgstr "prefix" -#: archive.c:420 +#: archive.c:438 msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 -#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080 -#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552 -#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859 +#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" msgstr "fil" -#: archive.c:422 builtin/archive.c:89 +#: archive.c:440 builtin/archive.c:89 msgid "write the archive to this file" msgstr "skriv arkivet till filen" -#: archive.c:424 +#: archive.c:442 msgid "read .gitattributes in working directory" msgstr "läs .gitattributes i arbetskatalogen" -#: archive.c:425 +#: archive.c:443 msgid "report archived files on stderr" msgstr "rapportera arkiverade filer på standard fel" -#: archive.c:426 +#: archive.c:444 msgid "store only" msgstr "endast spara" -#: archive.c:427 +#: archive.c:445 msgid "compress faster" msgstr "komprimera snabbare" -#: archive.c:435 +#: archive.c:453 msgid "compress better" msgstr "komprimera bättre" -#: archive.c:438 +#: archive.c:456 msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108 -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109 +#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001 msgid "repo" msgstr "arkiv" -#: archive.c:441 builtin/archive.c:91 +#: archive.c:459 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488 +#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 msgid "command" msgstr "kommando" -#: archive.c:443 builtin/archive.c:93 +#: archive.c:461 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "sökväg till kommandot git-upload-archive på fjärren" -#: archive.c:450 +#: archive.c:468 msgid "Unexpected option --remote" msgstr "Oväntad flagga --remote" -#: archive.c:452 +#: archive.c:470 msgid "Option --exec can only be used together with --remote" msgstr "Flaggan --exec kan endast användas tillsammans med --remote" -#: archive.c:454 +#: archive.c:472 msgid "Unexpected option --output" msgstr "Oväntad flagga --output" -#: archive.c:476 +#: archive.c:494 #, c-format msgid "Unknown archive format '%s'" msgstr "Okänt arkivformat \"%s\"" -#: archive.c:483 +#: archive.c:501 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumentet stöd inte för formatet \"%s\": -%d" -#: attr.c:214 +#: attr.c:218 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%-*s är inte ett giltigt namn på attribut" -#: attr.c:410 +#: attr.c:415 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -936,31 +937,31 @@ msgstr "" msgid "Bisecting: a merge base must be tested\n" msgstr "Bisect: en sammanslagningsbas måste testas\n" -#: bisect.c:849 +#: bisect.c:850 #, c-format msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256 +#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: bisect.c:917 +#: bisect.c:918 #, c-format msgid "could not read file '%s'" msgstr "kunde inte läsa filen \"%s\"" -#: bisect.c:947 +#: bisect.c:948 msgid "reading bisect refs failed" msgstr "misslyckades läsa bisect-referenser" -#: bisect.c:967 +#: bisect.c:968 #, c-format msgid "%s was both %s and %s\n" msgstr "%s var både %s och %s\n" -#: bisect.c:975 +#: bisect.c:976 #, c-format msgid "" "No testable commit found.\n" @@ -969,7 +970,7 @@ msgstr "" "Ingen testbar incheckning hittades.\n" "Kanske du startade med felaktiga sökvägsparametrar?\n" -#: bisect.c:994 +#: bisect.c:995 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -979,7 +980,7 @@ msgstr[1] "(ungefär %d steg)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1000 +#: bisect.c:1001 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" @@ -1000,10 +1001,10 @@ msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166 -#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907 -#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360 -#: builtin/shortlog.c:177 +#: blame.c:1797 bundle.c:169 ref-filter.c:1932 sequencer.c:1168 +#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911 +#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369 +#: builtin/shortlog.c:191 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -1044,45 +1045,50 @@ msgstr "Ställer inte in grenen %s som sin egen uppströmsgren." #: branch.c:93 #, c-format -msgid "Branch %s set up to track remote branch %s from %s by rebasing." +msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "" -"Grenen %s ställdes in att spåra fjärrgrenen %s från %s genom ombasering." +"Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\" genom " +"ombasering." #: branch.c:94 #, c-format -msgid "Branch %s set up to track remote branch %s from %s." -msgstr "Grenen %s ställdes in att spåra fjärrgrenen %s från %s." +msgid "Branch '%s' set up to track remote branch '%s' from '%s'." +msgstr "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\"." #: branch.c:98 #, c-format -msgid "Branch %s set up to track local branch %s by rebasing." -msgstr "Grenen %s ställdes in att spåra den lokala grenen %s genom ombasering." +msgid "Branch '%s' set up to track local branch '%s' by rebasing." +msgstr "" +"Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\" genom " +"ombasering." #: branch.c:99 #, c-format -msgid "Branch %s set up to track local branch %s." -msgstr "Grenen %s ställdes in att spåra den lokala grenen %s." +msgid "Branch '%s' set up to track local branch '%s'." +msgstr "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"." #: branch.c:104 #, c-format -msgid "Branch %s set up to track remote ref %s by rebasing." -msgstr "Grenen %s ställdes in att spåra fjärreferensen %s genom ombasering." +msgid "Branch '%s' set up to track remote ref '%s' by rebasing." +msgstr "" +"Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\" genom ombasering." #: branch.c:105 #, c-format -msgid "Branch %s set up to track remote ref %s." -msgstr "Grenen %s ställdes in att spåra fjärreferensen %s." +msgid "Branch '%s' set up to track remote ref '%s'." +msgstr "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\"." #: branch.c:109 #, c-format -msgid "Branch %s set up to track local ref %s by rebasing." +msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "" -"Grenen %s ställdes in att spåra den lokala referensen %s genom ombasering." +"Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\" genom " +"ombasering." #: branch.c:110 #, c-format -msgid "Branch %s set up to track local ref %s." -msgstr "Grenen %s ställdes in att spåra den lokala referensen %s." +msgid "Branch '%s' set up to track local ref '%s'." +msgstr "Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\"." #: branch.c:119 msgid "Unable to write upstream branch configuration" @@ -1103,21 +1109,21 @@ msgstr "\"%s\" är inte ett giltigt grennamn." msgid "A branch named '%s' already exists." msgstr "Det finns redan en gren som heter ”%s”." -#: branch.c:198 +#: branch.c:197 msgid "Cannot force update the current branch." msgstr "Kan inte tvinga uppdatering av aktuell gren." -#: branch.c:218 +#: branch.c:217 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren." -#: branch.c:220 +#: branch.c:219 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte" -#: branch.c:222 +#: branch.c:221 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1137,22 +1143,22 @@ msgstr "" "spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n" "för att ställa in uppströmskonfigurationen när du sänder in." -#: branch.c:265 +#: branch.c:264 #, c-format msgid "Not a valid object name: '%s'." msgstr "Objektnamnet är inte giltigt: \"%s\"." -#: branch.c:285 +#: branch.c:284 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Objektnamnet är tvetydigt: \"%s\"." -#: branch.c:290 +#: branch.c:289 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Avgreningspunkten är inte giltig: ”%s”." -#: branch.c:344 +#: branch.c:343 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "\"%s\" är redan utcheckad på \"%s\"" @@ -1172,7 +1178,9 @@ 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:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778 +#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500 +#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807 +#: sequencer.c:2949 builtin/commit.c:782 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -1181,56 +1189,56 @@ msgstr "kunde inte öppna \"%s\"" msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:186 +#: bundle.c:193 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Paketet (bundlen) innehåller denna referens:" msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:" -#: bundle.c:193 +#: bundle.c:200 msgid "The bundle records a complete history." msgstr "Paketet (bundlen) beskriver en komplett historik." -#: bundle.c:195 +#: bundle.c:202 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Paketet (bundlen) kräver denna referens:" msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:" -#: bundle.c:254 +#: bundle.c:261 msgid "Could not spawn pack-objects" msgstr "Kunde inte starta pack-objects" -#: bundle.c:265 +#: bundle.c:272 msgid "pack-objects died" msgstr "pack-objects misslyckades" -#: bundle.c:307 +#: bundle.c:314 msgid "rev-list died" msgstr "rev-list dog" -#: bundle.c:356 +#: bundle.c:363 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282 +#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" -#: bundle.c:454 +#: bundle.c:461 msgid "Refusing to create empty bundle." msgstr "Vägrar skapa ett tomt paket (bundle)." -#: bundle.c:466 +#: bundle.c:473 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:494 +#: bundle.c:501 msgid "index-pack died" msgstr "index-pack dog" @@ -1239,8 +1247,8 @@ msgstr "index-pack dog" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456 -#: builtin/am.c:1469 builtin/am.c:2107 +#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1467 builtin/am.c:2105 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -1250,7 +1258,7 @@ msgstr "kunde inte tolka %s" msgid "%s %s is not a commit!" msgstr "%s %s är inte en incheckning!" -#: commit.c:1511 +#: commit.c:1517 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1264,160 +1272,160 @@ msgstr "" msgid "memory exhausted" msgstr "minnet slut" -#: config.c:186 +#: config.c:187 msgid "relative config include conditionals must come from files" msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer" -#: config.c:720 +#: config.c:721 #, c-format msgid "bad config line %d in blob %s" msgstr "felaktig konfigurationsfil rad %d i blob:en %s" -#: config.c:724 +#: config.c:725 #, c-format msgid "bad config line %d in file %s" msgstr "felaktig konfigurationsfil rad %d i filen %s" -#: config.c:728 +#: config.c:729 #, c-format msgid "bad config line %d in standard input" msgstr "felaktig konfigurationsfil rad %d i standard in" -#: config.c:732 +#: config.c:733 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s" -#: config.c:736 +#: config.c:737 #, c-format msgid "bad config line %d in command line %s" msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s" -#: config.c:740 +#: config.c:741 #, c-format msgid "bad config line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:868 +#: config.c:869 msgid "out of range" msgstr "utanför intervallet" -#: config.c:868 +#: config.c:869 msgid "invalid unit" msgstr "ogiltig enhet" -#: config.c:874 +#: config.c:875 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:879 +#: config.c:880 #, 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:882 +#: config.c:883 #, 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:885 +#: config.c:886 #, 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:888 +#: config.c:889 #, 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:891 +#: config.c:892 #, 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:894 +#: config.c:895 #, 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:989 +#: config.c:990 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:1084 config.c:1095 +#: config.c:1085 config.c:1096 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:1212 +#: config.c:1213 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1368 +#: config.c:1372 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1564 +#: config.c:1568 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:1894 +#: config.c:1900 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2064 +#: config.c:2087 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:2085 +#: config.c:2130 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\"" -#: config.c:2111 +#: config.c:2156 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100" -#: config.c:2122 +#: config.c:2167 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2124 +#: config.c:2169 #, 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:2183 +#: config.c:2228 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2517 config.c:2745 +#: config.c:2571 config.c:2789 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:2635 +#: config.c:2678 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:2637 builtin/remote.c:775 +#: config.c:2680 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" @@ -1440,19 +1448,19 @@ msgstr "" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141 +#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" -#: connected.c:75 +#: connected.c:76 msgid "Could not run 'git rev-list'" msgstr "Kunde inte köra \"git rev-list\"" -#: connected.c:95 +#: connected.c:96 msgid "failed write to rev-list" msgstr "kunde inte skriva till rev-list" -#: connected.c:102 +#: connected.c:103 msgid "failed to close rev-list's stdin" msgstr "kunde inte stänga rev-list:s standard in" @@ -1488,19 +1496,69 @@ msgstr "LF skulle ersättas av CRLF i %s" msgid "in the future" msgstr "i framtiden" -#: date.c:122 date.c:129 date.c:136 date.c:143 date.c:149 date.c:156 date.c:167 -#: date.c:175 date.c:180 -msgid "%" -msgid_plural "%" -msgstr[0] "%" -msgstr[1] "%" +#: date.c:122 +#, c-format +msgid "%<PRIuMAX> second ago" +msgid_plural "%<PRIuMAX> seconds ago" +msgstr[0] "%<PRIuMAX> sekund sedan" +msgstr[1] "%<PRIuMAX> sekunder sedan" + +#: date.c:129 +#, c-format +msgid "%<PRIuMAX> minute ago" +msgid_plural "%<PRIuMAX> minutes ago" +msgstr[0] "%<PRIuMAX> minut sedan" +msgstr[1] "%<PRIuMAX> minuter sedan" + +#: date.c:136 +#, c-format +msgid "%<PRIuMAX> hour ago" +msgid_plural "%<PRIuMAX> hours ago" +msgstr[0] "%<PRIuMAX> timme sedan" +msgstr[1] "%<PRIuMAX> timmar sedan" + +#: date.c:143 +#, c-format +msgid "%<PRIuMAX> day ago" +msgid_plural "%<PRIuMAX> days ago" +msgstr[0] "%<PRIuMAX> dag sedan" +msgstr[1] "%<PRIuMAX> dagar sedan" + +#: date.c:149 +#, c-format +msgid "%<PRIuMAX> week ago" +msgid_plural "%<PRIuMAX> weeks ago" +msgstr[0] "%<PRIuMAX> vecka sedan" +msgstr[1] "%<PRIuMAX> veckor sedan" + +#: date.c:156 +#, c-format +msgid "%<PRIuMAX> month ago" +msgid_plural "%<PRIuMAX> months ago" +msgstr[0] "%<PRIuMAX> månad sedan" +msgstr[1] "%<PRIuMAX> månader sedan" + +#: date.c:167 +#, c-format +msgid "%<PRIuMAX> year" +msgid_plural "%<PRIuMAX> years" +msgstr[0] "%<PRIuMAX> år" +msgstr[1] "%<PRIuMAX> år" #. TRANSLATORS: "%s" is "<n> years" #: date.c:170 -msgid "%s, %" -msgid_plural "%s, %" -msgstr[0] "%s. %" -msgstr[1] "%s. %" +#, c-format +msgid "%s, %<PRIuMAX> month ago" +msgid_plural "%s, %<PRIuMAX> months ago" +msgstr[0] "%s, %<PRIuMAX> månad sedan" +msgstr[1] "%s, %<PRIuMAX> månader sedan" + +#: date.c:175 date.c:180 +#, c-format +msgid "%<PRIuMAX> year ago" +msgid_plural "%<PRIuMAX> years ago" +msgstr[0] "%<PRIuMAX> år sedan" +msgstr[1] "%<PRIuMAX> år sedan" #: diffcore-order.c:24 #, c-format @@ -1511,27 +1569,35 @@ msgstr "kunde inte läsa orderfilen \"%s\"" msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" -#: diff.c:63 +#: diff.c:74 #, c-format msgid "option '%s' requires a value" msgstr "flaggan \"%s\" behöver ett värde" -#: diff.c:125 +#: diff.c:152 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n" -#: diff.c:130 +#: diff.c:157 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Okänd dirstat-parameter \"%s\"\n" -#: diff.c:282 +#: diff.c:281 +msgid "" +"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " +"'plain'" +msgstr "" +"färginställningen för flyttade block måste vara en av \"no\", \"default\", " +"\"zebra\", \"dimmed_zebra\", \"plain\"" + +#: diff.c:341 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:342 +#: diff.c:398 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1540,20 +1606,20 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:3101 +#: diff.c:3861 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:3427 +#: diff.c:4189 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" -#: diff.c:3517 +#: diff.c:4279 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:3680 +#: diff.c:4445 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1562,228 +1628,232 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3694 +#: diff.c:4459 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:4716 +#: diff.c:5505 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:4719 +#: diff.c:5508 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:4722 +#: diff.c:5511 #, 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:1948 +#: dir.c:1983 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:2067 +#: dir.c:2102 msgid "Untracked cache is disabled on this system or location." msgstr "Ospårad cache är inaktiverad på systemet eller platsen." -#: dir.c:2846 dir.c:2851 +#: dir.c:2885 dir.c:2890 #, c-format msgid "could not create directories for %s" msgstr "kunde inte skapa kataloger för %s" -#: dir.c:2876 +#: dir.c:2915 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" -#: entry.c:281 +#: entry.c:176 +msgid "Filtering content" +msgstr "Filtrerar innehåll" + +#: entry.c:417 #, c-format msgid "could not stat file '%s'" msgstr "kunde inte ta status på filen \"%s\"" -#: fetch-pack.c:251 +#: fetch-pack.c:252 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: förväntade grund lista" -#: fetch-pack.c:263 +#: fetch-pack.c:264 msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF" -#: fetch-pack.c:282 builtin/archive.c:63 +#: fetch-pack.c:283 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "fjärrfel: %s" -#: fetch-pack.c:283 +#: fetch-pack.c:284 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\"" -#: fetch-pack.c:335 +#: fetch-pack.c:336 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc kräver ”multi_ack_detailed”" -#: fetch-pack.c:421 +#: fetch-pack.c:422 #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" -#: fetch-pack.c:427 +#: fetch-pack.c:428 #, c-format msgid "invalid unshallow line: %s" msgstr "ogiltig \"unshallow\"-rad: %s" -#: fetch-pack.c:429 +#: fetch-pack.c:430 #, c-format msgid "object not found: %s" msgstr "objektet hittades inte: %s" -#: fetch-pack.c:432 +#: fetch-pack.c:433 #, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" -#: fetch-pack.c:434 +#: fetch-pack.c:435 #, c-format msgid "no shallow found: %s" msgstr "ingen \"shallow\" hittades: %s" -#: fetch-pack.c:437 +#: fetch-pack.c:438 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "förväntade shallow/unshallow, fick %s" -#: fetch-pack.c:476 +#: fetch-pack.c:477 #, c-format msgid "got %s %d %s" msgstr "fick %s %d %s" -#: fetch-pack.c:490 +#: fetch-pack.c:491 #, c-format msgid "invalid commit %s" msgstr "ogiltig incheckning %s" -#: fetch-pack.c:523 +#: fetch-pack.c:524 msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:533 progress.c:235 +#: fetch-pack.c:534 progress.c:242 msgid "done" msgstr "klart" -#: fetch-pack.c:545 +#: fetch-pack.c:546 #, c-format msgid "got %s (%d) %s" msgstr "fick %s (%d) %s" -#: fetch-pack.c:591 +#: fetch-pack.c:592 #, c-format msgid "Marking %s as complete" msgstr "Markerar %s som komplett" -#: fetch-pack.c:775 +#: fetch-pack.c:776 #, c-format msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:813 +#: fetch-pack.c:814 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:821 +#: fetch-pack.c:822 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:877 +#: fetch-pack.c:878 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-patch: kunde inte grena av %s" -#: fetch-pack.c:893 +#: fetch-pack.c:894 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:895 +#: fetch-pack.c:896 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:922 +#: fetch-pack.c:923 msgid "Server does not support shallow clients" msgstr "Servern stöder inte klienter med grunda arkiv" -#: fetch-pack.c:926 +#: fetch-pack.c:927 msgid "Server supports multi_ack_detailed" msgstr "Servern stöder \"multi_ack_detailed\"" -#: fetch-pack.c:929 +#: fetch-pack.c:930 msgid "Server supports no-done" msgstr "Servern stöder \"no-done\"" -#: fetch-pack.c:935 +#: fetch-pack.c:936 msgid "Server supports multi_ack" msgstr "Servern stöder \"multi_ack\"" -#: fetch-pack.c:939 +#: fetch-pack.c:940 msgid "Server supports side-band-64k" msgstr "Servern stöder \"side-band-64k\"" -#: fetch-pack.c:943 +#: fetch-pack.c:944 msgid "Server supports side-band" msgstr "Servern stöder \"side-band\"" -#: fetch-pack.c:947 +#: fetch-pack.c:948 msgid "Server supports allow-tip-sha1-in-want" msgstr "Servern stöder \"allow-tip-sha1-in-want\"" -#: fetch-pack.c:951 +#: fetch-pack.c:952 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Servern stöder \"allow-reachable-sha1-in-want\"" -#: fetch-pack.c:961 +#: fetch-pack.c:962 msgid "Server supports ofs-delta" msgstr "Servern stöder \"ofs-delta\"" -#: fetch-pack.c:968 +#: fetch-pack.c:969 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:974 +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:978 +#: fetch-pack.c:979 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:980 +#: fetch-pack.c:981 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:991 +#: fetch-pack.c:992 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:1003 +#: fetch-pack.c:1004 msgid "git fetch-pack: fetch failed." msgstr "git fetch-patch: hämtning misslyckades." -#: fetch-pack.c:1165 +#: fetch-pack.c:1166 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1187 +#: fetch-pack.c:1188 #, c-format msgid "no such remote ref %s" msgstr "ingen sådan fjärreferens: %s" -#: fetch-pack.c:1190 +#: fetch-pack.c:1191 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s" @@ -1796,7 +1866,7 @@ msgstr "gpg misslyckades signera data" msgid "could not create temporary file" msgstr "kunde inte skapa temporära fil" -#: gpg-interface.c:213 +#: gpg-interface.c:214 #, c-format msgid "failed writing detached signature to '%s'" msgstr "misslyckades skriva fristående signatur till \"%s\"" @@ -1806,17 +1876,17 @@ msgstr "misslyckades skriva fristående signatur till \"%s\"" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors" -#: grep.c:1981 +#: grep.c:1970 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:2009 +#: grep.c:1998 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" @@ -1959,12 +2029,12 @@ msgstr "tomt ident-namn (för <%s>) ej tillåtet" msgid "name consists only of disallowed characters: %s" msgstr "namnet består enbart av ej tillåtna tecken: %s" -#: ident.c:416 builtin/commit.c:612 +#: ident.c:416 builtin/commit.c:616 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" -#: lockfile.c:152 +#: lockfile.c:151 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -1984,7 +2054,7 @@ msgstr "" "tidigare:\n" "ta bort filen manuellt för att fortsätta." -#: lockfile.c:160 +#: lockfile.c:159 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "Kunde inte skapa \"%s.lock\": %s" @@ -1993,78 +2063,78 @@ msgstr "Kunde inte skapa \"%s.lock\": %s" msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377 -#: builtin/checkout.c:591 builtin/clone.c:753 +#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380 +#: builtin/checkout.c:595 builtin/clone.c:754 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: merge-recursive.c:210 +#: merge-recursive.c:235 msgid "(bad commit)\n" msgstr "(felaktig incheckning)\n" -#: merge-recursive.c:232 merge-recursive.c:240 +#: merge-recursive.c:257 merge-recursive.c:265 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "addinfo_cache misslyckades för sökvägen \"%s\"" -#: merge-recursive.c:304 +#: merge-recursive.c:329 msgid "error building trees" msgstr "fel vid byggande av träd" -#: merge-recursive.c:728 +#: merge-recursive.c:752 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:739 +#: merge-recursive.c:763 #, 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:753 merge-recursive.c:772 +#: merge-recursive.c:777 merge-recursive.c:796 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:762 +#: merge-recursive.c:786 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:804 builtin/cat-file.c:36 +#: merge-recursive.c:828 builtin/cat-file.c:37 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:806 +#: merge-recursive.c:830 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:830 +#: merge-recursive.c:854 #, c-format msgid "failed to open '%s': %s" msgstr "misslyckades öppna \"%s\": %s" -#: merge-recursive.c:841 +#: merge-recursive.c:865 #, c-format msgid "failed to symlink '%s': %s" msgstr "misslyckades skapa symboliska länken \"%s\": %s" -#: merge-recursive.c:846 +#: merge-recursive.c:870 #, 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:986 +#: merge-recursive.c:1010 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:990 +#: merge-recursive.c:1014 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:1093 +#: merge-recursive.c:1117 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2073,7 +2143,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:1098 +#: merge-recursive.c:1122 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2082,7 +2152,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av " "%s lämnad i trädet." -#: merge-recursive.c:1105 +#: merge-recursive.c:1129 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2091,7 +2161,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet vid %s." -#: merge-recursive.c:1110 +#: merge-recursive.c:1134 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2100,20 +2170,20 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av " "%s lämnad i trädet vid %s." -#: merge-recursive.c:1144 +#: merge-recursive.c:1168 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1144 +#: merge-recursive.c:1168 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1201 +#: merge-recursive.c:1225 #, 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:1226 +#: merge-recursive.c:1250 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2122,139 +2192,139 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1231 +#: merge-recursive.c:1255 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1293 +#: merge-recursive.c:1317 #, 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:1326 +#: merge-recursive.c:1350 #, 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:1529 +#: merge-recursive.c:1553 #, 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:1544 +#: merge-recursive.c:1568 #, c-format msgid "Adding merged %s" msgstr "Lägger till sammanslagen %s" -#: merge-recursive.c:1551 merge-recursive.c:1781 +#: merge-recursive.c:1575 merge-recursive.c:1805 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:1608 +#: merge-recursive.c:1632 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:1611 +#: merge-recursive.c:1635 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:1680 +#: merge-recursive.c:1704 msgid "modify" msgstr "ändra" -#: merge-recursive.c:1680 +#: merge-recursive.c:1704 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:1690 +#: merge-recursive.c:1714 msgid "content" msgstr "innehåll" -#: merge-recursive.c:1697 +#: merge-recursive.c:1721 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:1733 +#: merge-recursive.c:1757 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:1747 +#: merge-recursive.c:1771 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1751 git-submodule.sh:945 +#: merge-recursive.c:1775 git-submodule.sh:944 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:1752 +#: merge-recursive.c:1776 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:1846 +#: merge-recursive.c:1870 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:1872 +#: merge-recursive.c:1896 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:1878 +#: merge-recursive.c:1902 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:1884 +#: merge-recursive.c:1908 #, 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:1893 +#: merge-recursive.c:1917 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:1930 -msgid "Already up-to-date!" +#: merge-recursive.c:1954 +msgid "Already up to date!" msgstr "Redan à jour!" -#: merge-recursive.c:1939 +#: merge-recursive.c:1963 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:2022 +#: merge-recursive.c:2060 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:2035 +#: merge-recursive.c:2073 #, 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:2074 +#: merge-recursive.c:2112 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:2137 +#: merge-recursive.c:2175 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793 +#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." -#: notes-merge.c:273 +#: notes-merge.c:272 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -2266,7 +2336,7 @@ msgstr "" "att checka in eller avbryta föregående sammanslagning innan du påbörjar en " "ny antecknings-sammanslagning." -#: notes-merge.c:280 +#: notes-merge.c:279 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)." @@ -2294,16 +2364,30 @@ 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:240 +#: object.c:239 #, c-format msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" +#: packfile.c:556 +msgid "offset before end of packfile (broken .idx?)" +msgstr "offset före slutet av packfilen (trasig .idx?)" + +#: packfile.c:1683 +#, c-format +msgid "offset before start of pack index for %s (corrupt index?)" +msgstr "offset före slutet av packindex för %s (trasigt index?)" + +#: packfile.c:1687 +#, c-format +msgid "offset beyond end of pack index for %s (truncated index?)" +msgstr "offset borton slutet av packindex för %s (trunkerat index?)" + #: parse-options.c:573 msgid "..." msgstr "..." -#: parse-options.c:591 +#: parse-options.c:592 #, c-format msgid "usage: %s" msgstr "användning: %s" @@ -2311,17 +2395,17 @@ msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:597 +#: parse-options.c:598 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:600 +#: parse-options.c:601 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:634 +#: parse-options.c:640 msgid "-NUM" msgstr "-TAL" @@ -2330,7 +2414,7 @@ msgstr "-TAL" msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: path.c:890 +#: path.c:891 #, c-format msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för gruppen" @@ -2404,7 +2488,7 @@ msgstr "\"%s\" (minnesstöd: \"%c\")" 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:575 +#: pathspec.c:571 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" @@ -2412,12 +2496,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:599 +#: pathspec.c:595 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" -#: pretty.c:963 +#: pretty.c:962 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" @@ -2439,50 +2523,51 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:2308 builtin/merge.c:1019 +#: read-cache.c:2316 builtin/merge.c:1046 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054 +#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" -#: read-cache.c:2396 +#: read-cache.c:2407 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte öppna git-katalog: %s" -#: read-cache.c:2408 +#: read-cache.c:2419 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort länken: %s" -#: refs.c:622 +#: refs.c:638 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: refs.c:1769 +#: refs.c:1779 msgid "ref updates forbidden inside quarantine environment" msgstr "referensuppdateringar förbjudna i karantänmiljö" -#: refs/files-backend.c:1664 +#: refs/files-backend.c:1136 +#, c-format +msgid "could not remove reference %s" +msgstr "kunde inte ta bort referensen %s" + +#: refs/files-backend.c:1150 refs/packed-backend.c:1430 +#: refs/packed-backend.c:1440 #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" -#: refs/files-backend.c:1667 +#: refs/files-backend.c:1153 refs/packed-backend.c:1443 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" -#: refs/files-backend.c:1676 -#, c-format -msgid "could not remove reference %s" -msgstr "kunde inte ta bort referensen %s" - #: ref-filter.c:35 wt-status.c:1811 msgid "gone" msgstr "försvunnen" @@ -2502,157 +2587,157 @@ msgstr "bakom %d" msgid "ahead %d, behind %d" msgstr "före %d, bakom %d" -#: ref-filter.c:105 +#: ref-filter.c:104 #, c-format msgid "expected format: %%(color:<color>)" msgstr "förväntat format: %%(color:<color>)" -#: ref-filter.c:107 +#: ref-filter.c:106 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "okänd färg: %%(color:%s)" -#: ref-filter.c:121 +#: ref-filter.c:126 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Heltalsvärde förväntades refname:lstrip=%s" -#: ref-filter.c:125 +#: ref-filter.c:130 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Heltalsvärde förväntades refname:rstrip=%s" -#: ref-filter.c:127 +#: ref-filter.c:132 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "okänt %%(%s)-argument: %s" -#: ref-filter.c:167 +#: ref-filter.c:172 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) tar inte argument" -#: ref-filter.c:174 +#: ref-filter.c:179 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) tar inte argument" -#: ref-filter.c:181 +#: ref-filter.c:186 #, c-format msgid "%%(trailers) does not take arguments" msgstr "%%(trailers) tar inte argument" -#: ref-filter.c:200 +#: ref-filter.c:205 #, c-format msgid "positive value expected contents:lines=%s" msgstr "positivt värde förväntat contents:lines=%s" -#: ref-filter.c:202 +#: ref-filter.c:207 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "okänt %%(contents)-argument: %s" -#: ref-filter.c:215 +#: ref-filter.c:220 #, c-format msgid "positive value expected objectname:short=%s" msgstr "positivt värde förväntat objectname:short=%s" -#: ref-filter.c:219 +#: ref-filter.c:224 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "okänt %%(objectname)-argument: %s" -#: ref-filter.c:246 +#: ref-filter.c:251 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "förväntat format: %%(align:<bredd>,<position>)" -#: ref-filter.c:258 +#: ref-filter.c:263 #, c-format msgid "unrecognized position:%s" msgstr "okänd position:%s" -#: ref-filter.c:262 +#: ref-filter.c:267 #, c-format msgid "unrecognized width:%s" msgstr "okänd bredd:%s" -#: ref-filter.c:268 +#: ref-filter.c:273 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "okänt %%(align)-argument: %s" -#: ref-filter.c:272 +#: ref-filter.c:277 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "positiv bredd förväntad med atomen %%(align)" -#: ref-filter.c:287 +#: ref-filter.c:292 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "okänt %%(if)-argument: %s" -#: ref-filter.c:378 +#: ref-filter.c:382 #, c-format msgid "malformed field name: %.*s" msgstr "felformat fältnamn: %.*s" -#: ref-filter.c:404 +#: ref-filter.c:408 #, c-format msgid "unknown field name: %.*s" msgstr "okänt fältnamn: %.*s" -#: ref-filter.c:508 +#: ref-filter.c:520 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: atomen %%(if) använd utan en %%(then)-atom" -#: ref-filter.c:568 +#: ref-filter.c:580 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: atomen %%(then) använd utan en %%(if)-atom" -#: ref-filter.c:570 +#: ref-filter.c:582 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: atomen %%(then) använd mer än en gång" -#: ref-filter.c:572 +#: ref-filter.c:584 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atomen %%(then) använd efter %%(else)" -#: ref-filter.c:598 +#: ref-filter.c:610 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: atomen %%(else) använd utan en %%(if)-atom" -#: ref-filter.c:600 +#: ref-filter.c:612 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format: atomen %%(else) använd utan en %%(then)-atom" -#: ref-filter.c:602 +#: ref-filter.c:614 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format: atomen %%(else) använd mer än en gång" -#: ref-filter.c:615 +#: ref-filter.c:627 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: atomen %%(end) använd utan motsvarande atom" -#: ref-filter.c:670 +#: ref-filter.c:682 #, c-format msgid "malformed format string %s" msgstr "felformad formatsträng %s" -#: ref-filter.c:1254 +#: ref-filter.c:1268 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: ref-filter.c:1257 +#: ref-filter.c:1271 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" @@ -2660,7 +2745,7 @@ msgstr "(ingen gren, \"bisect\" startad på %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1265 +#: ref-filter.c:1279 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD frånkopplat vid %s)" @@ -2668,108 +2753,108 @@ msgstr "(HEAD frånkopplat vid %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1272 +#: ref-filter.c:1286 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD frånkopplat från %s)" -#: ref-filter.c:1276 +#: ref-filter.c:1290 msgid "(no branch)" msgstr "(ingen gren)" -#: ref-filter.c:1426 ref-filter.c:1457 +#: ref-filter.c:1439 ref-filter.c:1470 #, c-format msgid "missing object %s for %s" msgstr "objektet %s saknas för %s" -#: ref-filter.c:1429 ref-filter.c:1460 +#: ref-filter.c:1442 ref-filter.c:1473 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer misslyckades på %s för %s" -#: ref-filter.c:1760 +#: ref-filter.c:1773 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:1827 +#: ref-filter.c:1840 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:1832 +#: ref-filter.c:1845 #, c-format msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" -#: ref-filter.c:2095 +#: ref-filter.c:2107 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:2176 +#: ref-filter.c:2201 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: remote.c:747 +#: remote.c:750 #, 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:751 +#: remote.c:754 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spårar vanligtvis %s, inte %s" -#: remote.c:755 +#: remote.c:758 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#: remote.c:763 +#: remote.c:766 msgid "Internal error" msgstr "Internt fel" -#: remote.c:1680 remote.c:1782 +#: remote.c:1681 remote.c:1783 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no such branch: '%s'" msgstr "okänd gren: \"%s\"" -#: remote.c:1692 +#: remote.c:1693 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppström angiven för grenen \"%s\"" -#: remote.c:1698 +#: remote.c:1699 #, 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:1713 +#: remote.c:1714 #, 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:1726 #, 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:1737 #, 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:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mål (push.default är \"ingenting\")" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mål" @@ -2784,7 +2869,7 @@ msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" #: remote.c:2083 #, c-format -msgid "Your branch is up-to-date with '%s'.\n" +msgid "Your branch is up to date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" #: remote.c:2087 @@ -2831,16 +2916,16 @@ msgstr[1] "" 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" -#: revision.c:2187 +#: revision.c:2256 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2190 +#: revision.c:2259 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar" -#: revision.c:2384 +#: revision.c:2453 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" @@ -2882,24 +2967,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:216 +#: sequencer.c:218 msgid "revert" msgstr "revert" -#: sequencer.c:218 +#: sequencer.c:220 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:220 +#: sequencer.c:222 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:222 +#: sequencer.c:224 #, c-format msgid "Unknown action: %d" msgstr "Okänd funktion: %d" -#: sequencer.c:279 +#: sequencer.c:281 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -2907,7 +2992,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:282 +#: sequencer.c:284 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -2917,42 +3002,43 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:295 sequencer.c:1685 +#: sequencer.c:297 sequencer.c:1704 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704 +#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723 +#: sequencer.c:2733 sequencer.c:2749 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" -#: sequencer.c:302 +#: sequencer.c:304 #, c-format msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692 +#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711 #, c-format msgid "failed to finalize '%s'." msgstr "misslyckades färdigställa \"%s\"." -#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258 -#: builtin/commit.c:750 builtin/merge.c:1017 +#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259 +#: builtin/commit.c:754 builtin/merge.c:1044 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: sequencer.c:356 +#: sequencer.c:358 #, c-format msgid "your local changes would be overwritten by %s." msgstr "dina lokala ändringar skulle skrivas över av %s." -#: sequencer.c:360 +#: sequencer.c:362 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:389 +#: sequencer.c:391 #, c-format msgid "%s: fast-forward" msgstr "%s: snabbspola" @@ -2960,20 +3046,20 @@ msgstr "%s: snabbspola" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:472 +#: sequencer.c:474 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:491 +#: sequencer.c:493 msgid "could not resolve HEAD commit\n" msgstr "kunde inte bestämma HEAD:s incheckning\n" -#: sequencer.c:511 +#: sequencer.c:513 msgid "unable to update cache tree\n" msgstr "kan inte uppdatera cacheträd\n" -#: sequencer.c:595 +#: sequencer.c:597 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3002,17 +3088,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:697 +#: sequencer.c:699 #, c-format msgid "could not parse commit %s\n" msgstr "kunde inte tolka incheckningen %s\n" -#: sequencer.c:702 +#: sequencer.c:704 #, c-format msgid "could not parse parent commit %s\n" msgstr "kunde inte tolka föräldraincheckningen %s\n" -#: sequencer.c:824 +#: sequencer.c:826 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -3023,7 +3109,7 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:830 +#: sequencer.c:832 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -3034,231 +3120,232 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:836 sequencer.c:861 +#: sequencer.c:838 sequencer.c:863 #, c-format msgid "This is a combination of %d commits." msgstr "Det här är en kombination av %d incheckningar." -#: sequencer.c:845 +#: sequencer.c:847 sequencer.c:2681 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:847 +#: sequencer.c:849 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:849 +#: sequencer.c:851 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:855 +#: sequencer.c:857 #, c-format msgid "cannot write '%s'" msgstr "kan inte skriva \"%s\"" -#: sequencer.c:864 git-rebase--interactive.sh:445 +#: sequencer.c:866 git-rebase--interactive.sh:446 msgid "This is the 1st commit message:" msgstr "Det här är 1:a incheckningsmeddelandet:" -#: sequencer.c:872 +#: sequencer.c:874 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:879 +#: sequencer.c:881 #, c-format msgid "This is the commit message #%d:" msgstr "Det här är incheckningsmeddelande %d:" -#: sequencer.c:884 +#: sequencer.c:886 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Incheckningsmeddelande %d kommer hoppas över:" -#: sequencer.c:889 +#: sequencer.c:891 #, c-format msgid "unknown command: %d" msgstr "okänt kommando: %d" -#: sequencer.c:955 +#: sequencer.c:957 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:973 +#: sequencer.c:975 #, 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:981 +#: sequencer.c:983 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:985 +#: sequencer.c:987 #, 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:991 +#: sequencer.c:993 #, 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:1012 +#: sequencer.c:1014 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:1075 sequencer.c:1830 +#: sequencer.c:1077 sequencer.c:1853 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:1126 +#: sequencer.c:1128 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:1127 +#: sequencer.c:1129 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:1169 +#: sequencer.c:1171 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:1179 +#: sequencer.c:1181 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:1186 +#: sequencer.c:1188 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:1306 +#: sequencer.c:1308 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:1314 +#: sequencer.c:1316 #, c-format msgid "cannot '%s' without a previous commit" msgstr "kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:1347 +#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614 +#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951 #, c-format msgid "could not read '%s'." msgstr "kunde inte läsa \"%s\"." -#: sequencer.c:1359 +#: sequencer.c:1361 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:1361 +#: sequencer.c:1363 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: ”%s”" -#: sequencer.c:1366 +#: sequencer.c:1368 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:1377 +#: sequencer.c:1379 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:1379 +#: sequencer.c:1381 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:1442 +#: sequencer.c:1448 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" -#: sequencer.c:1445 +#: sequencer.c:1451 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:1502 +#: sequencer.c:1517 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: ”%s”" -#: sequencer.c:1540 +#: sequencer.c:1555 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:1541 +#: sequencer.c:1556 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1544 +#: sequencer.c:1559 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:1558 +#: sequencer.c:1574 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:1614 sequencer.c:2188 +#: sequencer.c:1632 sequencer.c:2211 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:1616 +#: sequencer.c:1634 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:1618 sequencer.c:1652 +#: sequencer.c:1636 sequencer.c:1671 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:1638 builtin/grep.c:929 +#: sequencer.c:1657 builtin/grep.c:711 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:1640 +#: sequencer.c:1659 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:1641 +#: sequencer.c:1660 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:1647 +#: sequencer.c:1666 #, 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:1658 +#: sequencer.c:1677 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:1795 sequencer.c:2086 +#: sequencer.c:1818 sequencer.c:2109 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:1835 builtin/difftool.c:633 +#: sequencer.c:1858 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:1851 +#: sequencer.c:1874 msgid "could not read index" msgstr "kunde inte läsa indexet" -#: sequencer.c:1856 +#: sequencer.c:1879 #, c-format msgid "" "execution failed: %s\n" @@ -3273,11 +3360,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:1862 +#: sequencer.c:1885 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:1868 +#: sequencer.c:1891 #, c-format msgid "" "execution succeeded: %s\n" @@ -3294,17 +3381,17 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:1925 +#: sequencer.c:1948 #, c-format msgid "Applied autostash.\n" msgstr "Tillämpade autostash.\n" -#: sequencer.c:1937 +#: sequencer.c:1960 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:1940 git-rebase.sh:173 +#: sequencer.c:1963 git-rebase.sh:175 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3315,57 +3402,57 @@ msgstr "" "Dina ändringar är säkra i stashen.\n" "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" -#: sequencer.c:2022 +#: sequencer.c:2045 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:2064 +#: sequencer.c:2087 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:2094 +#: sequencer.c:2117 msgid "could not read orig-head" msgstr "kunde inte läsa orig-head" -#: sequencer.c:2099 +#: sequencer.c:2122 sequencer.c:2678 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:2106 +#: sequencer.c:2129 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:2113 +#: sequencer.c:2136 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:2197 +#: sequencer.c:2220 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:2202 +#: sequencer.c:2225 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:2211 +#: sequencer.c:2234 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:2213 +#: sequencer.c:2236 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:2215 +#: sequencer.c:2238 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:2218 +#: sequencer.c:2241 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3375,24 +3462,119 @@ msgstr "" "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:2228 +#: sequencer.c:2251 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:2308 +#: sequencer.c:2331 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen ”%s”" -#: sequencer.c:2312 +#: sequencer.c:2335 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:2345 +#: sequencer.c:2368 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" +#: sequencer.c:2471 +msgid "make_script: unhandled options" +msgstr "make_script: flaggor som inte stöds" + +#: sequencer.c:2474 +msgid "make_script: error preparing revisions" +msgstr "make_script: fel när revisioner skulle förberedas" + +#: sequencer.c:2510 +#, c-format +msgid "unusable todo list: '%s'" +msgstr "oanvändbar todo-lista: %s" + +#: sequencer.c:2516 +#, c-format +msgid "unable to open '%s' for writing" +msgstr "kunde inte öppna \"%s\" för skrivning" + +#: sequencer.c:2561 +#, c-format +msgid "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring." +msgstr "" +"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar." + +#: sequencer.c:2561 +#, c-format +msgid "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." +msgstr "" +"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar." + +#: sequencer.c:2641 +#, c-format +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):\n" +msgstr "" +"Varning: vissa incheckningar kan av misstag ha tappats.\n" +"Tappade incheckningar (nyaste först):\n" + +#: sequencer.c:2648 +#, c-format +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error.\n" +"\n" +msgstr "" +"För att undvika det här meddelandet kan du använda \"drop\" för att " +"explicit\n" +"kasta en incheckning.\n" +"\n" +"Använd \"git config rebase.missingCommitsCheck\" för att ändra " +"varningsnivån.\n" +"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error" +"\" (fel).\n" +"\n" + +#: sequencer.c:2660 +#, c-format +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --" +"continue\".\n" +"Avbryt ombaseringen med \"git rebase --abort\".\n" + +#: sequencer.c:2708 +#, c-format +msgid "could not parse commit '%s'" +msgstr "kunde inte tolka incheckningen\" %s\"" + +#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:775 +#, c-format +msgid "could not open '%s' for writing" +msgstr "kunde inte öppna \"%s\" för skrivning" + +#: sequencer.c:2756 +#, c-format +msgid "could not truncate '%s'" +msgstr "kunde inte trunkera \"%s\"" + +#: sequencer.c:2848 +msgid "the script was already rearranged." +msgstr "skriptet har redan omordnats." + +#: sequencer.c:2953 +#, c-format +msgid "could not finish '%s'" +msgstr "kunde inte avsluta \"%s\"" + #: setup.c:171 #, c-format msgid "" @@ -3426,34 +3608,34 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:504 +#: setup.c:499 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Förväntade git-arkivversion <= %d, hittade %d" -#: setup.c:512 +#: setup.c:507 msgid "unknown repository extensions found:" msgstr "okända arkivutökningar hittades:" -#: setup.c:810 +#: setup.c:806 #, 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:812 builtin/index-pack.c:1652 +#: setup.c:808 builtin/index-pack.c:1653 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: setup.c:1050 +#: setup.c:1046 msgid "Unable to read current working directory" msgstr "Kan inte läsa aktuell arbetskatalog" -#: setup.c:1062 setup.c:1068 +#: setup.c:1058 setup.c:1064 #, c-format msgid "Cannot change to '%s'" msgstr "Kan inte byta till \"%s\"" -#: setup.c:1081 +#: setup.c:1077 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -3463,7 +3645,7 @@ msgstr "" "monteringspunkten %s)\n" "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." -#: setup.c:1173 +#: setup.c:1159 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3472,55 +3654,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:560 +#: sha1_file.c:528 #, c-format msgid "path '%s' does not exist" msgstr "sökvägen \"%s\" finns inte" -#: sha1_file.c:586 +#: sha1_file.c:554 #, 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:592 +#: sha1_file.c:560 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: sha1_file.c:598 +#: sha1_file.c:566 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: sha1_file.c:606 +#: sha1_file.c:574 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: sha1_file.c:1245 -msgid "offset before end of packfile (broken .idx?)" -msgstr "offset före slutet av packfilen (trasig .idx?)" - -#: sha1_file.c:2729 -#, 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:2733 -#, c-format -msgid "offset beyond end of pack index for %s (truncated index?)" -msgstr "offset borton slutet av packindex för %s (trunkerat index?)" - -#: sha1_name.c:419 +#: sha1_name.c:420 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "kort SHA1 %s är tvetydig" -#: sha1_name.c:430 +#: sha1_name.c:431 msgid "The candidates are:" msgstr "Kandidaterna är:" -#: sha1_name.c:589 +#: sha1_name.c:590 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -3542,66 +3710,71 @@ 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:70 submodule.c:104 +#: submodule.c:93 submodule.c:127 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:74 submodule.c:108 +#: submodule.c:97 submodule.c:131 #, 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:82 +#: submodule.c:105 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Kunde inte uppdatera .gitmodules-posten %s" -#: submodule.c:115 +#: submodule.c:138 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Kunde inte ta bort .gitmodules-posten för %s" -#: submodule.c:126 +#: submodule.c:149 msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:165 -msgid "negative values not allowed for submodule.fetchJobs" -msgstr "negativa värden är inte tillåtna för submodule.fetchJobs" - -#: submodule.c:376 +#: submodule.c:309 #, c-format msgid "in unpopulated submodule '%s'" msgstr "i ej utcheckad undermodul \"%s\"" -#: submodule.c:407 +#: submodule.c:340 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" -#: submodule.c:1337 +#: submodule.c:799 +#, c-format +msgid "submodule entry '%s' (%s) is a %s, not a commit" +msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning" + +#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "Misslyckades slå upp HEAD som giltig referens." + +#: submodule.c:1304 #, c-format msgid "'%s' not recognized as a git repository" msgstr "\"%s\" känns inte igen som ett git-arkiv" -#: submodule.c:1475 +#: submodule.c:1442 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "kunde inte starta \"git status\" i undermodulen \"%s\"" -#: submodule.c:1488 +#: submodule.c:1455 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "kunde inte köra \"git status\" i undermodulen \"%s\"" -#: submodule.c:1581 +#: submodule.c:1548 #, c-format msgid "submodule '%s' has dirty index" msgstr "undermodulen \"%s\" har ett smutsigt index" -#: submodule.c:1845 +#: submodule.c:1809 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3609,18 +3782,18 @@ msgstr "" "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " "stöds ej" -#: submodule.c:1857 submodule.c:1913 +#: submodule.c:1821 submodule.c:1877 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" -#: submodule.c:1861 builtin/submodule--helper.c:678 -#: builtin/submodule--helper.c:688 +#: submodule.c:1825 builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:681 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: submodule.c:1864 +#: submodule.c:1828 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3631,94 +3804,98 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:1948 +#: submodule.c:1912 #, c-format msgid "could not recurse into submodule '%s'" msgstr "kunde inte rekursera in i undermodulen \"%s\"" -#: submodule.c:1992 +#: submodule.c:1956 msgid "could not start ls-files in .." msgstr "kunde inte starta ls-files i .." -#: submodule.c:2012 +#: submodule.c:1976 msgid "BUG: returned path string doesn't match cwd?" msgstr "BUG: returnerad sökvägssträng matchar inte cwd?" -#: submodule.c:2031 +#: submodule.c:1995 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en oväntad returkod %d" -#: submodule-config.c:420 +#: submodule-config.c:263 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "negativa värden är inte tillåtna för submodule.fetchjobs" + +#: submodule-config.c:436 #, c-format msgid "invalid value for %s" msgstr "ogiltigt värde för %s" -#: trailer.c:241 +#: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\"" -#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540 -#: trailer.c:544 +#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 +#: trailer.c:557 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "okänt värde \"%s\" för nyckeln \"%s\"" -#: trailer.c:526 trailer.c:531 builtin/remote.c:290 +#: trailer.c:539 trailer.c:544 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "mer än en %s" -#: trailer.c:703 +#: trailer.c:730 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "tom släpradssymbol i släpraden \"%.*s\"" -#: trailer.c:723 +#: trailer.c:750 #, c-format msgid "could not read input file '%s'" msgstr "kunde inte läsa indatafilen \"%s\"" -#: trailer.c:726 +#: trailer.c:753 msgid "could not read from stdin" msgstr "kunde inte läsa från standard in" -#: trailer.c:950 builtin/am.c:45 +#: trailer.c:1008 builtin/am.c:46 #, c-format msgid "could not stat %s" msgstr "kunde inte ta status på %s" -#: trailer.c:952 +#: trailer.c:1010 #, c-format msgid "file %s is not a regular file" msgstr "filen %s är inte en normal fil" -#: trailer.c:954 +#: trailer.c:1012 #, c-format msgid "file %s is not writable by user" msgstr "filen %s är inte skrivbar av användaren" -#: trailer.c:966 +#: trailer.c:1024 msgid "could not open temporary file" msgstr "kunde inte öppna temporär file" -#: trailer.c:1002 +#: trailer.c:1064 #, c-format msgid "could not rename temporary file to %s" msgstr "kunde inte byta namn på temporär fil till %s" -#: transport.c:63 +#: transport.c:62 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n" -#: transport.c:152 +#: transport.c:151 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: ogiltig flagga för depth: ”%s”" -#: transport.c:890 +#: transport.c:888 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3727,7 +3904,7 @@ msgstr "" "Följande undermodulsökvägar innehåller ändringar som\n" "inte kan hittas av fjärrarna:\n" -#: transport.c:894 +#: transport.c:892 #, c-format msgid "" "\n" @@ -3754,7 +3931,7 @@ msgstr "" "för att sända dem till fjärren.\n" "\n" -#: transport.c:902 +#: transport.c:900 msgid "Aborting." msgstr "Avbryter." @@ -3775,11 +3952,11 @@ msgstr "felformat läge i trädpost" msgid "empty filename in tree entry" msgstr "tomt filnamn i trädpost" -#: tree-walk.c:113 +#: tree-walk.c:114 msgid "too-short tree file" msgstr "trädfil för kort" -#: unpack-trees.c:105 +#: unpack-trees.c:106 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3788,7 +3965,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:107 +#: unpack-trees.c:108 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3797,7 +3974,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%s" -#: unpack-trees.c:110 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3807,7 +3984,7 @@ msgstr "" "sammanslagning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:112 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3817,7 +3994,7 @@ msgstr "" "sammanslagning:\n" "%%s" -#: unpack-trees.c:115 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3826,7 +4003,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:117 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3835,7 +4012,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:122 +#: unpack-trees.c:123 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -3845,7 +4022,7 @@ msgstr "" "dem:\n" "%s" -#: unpack-trees.c:126 +#: unpack-trees.c:127 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3854,7 +4031,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:128 +#: unpack-trees.c:129 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3863,7 +4040,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%s" -#: unpack-trees.c:131 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3873,7 +4050,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du slår samman." -#: unpack-trees.c:133 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3883,7 +4060,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:136 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3892,7 +4069,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:138 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3901,7 +4078,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%s" -#: unpack-trees.c:143 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3912,7 +4089,7 @@ msgstr "" "utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:145 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3923,7 +4100,7 @@ msgstr "" "utcheckningen:\n" "%%s" -#: unpack-trees.c:148 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3933,7 +4110,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:150 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3943,7 +4120,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:153 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3952,7 +4129,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:155 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3961,21 +4138,21 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:162 +#: unpack-trees.c:163 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda." -#: unpack-trees.c:165 +#: unpack-trees.c:166 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" -"Kan inte uppdatera gles utcheckning: följande poster är inte àjour:\n" +"Kan inte uppdatera gles utcheckning: följande poster är inte à jour:\n" "%s" -#: unpack-trees.c:167 +#: unpack-trees.c:168 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -3986,7 +4163,7 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:169 +#: unpack-trees.c:170 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -3997,7 +4174,7 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:171 +#: unpack-trees.c:172 #, c-format msgid "" "Cannot update submodule:\n" @@ -4006,17 +4183,12 @@ msgstr "" "Kan inte uppdatera undermodul:\n" "%s" -#: unpack-trees.c:248 +#: unpack-trees.c:249 #, c-format msgid "Aborting\n" msgstr "Avbryter\n" -#: unpack-trees.c:277 -#, c-format -msgid "submodule update strategy not supported for submodule '%s'" -msgstr "uppdateringsstrategi för undermodul stöds inte för undermodulen \"%s\"" - -#: unpack-trees.c:346 +#: unpack-trees.c:331 msgid "Checking out files" msgstr "Checkar ut filer" @@ -4059,13 +4231,8 @@ msgstr "misslyckades läsa \"%s\"" msgid "could not open '%s' for reading and writing" msgstr "kunde inte öppna \"%s\" för läsning och skrivning" -#: wrapper.c:225 wrapper.c:395 builtin/am.c:766 -#, c-format -msgid "could not open '%s' for writing" -msgstr "kunde inte öppna \"%s\" för skrivning" - -#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757 -#: builtin/am.c:849 builtin/merge.c:1014 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766 +#: builtin/am.c:858 builtin/merge.c:1041 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" @@ -4089,199 +4256,199 @@ msgstr "kunde inte skriva till %s" msgid "could not close %s" msgstr "kunde inte stänga %s" -#: wt-status.c:152 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Ej sammanslagna sökvägar:" -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)" -#: wt-status.c:181 wt-status.c:208 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)" -#: wt-status.c:185 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (använd \"git add <fil>...\" för att ange lösning)" -#: wt-status.c:187 wt-status.c:191 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)" -#: wt-status.c:189 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:200 wt-status.c:981 +#: wt-status.c:198 wt-status.c:979 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:218 wt-status.c:990 +#: wt-status.c:216 wt-status.c:988 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" -#: wt-status.c:222 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)" -#: wt-status.c:224 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)" -#: wt-status.c:225 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (använd \"git checkout -- <fil>...\" för att förkasta ändringar i " "arbetskatalogen)" -#: wt-status.c:227 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)" -#: wt-status.c:239 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)" -#: wt-status.c:254 +#: wt-status.c:252 msgid "both deleted:" msgstr "borttaget av bägge:" -#: wt-status.c:256 +#: wt-status.c:254 msgid "added by us:" msgstr "tillagt av oss:" -#: wt-status.c:258 +#: wt-status.c:256 msgid "deleted by them:" msgstr "borttaget av dem:" -#: wt-status.c:260 +#: wt-status.c:258 msgid "added by them:" msgstr "tillagt av dem:" -#: wt-status.c:262 +#: wt-status.c:260 msgid "deleted by us:" msgstr "borttaget av oss:" -#: wt-status.c:264 +#: wt-status.c:262 msgid "both added:" msgstr "tillagt av bägge:" -#: wt-status.c:266 +#: wt-status.c:264 msgid "both modified:" msgstr "ändrat av bägge:" -#: wt-status.c:276 +#: wt-status.c:274 msgid "new file:" msgstr "ny fil:" -#: wt-status.c:278 +#: wt-status.c:276 msgid "copied:" msgstr "kopierad:" -#: wt-status.c:280 +#: wt-status.c:278 msgid "deleted:" msgstr "borttagen:" -#: wt-status.c:282 +#: wt-status.c:280 msgid "modified:" msgstr "ändrad:" -#: wt-status.c:284 +#: wt-status.c:282 msgid "renamed:" msgstr "namnbytt:" -#: wt-status.c:286 +#: wt-status.c:284 msgid "typechange:" msgstr "typbyte:" -#: wt-status.c:288 +#: wt-status.c:286 msgid "unknown:" msgstr "okänd:" -#: wt-status.c:290 +#: wt-status.c:288 msgid "unmerged:" msgstr "osammanslagen:" -#: wt-status.c:372 +#: wt-status.c:370 msgid "new commits, " msgstr "nya incheckningar, " -#: wt-status.c:374 +#: wt-status.c:372 msgid "modified content, " msgstr "ändrat innehåll, " -#: wt-status.c:376 +#: wt-status.c:374 msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:821 +#: wt-status.c:819 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Stashen innehåller just nu %d post" msgstr[1] "Stashen innehåller just nu %d poster" -#: wt-status.c:853 +#: wt-status.c:851 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:855 +#: wt-status.c:853 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:937 +#: wt-status.c:935 msgid "" -"Do not touch the line above.\n" -"Everything below will be removed." +"Do not modify or remove the line above.\n" +"Everything below it will be ignored." msgstr "" -"Rör inte raden ovan.\n" -"Allt nedan kommer tas bort." +"Raden ovan får inte ändras eller tas bort.\n" +"Allt under den kommer tas bort." -#: wt-status.c:1049 +#: wt-status.c:1048 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:1052 +#: wt-status.c:1051 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:1054 +#: wt-status.c:1053 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)" -#: wt-status.c:1059 +#: wt-status.c:1058 msgid "All conflicts fixed but you are still merging." msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning." -#: wt-status.c:1062 +#: wt-status.c:1061 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:1072 +#: wt-status.c:1071 msgid "You are in the middle of an am session." msgstr "Du är i mitten av en körning av \"git am\"." -#: wt-status.c:1075 +#: wt-status.c:1074 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:1079 +#: wt-status.c:1078 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:1081 +#: wt-status.c:1080 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:1083 +#: wt-status.c:1082 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" @@ -4574,7 +4741,7 @@ msgstr "dessutom innehåller dit index ändringar som inte har checkats in." msgid "cannot %s: Your index contains uncommitted changes." msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in." -#: compat/precompose_utf8.c:58 builtin/clone.c:436 +#: compat/precompose_utf8.c:58 builtin/clone.c:437 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" @@ -4588,7 +4755,7 @@ msgstr "git add [<flaggor>] [--] <sökväg>..." msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:87 builtin/commit.c:292 +#: builtin/add.c:87 builtin/commit.c:291 msgid "updating files failed" msgstr "misslyckades uppdatera filer" @@ -4597,108 +4764,108 @@ msgstr "misslyckades uppdatera filer" msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:151 +#: builtin/add.c:153 msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:211 builtin/rev-parse.c:873 +#: builtin/add.c:213 builtin/rev-parse.c:888 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:222 +#: builtin/add.c:224 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning." -#: builtin/add.c:226 +#: builtin/add.c:228 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:229 +#: builtin/add.c:231 msgid "editing patch failed" msgstr "redigering av patch misslyckades" -#: builtin/add.c:232 +#: builtin/add.c:234 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:234 +#: builtin/add.c:236 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:239 +#: builtin/add.c:241 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:249 +#: builtin/add.c:251 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:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124 +#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124 #: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 -#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164 +#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:272 +#: builtin/add.c:274 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299 +#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310 msgid "select hunks interactively" msgstr "välj stycken interaktivt" -#: builtin/add.c:274 +#: builtin/add.c:276 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:275 +#: builtin/add.c:277 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:276 +#: builtin/add.c:278 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:277 +#: builtin/add.c:279 msgid "record only the fact that the path will be added later" msgstr "registrera endast att sökvägen kommer läggas till senare" -#: builtin/add.c:278 +#: builtin/add.c:280 msgid "add changes from all tracked and untracked files" msgstr "lägg till ändringar från alla spårade och ospårade filer" -#: builtin/add.c:281 +#: builtin/add.c:283 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)" -#: builtin/add.c:283 +#: builtin/add.c:285 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:284 +#: builtin/add.c:286 msgid "just skip files which cannot be added because of errors" msgstr "hoppa bara över filer som inte kan läggas till på grund av fel" -#: builtin/add.c:285 +#: builtin/add.c:287 msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: builtin/add.c:286 builtin/update-index.c:952 +#: builtin/add.c:288 builtin/update-index.c:954 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:286 builtin/update-index.c:953 +#: builtin/add.c:288 builtin/update-index.c:955 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" -#: builtin/add.c:288 +#: builtin/add.c:290 msgid "warn when adding an embedded repository" msgstr "varna när ett inbyggt arkiv läggs till" -#: builtin/add.c:303 +#: builtin/add.c:305 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -4729,152 +4896,152 @@ msgstr "" "\n" "Se ”git help submodule” för ytterligare information." -#: builtin/add.c:331 +#: builtin/add.c:333 #, c-format msgid "adding embedded git repository: %s" msgstr "lägger till inbäddat git-arkiv: %s" -#: builtin/add.c:349 +#: builtin/add.c:351 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Använd -f om du verkligen vill lägga till dem.\n" -#: builtin/add.c:357 +#: builtin/add.c:359 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:394 +#: builtin/add.c:396 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:401 +#: builtin/add.c:403 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" -#: builtin/add.c:405 +#: builtin/add.c:407 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x" -#: builtin/add.c:420 +#: builtin/add.c:422 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:421 +#: builtin/add.c:423 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282 -#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351 -#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272 -#: builtin/submodule--helper.c:244 +#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282 +#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350 +#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271 +#: builtin/submodule--helper.c:243 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/am.c:413 +#: builtin/am.c:414 msgid "could not parse author script" msgstr "kunde inte tolka författarskript" -#: builtin/am.c:489 +#: builtin/am.c:498 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "\"%s\" togs bort av kroken applypatch-msg" -#: builtin/am.c:530 +#: builtin/am.c:539 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/am.c:567 +#: builtin/am.c:576 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/am.c:593 +#: builtin/am.c:602 msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:777 +#: builtin/am.c:786 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:842 +#: builtin/am.c:851 msgid "Only one StGIT patch series can be applied at once" msgstr "Endast en StGIT-patchserie kan tillämpas åt gången" -#: builtin/am.c:889 +#: builtin/am.c:899 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:892 builtin/am.c:900 +#: builtin/am.c:904 builtin/am.c:916 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:897 +#: builtin/am.c:911 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:986 +#: builtin/am.c:1004 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:991 builtin/clone.c:401 +#: builtin/am.c:1009 builtin/clone.c:402 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:995 +#: builtin/am.c:1013 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1120 builtin/commit.c:377 +#: builtin/am.c:1142 builtin/commit.c:376 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/am.c:1171 +#: builtin/am.c:1193 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "När du har löst problemet, kör \"%s --continue\"." -#: builtin/am.c:1172 +#: builtin/am.c:1194 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället." -#: builtin/am.c:1173 +#: builtin/am.c:1195 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"." -#: builtin/am.c:1304 +#: builtin/am.c:1302 msgid "Patch is empty." msgstr "Patchen är tom." -#: builtin/am.c:1370 +#: builtin/am.c:1368 #, c-format msgid "invalid ident line: %.*s" msgstr "ogiltig ident-rad: %.*s" -#: builtin/am.c:1392 +#: builtin/am.c:1390 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: builtin/am.c:1586 +#: builtin/am.c:1584 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: builtin/am.c:1588 +#: builtin/am.c:1586 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1607 +#: builtin/am.c:1605 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -4882,39 +5049,39 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1613 +#: builtin/am.c:1611 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1638 +#: builtin/am.c:1636 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1662 builtin/merge.c:632 +#: builtin/am.c:1660 builtin/merge.c:641 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: builtin/am.c:1669 +#: builtin/am.c:1667 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803 -#: builtin/merge.c:828 +#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824 +#: builtin/merge.c:849 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/am.c:1715 builtin/am.c:1719 +#: builtin/am.c:1713 builtin/am.c:1717 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1735 +#: builtin/am.c:1733 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "kan inte vara interaktiv om standard in inte är ansluten till en terminal." -#: builtin/am.c:1740 +#: builtin/am.c:1738 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -4922,35 +5089,35 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1750 +#: builtin/am.c:1748 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: " -#: builtin/am.c:1800 +#: builtin/am.c:1798 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1840 builtin/am.c:1912 +#: builtin/am.c:1838 builtin/am.c:1910 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1856 +#: builtin/am.c:1854 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1864 +#: builtin/am.c:1862 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1870 +#: builtin/am.c:1868 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "En kopia av patchen som misslyckades finns i: %s" -#: builtin/am.c:1915 +#: builtin/am.c:1913 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -4960,7 +5127,7 @@ msgstr "" "Om det inte är något kvar att köa kan det hända att något annat redan\n" "introducerat samma ändringar; kanske du bör hoppa över patchen." -#: builtin/am.c:1922 +#: builtin/am.c:1920 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -4972,17 +5139,17 @@ msgstr "" "lösta.\n" "Du kan köra ”git rm” för att godta ”borttagen av dem” för den." -#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323 -#: builtin/reset.c:331 +#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332 +#: builtin/reset.c:340 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet ”%s”." -#: builtin/am.c:2083 +#: builtin/am.c:2081 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2117 +#: builtin/am.c:2116 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -4990,134 +5157,133 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2180 +#: builtin/am.c:2179 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt värde för --patch-format: %s" -#: builtin/am.c:2213 +#: builtin/am.c:2212 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2214 +#: builtin/am.c:2213 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2220 +#: builtin/am.c:2219 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2222 +#: builtin/am.c:2221 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2224 +#: builtin/am.c:2223 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57 #: builtin/repack.c:180 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2227 +#: builtin/am.c:2226 msgid "add a Signed-off-by line to the commit message" msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet" -#: builtin/am.c:2230 +#: builtin/am.c:2229 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2232 +#: builtin/am.c:2231 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2234 +#: builtin/am.c:2233 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2236 +#: builtin/am.c:2235 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2238 +#: builtin/am.c:2237 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet" -#: builtin/am.c:2241 +#: builtin/am.c:2240 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr" -#: builtin/am.c:2244 +#: builtin/am.c:2243 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2273 +#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254 +#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266 +#: builtin/am.c:2272 msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 -#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142 -#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193 -#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169 -#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134 -#: parse-options.h:245 +#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667 +#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197 +#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377 +#: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38 -#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39 +#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38 +#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39 msgid "format" msgstr "format" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2276 +#: builtin/am.c:2275 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2278 +#: builtin/am.c:2277 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2281 +#: builtin/am.c:2280 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2284 +#: builtin/am.c:2283 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2287 +#: builtin/am.c:2286 msgid "restore the original branch and abort the patching operation." msgstr "återställ originalgrenen och avbryt patchningen." -#: builtin/am.c:2291 +#: builtin/am.c:2290 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2293 +#: builtin/am.c:2292 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414 +#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236 +#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2299 +#: builtin/am.c:2298 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -5125,16 +5291,16 @@ msgstr "" "Flaggan -b/--binary har varit utan funktion länge, och\n" "kommer tas bort. Vi ber dig att inte använda den längre." -#: builtin/am.c:2324 +#: builtin/am.c:2323 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2339 +#: builtin/am.c:2338 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs." -#: builtin/am.c:2363 +#: builtin/am.c:2362 #, c-format msgid "" "Stray %s directory found.\n" @@ -5143,7 +5309,7 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2369 +#: builtin/am.c:2368 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." @@ -5345,14 +5511,18 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>" #: builtin/branch.c:31 +msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" +msgstr "git branch [<flaggor>] (-c | -C) [<gammal_gren>] <ny_gren>" + +#: builtin/branch.c:32 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<flaggor>] [-r | -a] [--points-at]" -#: builtin/branch.c:32 +#: builtin/branch.c:33 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<flaggor>] [-r | -a] [--format]" -#: builtin/branch.c:145 +#: builtin/branch.c:146 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -5361,7 +5531,7 @@ msgstr "" "tar bort grenen \"%s\" som har slagits ihop med\n" " \"%s\", men ännu inte slagits ihop med HEAD." -#: builtin/branch.c:149 +#: builtin/branch.c:150 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -5370,12 +5540,12 @@ msgstr "" "tar inte bort grenen \"%s\" som inte har slagits ihop med\n" " \"%s\", trots att den har slagits ihop med HEAD." -#: builtin/branch.c:163 +#: builtin/branch.c:164 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" -#: builtin/branch.c:167 +#: builtin/branch.c:168 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -5384,92 +5554,113 @@ msgstr "" "Grenen \"%s\" har inte slagits samman i sin helhet.\n" "Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"." -#: builtin/branch.c:180 +#: builtin/branch.c:181 msgid "Update of config-file failed" msgstr "Misslyckades uppdatera konfigurationsfil" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -#: builtin/branch.c:217 +#: builtin/branch.c:218 msgid "Couldn't look up commit object for HEAD" msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" -#: builtin/branch.c:231 +#: builtin/branch.c:232 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\"" -#: builtin/branch.c:246 +#: builtin/branch.c:247 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "fjärrspårande grenen \"%s\" hittades inte." -#: builtin/branch.c:247 +#: builtin/branch.c:248 #, c-format msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." -#: builtin/branch.c:262 +#: builtin/branch.c:263 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\"" -#: builtin/branch.c:263 +#: builtin/branch.c:264 #, c-format msgid "Error deleting branch '%s'" msgstr "Fel vid borttagning av grenen \"%s\"" -#: builtin/branch.c:270 +#: builtin/branch.c:271 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Tog bort fjärrspårande grenen %s (var %s).\n" -#: builtin/branch.c:271 +#: builtin/branch.c:272 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:445 +#: builtin/branch.c:417 builtin/tag.c:58 +msgid "unable to parse format string" +msgstr "kan inte tolka formatsträng" + +#: builtin/branch.c:450 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Grenen %s ombaseras på %s" -#: builtin/branch.c:449 +#: builtin/branch.c:454 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" på %s" -#: builtin/branch.c:464 +#: builtin/branch.c:470 +msgid "cannot copy the current branch while not on any." +msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon." + +#: builtin/branch.c:472 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:474 +#: builtin/branch.c:483 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:491 +#: builtin/branch.c:504 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:494 +#: builtin/branch.c:506 +msgid "Branch copy failed" +msgstr "Misslyckades kopiera gren" + +#: builtin/branch.c:510 +#, c-format +msgid "Copied a misnamed branch '%s' away" +msgstr "Kopierade bort en felaktigt namngiven gren \"%s\"" + +#: builtin/branch.c:513 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:497 +#: builtin/branch.c:519 #, 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:506 +#: builtin/branch.c:528 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:522 +#: builtin/branch.c:530 +msgid "Branch is copied, but update of config-file failed" +msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen" + +#: builtin/branch.c:546 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5480,235 +5671,231 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/branch.c:555 +#: builtin/branch.c:579 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:557 +#: builtin/branch.c:581 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:558 +#: builtin/branch.c:582 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:559 +#: builtin/branch.c:583 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:561 -msgid "change upstream info" -msgstr "ändra uppströmsinformation" +#: builtin/branch.c:585 +msgid "do not use" +msgstr "använd ej" -#: builtin/branch.c:563 +#: builtin/branch.c:587 msgid "upstream" msgstr "uppströms" -#: builtin/branch.c:563 +#: builtin/branch.c:587 msgid "change the upstream info" msgstr "ändra uppströmsinformationen" -#: builtin/branch.c:564 +#: builtin/branch.c:588 msgid "Unset the upstream info" msgstr "Ta bort uppströmsinformationen" -#: builtin/branch.c:565 +#: builtin/branch.c:589 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:566 +#: builtin/branch.c:590 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:568 builtin/branch.c:570 +#: builtin/branch.c:592 builtin/branch.c:594 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:569 builtin/branch.c:571 +#: builtin/branch.c:593 builtin/branch.c:595 msgid "print only branches that don't contain the commit" msgstr "visa endast grenar som inte innehåller incheckningen" -#: builtin/branch.c:574 +#: builtin/branch.c:598 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:575 +#: builtin/branch.c:599 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:577 +#: builtin/branch.c:601 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:578 +#: builtin/branch.c:602 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:579 +#: builtin/branch.c:603 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:580 +#: builtin/branch.c:604 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:581 +#: builtin/branch.c:605 +msgid "copy a branch and its reflog" +msgstr "kopiera en gren och dess reflogg" + +#: builtin/branch.c:606 +msgid "copy a branch, even if target exists" +msgstr "kopiera en gren, även om målet finns" + +#: builtin/branch.c:607 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:582 +#: builtin/branch.c:608 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:584 +#: builtin/branch.c:610 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:585 +#: builtin/branch.c:611 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:586 +#: builtin/branch.c:612 msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:587 +#: builtin/branch.c:613 msgid "print only branches that are not merged" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:588 +#: builtin/branch.c:614 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427 +#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405 msgid "key" msgstr "nyckel" -#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428 +#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406 msgid "field name to sort on" msgstr "fältnamn att sortera på" -#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407 -#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573 -#: builtin/tag.c:430 +#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 +#: builtin/tag.c:408 msgid "object" msgstr "objekt" -#: builtin/branch.c:593 +#: builtin/branch.c:619 msgid "print only branches of the object" msgstr "visa endast grenar för objektet" -#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435 +#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415 msgid "sorting and filtering are case insensitive" msgstr "sortering och filtrering skiljer gemener och VERSALER" -#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434 +#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/branch.c:615 -msgid "Failed to resolve HEAD as a valid ref." -msgstr "Misslyckades slå upp HEAD som giltig referens." - -#: builtin/branch.c:619 builtin/clone.c:728 +#: builtin/branch.c:645 builtin/clone.c:729 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:642 +#: builtin/branch.c:668 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:653 builtin/branch.c:705 +#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:681 +#: builtin/branch.c:708 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:686 +#: builtin/branch.c:713 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:693 +#: builtin/branch.c:720 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu." -#: builtin/branch.c:696 +#: builtin/branch.c:723 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:711 -msgid "too many branches for a rename operation" -msgstr "för många grenar för namnbyte" +#: builtin/branch.c:738 +msgid "too many branches for a copy operation" +msgstr "för många grenar för kopiering" -#: builtin/branch.c:716 -msgid "too many branches to set new upstream" -msgstr "för många grenar för att byta uppström" +#: builtin/branch.c:747 +msgid "too many arguments for a rename operation" +msgstr "för många flaggor för namnbyte" -#: builtin/branch.c:720 +#: builtin/branch.c:752 +msgid "too many arguments to set new upstream" +msgstr "för många flaggor för att byta uppström" + +#: builtin/branch.c:756 #, 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:723 builtin/branch.c:745 builtin/branch.c:766 +#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:727 +#: builtin/branch.c:763 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:739 -msgid "too many branches to unset upstream" -msgstr "för många grenar för att ta bort uppström" +#: builtin/branch.c:775 +msgid "too many arguments to unset upstream" +msgstr "för många flaggor för att ta bort uppström" -#: builtin/branch.c:743 +#: builtin/branch.c:779 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:749 +#: builtin/branch.c:785 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:763 +#: builtin/branch.c:797 msgid "it does not make sense to create 'HEAD' manually" msgstr "kan inte skapa \"HEAD\" manuellt" -#: builtin/branch.c:769 +#: builtin/branch.c:803 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:772 -#, c-format +#: builtin/branch.c:806 msgid "" -"The --set-upstream flag is deprecated and will be removed. Consider using --" -"track or --set-upstream-to\n" +"the '--set-upstream' option is no longer supported. Please use '--track' or " +"'--set-upstream-to' instead." msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " -"eller --set-upstream-to\n" - -#: builtin/branch.c:789 -#, c-format -msgid "" -"\n" -"If you wanted to make '%s' track '%s', do this:\n" -"\n" -msgstr "" -"\n" -"Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n" -"\n" +"eller --set-upstream-to istället." #: builtin/bundle.c:45 #, c-format @@ -5723,7 +5910,7 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/cat-file.c:519 +#: builtin/cat-file.c:521 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -5731,7 +5918,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>" -#: builtin/cat-file.c:520 +#: builtin/cat-file.c:522 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -5739,64 +5926,64 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:557 +#: builtin/cat-file.c:559 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<typ> kan vara en av: blob, tree, commit, tag" -#: builtin/cat-file.c:558 +#: builtin/cat-file.c:560 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:559 +#: builtin/cat-file.c:561 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:561 +#: builtin/cat-file.c:563 msgid "exit with zero when there's no error" msgstr "avsluta med noll när det inte uppstått något fel" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:564 msgid "pretty-print object's content" msgstr "visa objektets innehåll snyggt" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:566 msgid "for blob objects, run textconv on object's content" msgstr "för blob-objekt, kör filter på objektets innehåll" -#: builtin/cat-file.c:566 +#: builtin/cat-file.c:568 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:567 git-submodule.sh:944 +#: builtin/cat-file.c:569 git-submodule.sh:943 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:570 msgid "use a specific path for --textconv/--filters" msgstr "använd specifik sökväg för --textconv/--filters" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:572 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt" -#: builtin/cat-file.c:571 +#: builtin/cat-file.c:573 msgid "buffer --batch output" msgstr "buffra utdata från --batch" -#: builtin/cat-file.c:573 +#: builtin/cat-file.c:575 msgid "show info and content of objects fed from the standard input" msgstr "visa information och innehåll för objekt som listas på standard in" -#: builtin/cat-file.c:576 +#: builtin/cat-file.c:578 msgid "show info about objects fed from the standard input" msgstr "visa information för objekt som listas på standard in" -#: builtin/cat-file.c:579 +#: builtin/cat-file.c:581 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "följ symboliska länkar i trädet (använd med --batch eller --batch-check)" -#: builtin/cat-file.c:581 +#: builtin/cat-file.c:583 msgid "show all objects with --batch or --batch-check" msgstr "visa alla objekt med --batch eller --batch-check" @@ -5824,7 +6011,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:20 builtin/checkout.c:1143 builtin/gc.c:357 +#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -5914,9 +6101,9 @@ msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" #: builtin/checkout-index.c:175 builtin/column.c:31 -#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 -#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 -#: builtin/worktree.c:478 +#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999 +#: builtin/worktree.c:498 msgid "string" msgstr "sträng" @@ -5987,54 +6174,54 @@ msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt." msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:497 +#: builtin/checkout.c:501 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:628 +#: builtin/checkout.c:632 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:669 +#: builtin/checkout.c:673 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:673 builtin/clone.c:682 +#: builtin/checkout.c:677 builtin/clone.c:683 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:677 +#: builtin/checkout.c:681 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:684 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:684 +#: builtin/checkout.c:688 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:686 builtin/checkout.c:1075 +#: builtin/checkout.c:690 builtin/checkout.c:1086 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:688 +#: builtin/checkout.c:692 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:739 +#: builtin/checkout.c:743 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:745 +#: builtin/checkout.c:749 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6057,7 +6244,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:764 +#: builtin/checkout.c:768 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6084,161 +6271,161 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:800 +#: builtin/checkout.c:809 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:804 +#: builtin/checkout.c:813 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:832 builtin/checkout.c:1070 +#: builtin/checkout.c:843 builtin/checkout.c:1081 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:976 +#: builtin/checkout.c:987 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1016 builtin/worktree.c:215 +#: builtin/checkout.c:1027 builtin/worktree.c:233 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1045 +#: builtin/checkout.c:1056 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1084 +#: builtin/checkout.c:1095 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1087 builtin/checkout.c:1091 +#: builtin/checkout.c:1098 builtin/checkout.c:1102 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103 -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114 +#: builtin/checkout.c:1117 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1122 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328 -#: builtin/worktree.c:330 +#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346 +#: builtin/worktree.c:348 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1155 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1157 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1158 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1149 builtin/worktree.c:332 +#: builtin/checkout.c:1159 builtin/worktree.c:350 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1160 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1162 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1162 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1163 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1165 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1167 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1168 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:1159 builtin/merge.c:235 +#: builtin/checkout.c:1169 builtin/merge.c:238 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251 +#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251 msgid "style" msgstr "stil" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1171 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1164 +#: builtin/checkout.c:1174 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1166 +#: builtin/checkout.c:1176 msgid "second guess 'git checkout <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1178 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:1172 builtin/clone.c:80 builtin/fetch.c:114 -#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544 +#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136 +#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544 #: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/checkout.c:1203 +#: builtin/checkout.c:1212 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1220 +#: builtin/checkout.c:1229 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1225 +#: builtin/checkout.c:1234 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1261 +#: builtin/checkout.c:1270 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1268 +#: builtin/checkout.c:1277 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "”%s” är inte en incheckning och grenen ”%s” kan inte skapas från den" -#: builtin/checkout.c:1272 +#: builtin/checkout.c:1281 #, 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:1276 +#: builtin/checkout.c:1285 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6278,7 +6465,7 @@ msgstr "Skulle hoppa över arkivet %s\n" msgid "failed to remove %s" msgstr "misslyckades ta bort %s" -#: builtin/clean.c:298 git-add--interactive.perl:572 +#: builtin/clean.c:301 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -6291,7 +6478,7 @@ msgstr "" "foo - markera post baserad på unikt prefix\n" " - (tomt) markera ingenting\n" -#: builtin/clean.c:302 git-add--interactive.perl:581 +#: builtin/clean.c:305 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -6312,38 +6499,38 @@ msgstr "" "* - välj alla poster\n" " - (tomt) avsluta markering\n" -#: builtin/clean.c:518 git-add--interactive.perl:547 +#: builtin/clean.c:521 git-add--interactive.perl:547 #: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Vadå (%s)?\n" -#: builtin/clean.c:660 +#: builtin/clean.c:663 #, c-format msgid "Input ignore patterns>> " msgstr "Ange ignoreringsmönster>>" -#: builtin/clean.c:697 +#: builtin/clean.c:700 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "VARNING: Hittar inte poster som motsvarar: %s" -#: builtin/clean.c:718 +#: builtin/clean.c:721 msgid "Select items to delete" msgstr "Välj poster att ta bort" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:759 +#: builtin/clean.c:762 #, c-format msgid "Remove %s [y/N]? " msgstr "Ta bort %s [Y=ja / N=nej]? " -#: builtin/clean.c:784 git-add--interactive.perl:1616 +#: builtin/clean.c:787 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "Hej då.\n" -#: builtin/clean.c:792 +#: builtin/clean.c:795 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6361,63 +6548,63 @@ msgstr "" "help - denna skärm\n" "? - hjälp för kommandoval" -#: builtin/clean.c:819 git-add--interactive.perl:1692 +#: builtin/clean.c:822 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: builtin/clean.c:820 git-add--interactive.perl:1689 +#: builtin/clean.c:823 git-add--interactive.perl:1689 msgid "What now" msgstr "Vad nu" -#: builtin/clean.c:828 +#: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Skulle ta bort följande post:" msgstr[1] "Skulle ta bort följande poster:" -#: builtin/clean.c:844 +#: builtin/clean.c:847 msgid "No more files to clean, exiting." msgstr "Inga fler filer att städa, avslutar." -#: builtin/clean.c:906 +#: builtin/clean.c:909 msgid "do not print names of files removed" msgstr "skriv inte ut namn på borttagna filer" -#: builtin/clean.c:908 +#: builtin/clean.c:911 msgid "force" msgstr "tvinga" -#: builtin/clean.c:909 +#: builtin/clean.c:912 msgid "interactive cleaning" msgstr "städa interaktivt" -#: builtin/clean.c:911 +#: builtin/clean.c:914 msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454 -#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397 +#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465 +#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397 #: builtin/name-rev.c:399 builtin/show-ref.c:176 msgid "pattern" msgstr "mönster" -#: builtin/clean.c:913 +#: builtin/clean.c:916 msgid "add <pattern> to ignore rules" msgstr "lägg till <mönster> till ignoreringsregler" -#: builtin/clean.c:914 +#: builtin/clean.c:917 msgid "remove ignored files, too" msgstr "ta även bort ignorerade filer" -#: builtin/clean.c:916 +#: builtin/clean.c:919 msgid "remove only ignored files" msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:934 +#: builtin/clean.c:937 msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" -#: builtin/clean.c:938 +#: builtin/clean.c:941 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -6425,7 +6612,7 @@ msgstr "" "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar " "städa" -#: builtin/clean.c:941 +#: builtin/clean.c:944 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6433,142 +6620,142 @@ msgstr "" "clean.requireForce har standardvärdet true och varken -i, -n eller -f " "angavs; vägrar städa" -#: builtin/clone.c:38 +#: builtin/clone.c:39 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:82 +#: builtin/clone.c:83 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479 +#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:87 +#: builtin/clone.c:88 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:89 +#: builtin/clone.c:90 msgid "to clone from a local repository" msgstr "för att klona från ett lokalt arkiv" -#: builtin/clone.c:91 +#: builtin/clone.c:92 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hårda länkar, kopiera alltid" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:95 builtin/clone.c:99 +#: builtin/clone.c:96 builtin/clone.c:100 msgid "pathspec" msgstr "sökvägsangivelse" -#: builtin/clone.c:95 builtin/clone.c:99 +#: builtin/clone.c:96 builtin/clone.c:100 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:102 +#: builtin/clone.c:103 msgid "number of submodules cloned in parallel" msgstr "antal undermoduler som klonas parallellt" -#: builtin/clone.c:103 builtin/init-db.c:476 +#: builtin/clone.c:104 builtin/init-db.c:476 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:104 builtin/init-db.c:477 +#: builtin/clone.c:105 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642 -#: builtin/submodule--helper.c:983 +#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635 +#: builtin/submodule--helper.c:1002 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:110 +#: builtin/clone.c:111 msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" -#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44 msgid "name" msgstr "namn" -#: builtin/clone.c:112 +#: builtin/clone.c:113 msgid "use <name> instead of 'origin' to track upstream" msgstr "använd <namn> istället för \"origin\" för att spåra uppströms" -#: builtin/clone.c:114 +#: builtin/clone.c:115 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checka ut <gren> istället för fjärrens HEAD" -#: builtin/clone.c:116 +#: builtin/clone.c:117 msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025 +#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804 #: builtin/pull.c:205 msgid "depth" msgstr "djup" -#: builtin/clone.c:118 +#: builtin/clone.c:119 msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932 +#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938 #: parse-options.h:142 msgid "time" msgstr "tid" -#: builtin/clone.c:120 +#: builtin/clone.c:121 msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon från en angiven tidpunkt" -#: builtin/clone.c:121 builtin/fetch.c:119 +#: builtin/clone.c:122 builtin/fetch.c:141 msgid "revision" msgstr "revision" -#: builtin/clone.c:122 builtin/fetch.c:120 +#: builtin/clone.c:123 builtin/fetch.c:142 msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" -#: builtin/clone.c:124 +#: builtin/clone.c:125 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:126 +#: builtin/clone.c:127 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "klona inga taggar och gör att senare hämtningar inte följer dem" -#: builtin/clone.c:128 +#: builtin/clone.c:129 msgid "any cloned submodules will be shallow" msgstr "klonade undermoduler kommer vara grunda" -#: builtin/clone.c:129 builtin/init-db.c:485 +#: builtin/clone.c:130 builtin/init-db.c:485 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:130 builtin/init-db.c:486 +#: builtin/clone.c:131 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" -#: builtin/clone.c:131 +#: builtin/clone.c:132 msgid "key=value" msgstr "nyckel=värde" -#: builtin/clone.c:132 +#: builtin/clone.c:133 msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555 +#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557 +#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" -#: builtin/clone.c:272 +#: builtin/clone.c:273 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -6576,42 +6763,42 @@ msgstr "" "Kunde inte gissa katalognamn.\n" "Ange en katalog på kommandoraden" -#: builtin/clone.c:325 +#: builtin/clone.c:326 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n" -#: builtin/clone.c:397 +#: builtin/clone.c:398 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: builtin/clone.c:405 +#: builtin/clone.c:406 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:419 +#: builtin/clone.c:420 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" -#: builtin/clone.c:441 +#: builtin/clone.c:442 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:445 +#: builtin/clone.c:446 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:470 +#: builtin/clone.c:471 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:482 +#: builtin/clone.c:483 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -6621,138 +6808,138 @@ msgstr "" "Du kan inspektera det som checkades ut med \"git status\"\n" "och försöka checka ut igen med \"git checkout -f HEAD\"\n" -#: builtin/clone.c:559 +#: builtin/clone.c:560 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Kunde inte hitta fjärrgrenen %s för att klona." -#: builtin/clone.c:654 +#: builtin/clone.c:655 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: builtin/clone.c:670 +#: builtin/clone.c:671 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:719 +#: builtin/clone.c:720 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n" -#: builtin/clone.c:750 +#: builtin/clone.c:751 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:792 +#: builtin/clone.c:796 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:855 +#: builtin/clone.c:859 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:857 +#: builtin/clone.c:861 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:890 builtin/receive-pack.c:1945 +#: builtin/clone.c:894 builtin/receive-pack.c:1944 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:894 +#: builtin/clone.c:898 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:907 +#: builtin/clone.c:911 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:910 +#: builtin/clone.c:914 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:923 +#: builtin/clone.c:927 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:929 builtin/fetch.c:1337 +#: builtin/clone.c:933 builtin/fetch.c:1360 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:939 +#: builtin/clone.c:943 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." -#: builtin/clone.c:949 +#: builtin/clone.c:953 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260 -#: builtin/worktree.c:222 builtin/worktree.c:252 +#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270 +#: builtin/worktree.c:240 builtin/worktree.c:270 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:967 +#: builtin/clone.c:971 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:979 +#: builtin/clone.c:983 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:981 +#: builtin/clone.c:985 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:1005 +#: builtin/clone.c:1009 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" "clone --recursive är inte kompatibel med --reference och --reference-if-able" -#: builtin/clone.c:1067 +#: builtin/clone.c:1071 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1069 +#: builtin/clone.c:1073 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1071 +#: builtin/clone.c:1075 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1074 +#: builtin/clone.c:1078 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1079 +#: builtin/clone.c:1083 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1083 +#: builtin/clone.c:1087 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:1138 builtin/clone.c:1146 +#: builtin/clone.c:1142 builtin/clone.c:1150 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1149 +#: builtin/clone.c:1153 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -6892,61 +7079,61 @@ msgstr "" "\"git cherry-pick --continue\" kommer därefter att återuppta\n" "cherry-pick för återstående incheckningar.\n" -#: builtin/commit.c:319 +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:360 +#: builtin/commit.c:359 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:366 +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:379 +#: builtin/commit.c:378 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporärt index" -#: builtin/commit.c:381 +#: builtin/commit.c:380 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cacheträdet" -#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477 +#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:459 +#: builtin/commit.c:461 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:461 +#: builtin/commit.c:463 msgid "cannot do a partial commit during a cherry-pick." msgstr "kan inte utföra en delvis incheckning under en cherry-pick." -#: builtin/commit.c:470 +#: builtin/commit.c:471 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:489 +#: builtin/commit.c:490 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:583 +#: builtin/commit.c:587 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar författarhuvud" -#: builtin/commit.c:585 +#: builtin/commit.c:589 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:604 +#: builtin/commit.c:608 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:656 +#: builtin/commit.c:660 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -6954,38 +7141,38 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093 +#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:705 builtin/shortlog.c:295 +#: builtin/commit.c:709 builtin/shortlog.c:309 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:707 +#: builtin/commit.c:711 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:711 +#: builtin/commit.c:715 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:738 builtin/commit.c:746 +#: builtin/commit.c:742 builtin/commit.c:750 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:743 +#: builtin/commit.c:747 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:797 +#: builtin/commit.c:801 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:815 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -7000,7 +7187,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:820 +#: builtin/commit.c:824 #, c-format msgid "" "\n" @@ -7015,7 +7202,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:833 +#: builtin/commit.c:837 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7025,7 +7212,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:840 +#: builtin/commit.c:844 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7036,146 +7223,146 @@ msgstr "" "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:857 +#: builtin/commit.c:861 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:865 +#: builtin/commit.c:869 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:872 +#: builtin/commit.c:876 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:889 +#: builtin/commit.c:893 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:951 +#: builtin/commit.c:958 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:965 builtin/tag.c:274 +#: builtin/commit.c:972 builtin/tag.c:252 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" -#: builtin/commit.c:1068 +#: builtin/commit.c:1075 #, c-format 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:1083 builtin/commit.c:1328 +#: builtin/commit.c:1090 builtin/commit.c:1335 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1121 +#: builtin/commit.c:1128 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1151 +#: builtin/commit.c:1158 msgid "Using both --reset-author and --author does not make sense" msgstr "Kan inte använda både --reset-author och --author" -#: builtin/commit.c:1160 +#: builtin/commit.c:1167 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1163 +#: builtin/commit.c:1170 msgid "You are in the middle of a merge -- cannot amend." msgstr "Du är i mitten av en sammanslagning -- kan inte utöka." -#: builtin/commit.c:1165 +#: builtin/commit.c:1172 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Du är i mitten av en cherry-pick -- kan inte utöka." -#: builtin/commit.c:1168 +#: builtin/commit.c:1175 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1178 +#: builtin/commit.c:1185 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Endast en av -c/-C/-F/--fixup kan användas." -#: builtin/commit.c:1180 +#: builtin/commit.c:1187 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup." -#: builtin/commit.c:1188 +#: builtin/commit.c:1195 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author kan endast användas med -C, -c eller --amend." -#: builtin/commit.c:1205 +#: builtin/commit.c:1212 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Endast en av --include/--only/--all/--interactive/--patch kan användas." -#: builtin/commit.c:1207 +#: builtin/commit.c:1214 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:1219 builtin/tag.c:552 +#: builtin/commit.c:1226 builtin/tag.c:535 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1224 +#: builtin/commit.c:1231 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1342 builtin/commit.c:1617 +#: builtin/commit.c:1349 builtin/commit.c:1626 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1344 builtin/commit.c:1619 +#: builtin/commit.c:1351 builtin/commit.c:1628 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1346 +#: builtin/commit.c:1353 msgid "show stash information" msgstr "visa information om stash" -#: builtin/commit.c:1348 +#: builtin/commit.c:1355 msgid "version" msgstr "version" -#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530 -#: builtin/worktree.c:449 +#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530 +#: builtin/worktree.c:469 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1351 builtin/commit.c:1623 +#: builtin/commit.c:1358 builtin/commit.c:1632 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1354 builtin/commit.c:1626 +#: builtin/commit.c:1361 builtin/commit.c:1635 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983 -#: builtin/fast-export.c:986 builtin/tag.c:412 +#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999 +#: builtin/fast-export.c:1002 builtin/tag.c:390 msgid "mode" msgstr "läge" -#: builtin/commit.c:1357 builtin/commit.c:1629 +#: builtin/commit.c:1364 builtin/commit.c:1638 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:1360 +#: builtin/commit.c:1367 msgid "show ignored files" msgstr "visa ignorerade filer" -#: builtin/commit.c:1361 parse-options.h:155 +#: builtin/commit.c:1368 parse-options.h:155 msgid "when" msgstr "när" -#: builtin/commit.c:1362 +#: builtin/commit.c:1369 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7183,201 +7370,202 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1364 +#: builtin/commit.c:1371 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1440 +#: builtin/commit.c:1449 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1442 +#: builtin/commit.c:1451 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1487 +#: builtin/commit.c:1496 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1490 +#: builtin/commit.c:1499 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1587 +#: builtin/commit.c:1596 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1588 +#: builtin/commit.c:1597 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1590 +#: builtin/commit.c:1599 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1591 builtin/tag.c:410 +#: builtin/commit.c:1600 builtin/tag.c:388 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1592 +#: builtin/commit.c:1601 msgid "author" msgstr "författare" -#: builtin/commit.c:1592 +#: builtin/commit.c:1601 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1593 builtin/gc.c:358 +#: builtin/commit.c:1602 builtin/gc.c:359 msgid "date" msgstr "datum" -#: builtin/commit.c:1593 +#: builtin/commit.c:1602 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401 -#: builtin/notes.c:564 builtin/tag.c:408 +#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402 +#: builtin/notes.c:565 builtin/tag.c:386 msgid "message" msgstr "meddelande" -#: builtin/commit.c:1594 +#: builtin/commit.c:1603 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:77 +#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606 +#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1595 +#: builtin/commit.c:1604 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:1605 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1597 +#: builtin/commit.c:1606 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:1607 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:1608 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:1430 builtin/revert.c:105 +#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239 +#: builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1601 +#: builtin/commit.c:1610 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1602 +#: builtin/commit.c:1611 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1603 +#: builtin/commit.c:1612 msgid "default" msgstr "standard" -#: builtin/commit.c:1603 builtin/tag.c:413 +#: builtin/commit.c:1612 builtin/tag.c:391 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:1613 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173 +#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "GPG-signera incheckning" -#: builtin/commit.c:1609 +#: builtin/commit.c:1618 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1610 +#: builtin/commit.c:1619 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1611 +#: builtin/commit.c:1620 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:1621 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1613 +#: builtin/commit.c:1622 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1614 +#: builtin/commit.c:1623 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1615 +#: builtin/commit.c:1624 msgid "bypass pre-commit and commit-msg hooks" msgstr "förbigå pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1616 +#: builtin/commit.c:1625 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1627 +#: builtin/commit.c:1636 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1628 +#: builtin/commit.c:1637 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1633 +#: builtin/commit.c:1642 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1635 +#: builtin/commit.c:1644 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1665 +#: builtin/commit.c:1674 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1710 +#: builtin/commit.c:1719 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1717 +#: builtin/commit.c:1726 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1736 +#: builtin/commit.c:1745 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1747 -#, c-format -msgid "Aborting commit; you did not edit the message.\n" -msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" - -#: builtin/commit.c:1752 +#: builtin/commit.c:1756 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1800 +#: builtin/commit.c:1761 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" + +#: builtin/commit.c:1809 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7543,12 +7731,12 @@ msgstr "" msgid "--local can only be used inside a git repository" msgstr "--local kan bara användas inuti ett git-arkiv" -#: builtin/config.c:621 +#: builtin/config.c:624 #, c-format msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%s\"" -#: builtin/config.c:633 +#: builtin/config.c:637 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7557,11 +7745,11 @@ msgstr "" "kan inte skriva över flera värden med ett ensamt värde\n" " Använd en regexp, --add eller --replace-all för att ändra %s." -#: builtin/count-objects.c:87 +#: builtin/count-objects.c:88 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:97 +#: builtin/count-objects.c:98 msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" @@ -7585,47 +7773,47 @@ msgstr "lättviktig" msgid "annotated" msgstr "annoterad" -#: builtin/describe.c:253 +#: builtin/describe.c:264 #, c-format msgid "annotated tag %s not available" msgstr "den annoterade taggen %s inte tillgänglig" -#: builtin/describe.c:257 +#: builtin/describe.c:268 #, c-format msgid "annotated tag %s has no embedded name" msgstr "den annoterade taggen %s har inget inbäddat namn" -#: builtin/describe.c:259 +#: builtin/describe.c:270 #, c-format msgid "tag '%s' is really '%s' here" msgstr "taggen \"%s\" är i verkligheten \"%s\" här" -#: builtin/describe.c:286 builtin/log.c:489 +#: builtin/describe.c:297 builtin/log.c:493 #, c-format msgid "Not a valid object name %s" msgstr "Objektnamnet är inte giltigt: %s" -#: builtin/describe.c:289 +#: builtin/describe.c:300 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt \"%s\"-objekt" -#: builtin/describe.c:306 +#: builtin/describe.c:317 #, c-format msgid "no tag exactly matches '%s'" msgstr "ingen tagg motsvarar \"%s\" exakt" -#: builtin/describe.c:308 +#: builtin/describe.c:319 #, c-format msgid "searching to describe %s\n" msgstr "söker för att beskriva %s\n" -#: builtin/describe.c:355 +#: builtin/describe.c:366 #, c-format msgid "finished search at %s\n" msgstr "avslutade sökning på %s\n" -#: builtin/describe.c:382 +#: builtin/describe.c:393 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7634,7 +7822,7 @@ msgstr "" "Inga annoterade taggar kan beskriva \"%s\".\n" "Det finns dock oannoterade taggar: testa --tags." -#: builtin/describe.c:386 +#: builtin/describe.c:397 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7643,12 +7831,12 @@ msgstr "" "Inga taggar kan beskriva \"%s\".\n" "Testa --always, eller skapa några taggar." -#: builtin/describe.c:416 +#: builtin/describe.c:427 #, c-format msgid "traversed %lu commits\n" msgstr "traverserade %lu incheckningar\n" -#: builtin/describe.c:419 +#: builtin/describe.c:430 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -7657,75 +7845,75 @@ msgstr "" "mer än %i taggar hittades; listar de %i senaste\n" "gav upp sökningen vid %s\n" -#: builtin/describe.c:441 +#: builtin/describe.c:452 msgid "find the tag that comes after the commit" msgstr "hitta taggen som kommer efter incheckningen" -#: builtin/describe.c:442 +#: builtin/describe.c:453 msgid "debug search strategy on stderr" msgstr "felsök sökstrategin på standard fel" -#: builtin/describe.c:443 +#: builtin/describe.c:454 msgid "use any ref" msgstr "använd alla referenser" -#: builtin/describe.c:444 +#: builtin/describe.c:455 msgid "use any tag, even unannotated" msgstr "använd alla taggar, även oannoterade" -#: builtin/describe.c:445 +#: builtin/describe.c:456 msgid "always use long format" msgstr "använd alltid långt format" -#: builtin/describe.c:446 +#: builtin/describe.c:457 msgid "only follow first parent" msgstr "följ endast första föräldern" -#: builtin/describe.c:449 +#: builtin/describe.c:460 msgid "only output exact matches" msgstr "skriv endast ut exakta träffar" -#: builtin/describe.c:451 +#: builtin/describe.c:462 msgid "consider <n> most recent tags (default: 10)" msgstr "överväg de <n> nyaste taggarna (standard: 10)" -#: builtin/describe.c:453 +#: builtin/describe.c:464 msgid "only consider tags matching <pattern>" msgstr "överväg endast taggar som motsvarar <mönster>" -#: builtin/describe.c:455 +#: builtin/describe.c:466 msgid "do not consider tags matching <pattern>" msgstr "överväg inte taggar som motsvarar <mönster>" -#: builtin/describe.c:457 builtin/name-rev.c:406 +#: builtin/describe.c:468 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" -#: builtin/describe.c:458 builtin/describe.c:461 +#: builtin/describe.c:469 builtin/describe.c:472 msgid "mark" msgstr "märke" -#: builtin/describe.c:459 +#: builtin/describe.c:470 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")" -#: builtin/describe.c:462 +#: builtin/describe.c:473 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")" -#: builtin/describe.c:480 +#: builtin/describe.c:491 msgid "--long is incompatible with --abbrev=0" msgstr "--long är inkompatibel med --abbrev=0" -#: builtin/describe.c:509 +#: builtin/describe.c:520 msgid "No names found, cannot describe anything." msgstr "Inga namn hittades, kan inte beskriva något." -#: builtin/describe.c:552 +#: builtin/describe.c:563 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden" -#: builtin/describe.c:554 +#: builtin/describe.c:565 msgid "--broken is incompatible with commit-ishes" msgstr "--broken är inkompatibelt med \"commit-ish\"-värden" @@ -7739,21 +7927,21 @@ msgstr "\"%s\": inte en normal fil eller symbolisk länk" msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:359 +#: builtin/diff.c:357 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:402 +#: builtin/diff.c:400 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:411 +#: builtin/diff.c:409 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:416 +#: builtin/diff.c:414 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." @@ -7763,27 +7951,27 @@ msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" "git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]" -#: builtin/difftool.c:249 +#: builtin/difftool.c:259 #, c-format msgid "failed: %d" msgstr "misslyckades: %d" -#: builtin/difftool.c:291 +#: builtin/difftool.c:301 #, c-format msgid "could not read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/difftool.c:293 +#: builtin/difftool.c:303 #, c-format msgid "could not read symlink file %s" msgstr "kunde inte läsa symbolisk länk-fil %s" -#: builtin/difftool.c:301 +#: builtin/difftool.c:311 #, c-format msgid "could not read object %s for symlink %s" msgstr "kunde inte läsa objektet %s för symboliska länken %s" -#: builtin/difftool.c:403 +#: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -7791,53 +7979,53 @@ msgstr "" "kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n" "katalogdiffläge (\"-d\" och \"--dir-diff\")." -#: builtin/difftool.c:626 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "bägge filerna ändrade: \"%s\" och \"%s\"." -#: builtin/difftool.c:628 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "filen i arbetskatalogen lämnades kvar." -#: builtin/difftool.c:639 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "temporära filer finns i \"%s\"." -#: builtin/difftool.c:640 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "du kanske vill städa eller rädda dem." -#: builtin/difftool.c:689 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "använd \"diff.guitool\" istället för \"diff.tool\"" -#: builtin/difftool.c:691 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "utför diff för hela katalogen" -#: builtin/difftool.c:693 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "fråga inte vid start av diff-verktyg" -#: builtin/difftool.c:699 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "använd symboliska länkar i katalogdiffläge" -#: builtin/difftool.c:700 +#: builtin/difftool.c:707 msgid "<tool>" msgstr "<verktyg>" -#: builtin/difftool.c:701 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "använd angivet diff-verktyg" -#: builtin/difftool.c:703 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "visa en lista över diff-verktyg som kan användas med ”--tool”" -#: builtin/difftool.c:706 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -7845,19 +8033,19 @@ msgstr "" "låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde " "skilt från noll" -#: builtin/difftool.c:708 +#: builtin/difftool.c:715 msgid "<command>" msgstr "<kommando>" -#: builtin/difftool.c:709 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "ange eget kommando för att visa diffar" -#: builtin/difftool.c:733 +#: builtin/difftool.c:740 msgid "no <tool> given for --tool=<tool>" msgstr "inget <verktyg> angavs för --tool=<verktyg>" -#: builtin/difftool.c:740 +#: builtin/difftool.c:747 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "inget <kommando> angavs för --extcmd=<kommando>" @@ -7865,143 +8053,143 @@ msgstr "inget <kommando> angavs för --extcmd=<kommando>" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-flaggor]" -#: builtin/fast-export.c:982 +#: builtin/fast-export.c:998 msgid "show progress after <n> objects" msgstr "visa förlopp efter <n> objekt" -#: builtin/fast-export.c:984 +#: builtin/fast-export.c:1000 msgid "select handling of signed tags" msgstr "välj hantering av signerade taggar" -#: builtin/fast-export.c:987 +#: builtin/fast-export.c:1003 msgid "select handling of tags that tag filtered objects" msgstr "välj hantering av taggar som har taggfiltrerade objekt" -#: builtin/fast-export.c:990 +#: builtin/fast-export.c:1006 msgid "Dump marks to this file" msgstr "Dump märken till filen" -#: builtin/fast-export.c:992 +#: builtin/fast-export.c:1008 msgid "Import marks from this file" msgstr "Importera märken från filen" -#: builtin/fast-export.c:994 +#: builtin/fast-export.c:1010 msgid "Fake a tagger when tags lack one" msgstr "Fejka taggare när taggen saknar en" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:1012 msgid "Output full tree for each commit" msgstr "Skriv ut hela trädet för varje incheckning" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1014 msgid "Use the done feature to terminate the stream" msgstr "Använd done-funktionen för att avsluta strömmen" -#: builtin/fast-export.c:999 +#: builtin/fast-export.c:1015 msgid "Skip output of blob data" msgstr "Hoppa över skrivning av blob-data" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1016 msgid "refspec" msgstr "referensspecifikation" -#: builtin/fast-export.c:1001 +#: builtin/fast-export.c:1017 msgid "Apply refspec to exported refs" msgstr "Applicera referensspecifikation på exporterade referenser" -#: builtin/fast-export.c:1002 +#: builtin/fast-export.c:1018 msgid "anonymize output" msgstr "anonymisera utdata" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch [<options>] <group>" msgstr "git fetch [<flaggor>] <grupp>" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:90 builtin/pull.c:182 +#: builtin/fetch.c:112 builtin/pull.c:182 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:92 builtin/pull.c:185 +#: builtin/fetch.c:114 builtin/pull.c:185 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över" -#: builtin/fetch.c:94 builtin/pull.c:188 +#: builtin/fetch.c:116 builtin/pull.c:188 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:95 builtin/pull.c:190 +#: builtin/fetch.c:117 builtin/pull.c:190 msgid "force overwrite of local branch" msgstr "tvinga överskrivning av lokal gren" -#: builtin/fetch.c:97 +#: builtin/fetch.c:119 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:99 builtin/pull.c:192 +#: builtin/fetch.c:121 builtin/pull.c:192 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:101 +#: builtin/fetch.c:123 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:103 +#: builtin/fetch.c:125 msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:105 builtin/pull.c:195 +#: builtin/fetch.c:127 builtin/pull.c:195 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123 +#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:107 +#: builtin/fetch.c:129 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:111 builtin/pull.c:203 +#: builtin/fetch.c:133 builtin/pull.c:203 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:113 +#: builtin/fetch.c:135 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206 +#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:118 +#: builtin/fetch.c:140 msgid "deepen history of shallow repository based on time" msgstr "fördjupa historik för grund klon baserad på tid" -#: builtin/fetch.c:124 builtin/pull.c:209 +#: builtin/fetch.c:146 builtin/pull.c:209 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:126 builtin/log.c:1450 +#: builtin/fetch.c:148 builtin/log.c:1456 msgid "dir" msgstr "kat" -#: builtin/fetch.c:127 +#: builtin/fetch.c:149 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:130 +#: builtin/fetch.c:152 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -8009,89 +8197,89 @@ msgstr "" "standard för rekursiv hämtning av undermoduler (lägre prioritet än " "konfigurationsfiler)" -#: builtin/fetch.c:134 builtin/pull.c:212 +#: builtin/fetch.c:156 builtin/pull.c:212 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:135 builtin/pull.c:214 +#: builtin/fetch.c:157 builtin/pull.c:214 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:136 builtin/pull.c:215 +#: builtin/fetch.c:158 builtin/pull.c:215 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:394 +#: builtin/fetch.c:416 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:512 +#: builtin/fetch.c:534 #, 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:605 +#: builtin/fetch.c:627 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:609 +#: builtin/fetch.c:631 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:622 builtin/fetch.c:702 +#: builtin/fetch.c:644 builtin/fetch.c:724 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:623 +#: builtin/fetch.c:645 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:632 +#: builtin/fetch.c:654 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682 -#: builtin/fetch.c:697 +#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704 +#: builtin/fetch.c:719 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:652 +#: builtin/fetch.c:674 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:655 +#: builtin/fetch.c:677 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:658 +#: builtin/fetch.c:680 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:697 +#: builtin/fetch.c:719 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:702 +#: builtin/fetch.c:724 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:747 +#: builtin/fetch.c:769 #, 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:767 +#: builtin/fetch.c:789 #, 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:855 builtin/fetch.c:951 +#: builtin/fetch.c:877 builtin/fetch.c:973 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:866 +#: builtin/fetch.c:888 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -8100,55 +8288,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:921 +#: builtin/fetch.c:943 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:922 +#: builtin/fetch.c:944 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:954 +#: builtin/fetch.c:976 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:955 builtin/remote.c:1023 +#: builtin/fetch.c:977 builtin/remote.c:1024 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:978 +#: builtin/fetch.c:1000 #, 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:997 +#: builtin/fetch.c:1019 #, 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:1000 +#: builtin/fetch.c:1022 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1076 +#: builtin/fetch.c:1098 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:1236 +#: builtin/fetch.c:1258 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1238 builtin/remote.c:97 +#: builtin/fetch.c:1260 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1256 +#: builtin/fetch.c:1278 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8156,40 +8344,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:1279 +#: builtin/fetch.c:1301 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1321 +#: builtin/fetch.c:1344 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1323 +#: builtin/fetch.c:1346 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1328 +#: builtin/fetch.c:1351 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1330 +#: builtin/fetch.c:1353 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1349 +#: builtin/fetch.c:1366 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1351 +#: builtin/fetch.c:1368 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1362 +#: builtin/fetch.c:1379 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1370 +#: builtin/fetch.c:1387 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -8199,23 +8387,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]" -#: builtin/fmt-merge-msg.c:664 +#: builtin/fmt-merge-msg.c:665 msgid "populate log with at most <n> entries from shortlog" msgstr "fyll i loggen med som mest <n> poster från shortlog" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:668 msgid "alias for --log (deprecated)" msgstr "alias för --log (avråds)" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:671 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "use <text> as start of message" msgstr "inled meddelande med <text>" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:673 msgid "file to read from" msgstr "fil att läsa från" @@ -8256,103 +8444,107 @@ 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:42 +#: builtin/for-each-ref.c:39 builtin/tag.c:414 +msgid "respect format colors" +msgstr "använd formatfärger" + +#: builtin/for-each-ref.c:43 msgid "print only refs which points at the given object" msgstr "visa endast referenser som pekar på objektet" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:45 msgid "print only refs that are merged" msgstr "visa endast referenser som slagits samman" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:46 msgid "print only refs that are not merged" msgstr "visa endast referenser som ej slagits samman" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:47 msgid "print only refs which contain the commit" msgstr "visa endast referenser som innehåller incheckningen" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:48 msgid "print only refs which don't contain the commit" msgstr "visa endast referenser som inte innehåller incheckningen" -#: builtin/fsck.c:554 +#: builtin/fsck.c:543 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:646 +#: builtin/fsck.c:635 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:652 +#: builtin/fsck.c:641 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:653 +#: builtin/fsck.c:642 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:654 +#: builtin/fsck.c:643 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:655 +#: builtin/fsck.c:644 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:656 +#: builtin/fsck.c:645 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:657 +#: builtin/fsck.c:646 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:658 +#: builtin/fsck.c:647 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:659 +#: builtin/fsck.c:648 msgid "check only connectivity" msgstr "kontrollera endast konnektivitet" -#: builtin/fsck.c:660 +#: builtin/fsck.c:649 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:662 +#: builtin/fsck.c:651 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:663 builtin/prune.c:107 +#: builtin/fsck.c:652 builtin/prune.c:107 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:664 +#: builtin/fsck.c:653 msgid "show verbose names for reachable objects" msgstr "visa ordrika namn för nåbara objekt" -#: builtin/fsck.c:725 +#: builtin/fsck.c:714 msgid "Checking objects" msgstr "Kontrollerar objekt" -#: builtin/gc.c:26 +#: builtin/gc.c:27 msgid "git gc [<options>]" msgstr "git gc [<flaggor>]" -#: builtin/gc.c:79 +#: builtin/gc.c:80 #, c-format msgid "Failed to fstat %s: %s" msgstr "Misslyckades ta status (fstat) på %s: %s" -#: builtin/gc.c:311 +#: builtin/gc.c:312 #, c-format msgid "Can't stat %s" msgstr "Kan inte ta status på %s" -#: builtin/gc.c:320 +#: builtin/gc.c:321 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8367,43 +8559,43 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:359 +#: builtin/gc.c:360 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:361 +#: builtin/gc.c:362 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:362 +#: builtin/gc.c:363 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:363 +#: builtin/gc.c:364 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:380 +#: builtin/gc.c:381 #, c-format msgid "Failed to parse gc.logexpiry value %s" msgstr "Kan inte tolka värdet %s för gc.logexpiry" -#: builtin/gc.c:408 +#: builtin/gc.c:409 #, 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:410 +#: builtin/gc.c:411 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:411 +#: builtin/gc.c:412 #, 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:432 +#: builtin/gc.c:437 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -8411,7 +8603,7 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:476 +#: builtin/gc.c:481 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -8422,12 +8614,12 @@ msgstr "" msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]" -#: builtin/grep.c:235 +#: builtin/grep.c:226 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: misslyckades skapa tråd. %s" -#: builtin/grep.c:293 +#: builtin/grep.c:284 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "felaktigt antal trådar angivet (%d) för %s" @@ -8436,249 +8628,241 @@ msgstr "felaktigt antal trådar angivet (%d) för %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692 +#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/grep.c:788 builtin/grep.c:829 +#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:848 +#: builtin/grep.c:628 #, c-format msgid "unable to grep from object of type %s" msgstr "kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:912 +#: builtin/grep.c:694 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:999 +#: builtin/grep.c:781 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:1001 +#: builtin/grep.c:783 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:1003 +#: builtin/grep.c:785 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:1005 +#: builtin/grep.c:787 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:1007 +#: builtin/grep.c:789 msgid "recursively search in each submodule" msgstr "sök varje undermodul rekursivt" -#: builtin/grep.c:1009 -msgid "basename" -msgstr "basnamn" - -#: builtin/grep.c:1010 -msgid "prepend parent project's basename to output" -msgstr "lägg till föräldraprojektets basnamn i utdata" - -#: builtin/grep.c:1013 +#: builtin/grep.c:792 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:1015 +#: builtin/grep.c:794 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:1017 +#: builtin/grep.c:796 msgid "match patterns only at word boundaries" msgstr "matcha endast mönster vid ordgränser" -#: builtin/grep.c:1019 +#: builtin/grep.c:798 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:1021 +#: builtin/grep.c:800 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:1024 +#: builtin/grep.c:803 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:1026 +#: builtin/grep.c:805 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:1030 +#: builtin/grep.c:809 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:1033 +#: builtin/grep.c:812 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:1036 +#: builtin/grep.c:815 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:1039 +#: builtin/grep.c:818 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:1042 +#: builtin/grep.c:821 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:1043 +#: builtin/grep.c:822 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:1044 +#: builtin/grep.c:823 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:1046 +#: builtin/grep.c:825 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:1048 +#: builtin/grep.c:827 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:1050 +#: builtin/grep.c:829 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:1053 +#: builtin/grep.c:832 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:1055 +#: builtin/grep.c:834 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:1057 +#: builtin/grep.c:836 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:1058 +#: builtin/grep.c:837 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:1060 +#: builtin/grep.c:839 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:1062 +#: builtin/grep.c:841 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:1065 +#: builtin/grep.c:844 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:1068 +#: builtin/grep.c:847 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:1070 +#: builtin/grep.c:849 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:1072 +#: builtin/grep.c:851 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:1073 +#: builtin/grep.c:852 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:1076 +#: builtin/grep.c:855 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:1078 +#: builtin/grep.c:857 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:1081 +#: builtin/grep.c:860 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:1083 +#: builtin/grep.c:862 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:1085 +#: builtin/grep.c:864 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:1097 +#: builtin/grep.c:876 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:1099 +#: builtin/grep.c:878 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:1101 +#: builtin/grep.c:880 msgid "show parse tree for grep expression" msgstr "visa analysträd för grep-uttryck" -#: builtin/grep.c:1105 +#: builtin/grep.c:884 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:1105 +#: builtin/grep.c:884 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:1108 +#: builtin/grep.c:887 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:1172 +#: builtin/grep.c:950 msgid "no pattern given." msgstr "inget mönster angavs." -#: builtin/grep.c:1204 +#: builtin/grep.c:982 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index och --untracked kan inte användas med revisioner" -#: builtin/grep.c:1211 +#: builtin/grep.c:989 #, c-format msgid "unable to resolve revision: %s" msgstr "kan inte slå upp revision: %s" -#: builtin/grep.c:1245 builtin/index-pack.c:1490 +#: builtin/grep.c:1023 builtin/index-pack.c:1491 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:1250 +#: builtin/grep.c:1028 msgid "no threads support, ignoring --threads" msgstr "trådstöd saknas, ignorerar --threads" -#: builtin/grep.c:1281 +#: builtin/grep.c:1052 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1304 +#: builtin/grep.c:1075 msgid "option not supported with --recurse-submodules." msgstr "flaggan stöds inte med --recurse-submodules." -#: builtin/grep.c:1310 +#: builtin/grep.c:1081 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached och --untracked kan inte användas med --no-index." -#: builtin/grep.c:1316 +#: builtin/grep.c:1087 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:1324 +#: builtin/grep.c:1095 msgid "both --cached and trees are given." msgstr "både --cached och träd angavs." @@ -8770,12 +8954,12 @@ msgstr "Kunde inte tolka emacsclient-version." msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient version \"%d\" för gammal (< 22)." -#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 +#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173 #, c-format msgid "failed to exec '%s'" msgstr "exec misslyckades för \"%s\"" -#: builtin/help.c:208 +#: builtin/help.c:211 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -8784,7 +8968,7 @@ msgstr "" "\"%s\": sökväg för man-visare som ej stöds.\n" "Använd \"man.<verktyg>.cmd\" istället." -#: builtin/help.c:220 +#: builtin/help.c:223 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -8793,351 +8977,351 @@ msgstr "" "\"%s\": kommando för man-visare som stöds.\n" "Använd \"man.<verktyg>.path\" istället." -#: builtin/help.c:337 +#: builtin/help.c:340 #, c-format msgid "'%s': unknown man viewer." msgstr "\"%s\": okänd man-visare." -#: builtin/help.c:354 +#: builtin/help.c:357 msgid "no man viewer handled the request" msgstr "ingen man-visare hanterade förfrågan" -#: builtin/help.c:362 +#: builtin/help.c:365 msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:404 +#: builtin/help.c:407 msgid "Defining attributes per path" msgstr "Definierar attribut per sökväg" -#: builtin/help.c:405 +#: builtin/help.c:408 msgid "Everyday Git With 20 Commands Or So" msgstr "Git för dagligt bruk i ungefär 20 kommandon" -#: builtin/help.c:406 +#: builtin/help.c:409 msgid "A Git glossary" msgstr "En Git-ordlista" -#: builtin/help.c:407 +#: builtin/help.c:410 msgid "Specifies intentionally untracked files to ignore" msgstr "Ange avsiktligen ospårade filer att ignorera" -#: builtin/help.c:408 +#: builtin/help.c:411 msgid "Defining submodule properties" msgstr "Ange egenskaper för undermoduler" -#: builtin/help.c:409 +#: builtin/help.c:412 msgid "Specifying revisions and ranges for Git" msgstr "Ange versioner och intervall i Git" -#: builtin/help.c:410 +#: builtin/help.c:413 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Introduktion till Git (för version 1.5.1 och senare)" -#: builtin/help.c:411 +#: builtin/help.c:414 msgid "An overview of recommended workflows with Git" msgstr "Översikt över rekommenderade arbetsflöden med Git" -#: builtin/help.c:423 +#: builtin/help.c:426 msgid "The common Git guides are:\n" msgstr "De vanliga Git-vägledningarna är:\n" -#: builtin/help.c:441 +#: builtin/help.c:444 #, c-format -msgid "`git %s' is aliased to `%s'" -msgstr "\"git %s\" är ett alias för \"%s\"" +msgid "'%s' is aliased to '%s'" +msgstr "\"%s\" är ett alias för \"%s\"" -#: builtin/help.c:463 builtin/help.c:480 +#: builtin/help.c:466 builtin/help.c:483 #, c-format msgid "usage: %s%s" msgstr "användning: %s%s" -#: builtin/index-pack.c:155 +#: builtin/index-pack.c:156 #, c-format msgid "unable to open %s" msgstr "kunde inte öppna %s" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:206 #, c-format msgid "object type mismatch at %s" msgstr "objekttyp stämmer inte överens vid %s" -#: builtin/index-pack.c:225 +#: builtin/index-pack.c:226 #, c-format msgid "did not receive expected object %s" msgstr "emottog inte det förväntade objektet %s" -#: builtin/index-pack.c:228 +#: builtin/index-pack.c:229 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objektet %s: förväntad typ %s, såg %s" -#: builtin/index-pack.c:270 +#: builtin/index-pack.c:271 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "kan inte fylla %d byte" msgstr[1] "kan inte fylla %d byte" -#: builtin/index-pack.c:280 +#: builtin/index-pack.c:281 msgid "early EOF" msgstr "tidigt filslut" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:282 msgid "read error on input" msgstr "indataläsfel" -#: builtin/index-pack.c:293 +#: builtin/index-pack.c:294 msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:300 +#: builtin/index-pack.c:301 msgid "pack too large for current definition of off_t" msgstr "paket för stort för nuvarande definition av off_t" -#: builtin/index-pack.c:303 builtin/unpack-objects.c:93 +#: builtin/index-pack.c:304 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "paket är större än tillåten maximal storlek" -#: builtin/index-pack.c:318 +#: builtin/index-pack.c:319 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: builtin/index-pack.c:324 +#: builtin/index-pack.c:325 #, c-format msgid "cannot open packfile '%s'" msgstr "kan inte öppna paketfilen \"%s\"" -#: builtin/index-pack.c:338 +#: builtin/index-pack.c:339 msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" -#: builtin/index-pack.c:340 +#: builtin/index-pack.c:341 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stöds ej" -#: builtin/index-pack.c:358 +#: builtin/index-pack.c:359 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s" -#: builtin/index-pack.c:479 +#: builtin/index-pack.c:480 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:528 +#: builtin/index-pack.c:529 msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" -#: builtin/index-pack.c:536 +#: builtin/index-pack.c:537 msgid "delta base offset is out of bound" msgstr "deltabasindex utanför gränsen" -#: builtin/index-pack.c:544 +#: builtin/index-pack.c:545 #, c-format msgid "unknown object type %d" msgstr "okänd objekttyp %d" -#: builtin/index-pack.c:575 +#: builtin/index-pack.c:576 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: builtin/index-pack.c:577 +#: builtin/index-pack.c:578 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" -#: builtin/index-pack.c:603 +#: builtin/index-pack.c:604 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:816 builtin/index-pack.c:825 +#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778 +#: builtin/index-pack.c:817 builtin/index-pack.c:826 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:751 builtin/pack-objects.c:167 -#: builtin/pack-objects.c:261 +#: builtin/index-pack.c:752 builtin/pack-objects.c:168 +#: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:815 #, c-format msgid "cannot read existing object info %s" msgstr "kan inte läsa information om befintligt objekt %s" -#: builtin/index-pack.c:822 +#: builtin/index-pack.c:823 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:836 +#: builtin/index-pack.c:837 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:851 +#: builtin/index-pack.c:852 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/index-pack.c:854 +#: builtin/index-pack.c:855 msgid "Error in object" msgstr "Fel i objekt" -#: builtin/index-pack.c:856 +#: builtin/index-pack.c:857 #, 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:928 builtin/index-pack.c:959 +#: builtin/index-pack.c:929 builtin/index-pack.c:960 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1130 +#: builtin/index-pack.c:1131 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1130 +#: builtin/index-pack.c:1131 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1164 +#: builtin/index-pack.c:1165 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1169 +#: builtin/index-pack.c:1170 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1173 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1184 +#: builtin/index-pack.c:1185 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1207 +#: builtin/index-pack.c:1208 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1218 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1260 +#: builtin/index-pack.c:1261 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1266 +#: builtin/index-pack.c:1267 #, 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:1278 +#: builtin/index-pack.c:1279 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1282 +#: builtin/index-pack.c:1283 #, 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:1306 +#: builtin/index-pack.c:1307 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1382 +#: builtin/index-pack.c:1383 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1408 +#: builtin/index-pack.c:1409 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1420 +#: builtin/index-pack.c:1421 #, c-format msgid "cannot write keep file '%s'" msgstr "kan inte ta skriva \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1428 +#: builtin/index-pack.c:1429 #, c-format msgid "cannot close written keep file '%s'" msgstr "akn inte stänga skriven \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1439 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1446 +#: builtin/index-pack.c:1447 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1484 +#: builtin/index-pack.c:1485 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1552 +#: builtin/index-pack.c:1553 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1554 +#: builtin/index-pack.c:1555 #, 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:1602 +#: builtin/index-pack.c:1603 #, 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:1609 +#: builtin/index-pack.c:1610 #, 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:1622 +#: builtin/index-pack.c:1623 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1704 builtin/index-pack.c:1707 -#: builtin/index-pack.c:1723 builtin/index-pack.c:1727 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1708 +#: builtin/index-pack.c:1724 builtin/index-pack.c:1728 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1743 +#: builtin/index-pack.c:1744 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1745 +#: builtin/index-pack.c:1746 msgid "--stdin requires a git repository" msgstr "--stdin kräver ett git-arkiv" -#: builtin/index-pack.c:1753 +#: builtin/index-pack.c:1754 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" @@ -9269,132 +9453,164 @@ msgstr "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<symbol>[(=|:)<värde>])...] [<fil>...]" -#: builtin/interpret-trailers.c:26 +#: builtin/interpret-trailers.c:92 msgid "edit files in place" msgstr "redigera filer på plats" -#: builtin/interpret-trailers.c:27 +#: builtin/interpret-trailers.c:93 msgid "trim empty trailers" msgstr "ta bort tomma släprader" -#: builtin/interpret-trailers.c:28 +#: builtin/interpret-trailers.c:96 +msgid "where to place the new trailer" +msgstr "var nya släprader skall placeras" + +#: builtin/interpret-trailers.c:98 +msgid "action if trailer already exists" +msgstr "att göra om släprader redan finns" + +#: builtin/interpret-trailers.c:100 +msgid "action if trailer is missing" +msgstr "att göra om släprader saknas" + +#: builtin/interpret-trailers.c:102 +msgid "output only the trailers" +msgstr "visa endast släprader" + +#: builtin/interpret-trailers.c:103 +msgid "do not apply config rules" +msgstr "använd inte regler från konfigurationen" + +#: builtin/interpret-trailers.c:104 +msgid "join whitespace-continued values" +msgstr "slå ihop värden avdelade med blanksteg" + +#: builtin/interpret-trailers.c:105 +msgid "set parsing options" +msgstr "välj tolkningsalternativ" + +#: builtin/interpret-trailers.c:107 msgid "trailer" msgstr "släprad" -#: builtin/interpret-trailers.c:29 +#: builtin/interpret-trailers.c:108 msgid "trailer(s) to add" msgstr "släprad(er) att lägga till" -#: builtin/interpret-trailers.c:42 +#: builtin/interpret-trailers.c:117 +msgid "--trailer with --only-input does not make sense" +msgstr "--trailer med --only-input ger ingen mening" + +#: builtin/interpret-trailers.c:127 msgid "no input file given for in-place editing" msgstr "ingen indatafil angiven för redigering på plats" -#: builtin/log.c:45 +#: builtin/log.c:46 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" -#: builtin/log.c:46 +#: builtin/log.c:47 msgid "git show [<options>] <object>..." msgstr "git show [<flaggor>] <objekt>..." -#: builtin/log.c:90 +#: builtin/log.c:91 #, c-format msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:147 +#: builtin/log.c:148 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: builtin/log.c:148 +#: builtin/log.c:149 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:149 +#: builtin/log.c:150 msgid "Use mail map file" msgstr "Använd e-postmappningsfil" -#: builtin/log.c:150 +#: builtin/log.c:151 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:153 +#: builtin/log.c:154 msgid "Process line range n,m in file, counting from 1" msgstr "Behandla radintervallet n,m i filen, med början på 1" -#: builtin/log.c:249 +#: builtin/log.c:250 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:497 +#: builtin/log.c:501 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:512 builtin/log.c:606 +#: builtin/log.c:516 builtin/log.c:610 #, c-format msgid "Could not read object %s" msgstr "Kunde inte läsa objektet %s" -#: builtin/log.c:630 +#: builtin/log.c:634 #, c-format msgid "Unknown type: %d" msgstr "Okänd typ: %d" -#: builtin/log.c:751 +#: builtin/log.c:755 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:852 +#: builtin/log.c:856 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:868 +#: builtin/log.c:872 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte öppna patchfilen %s" -#: builtin/log.c:885 +#: builtin/log.c:889 msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:895 +#: builtin/log.c:899 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:1001 +#: builtin/log.c:1005 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:1081 +#: builtin/log.c:1085 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1108 +#: builtin/log.c:1112 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1158 +#: builtin/log.c:1162 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922 +#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" -#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533 +#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/log.c:1280 +#: builtin/log.c:1284 msgid "Could not find exact merge base." msgstr "Kunde inte hitta exakt sammanslagningsbas." -#: builtin/log.c:1284 +#: builtin/log.c:1288 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -9405,320 +9621,328 @@ msgstr "" "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> " "manuellt." -#: builtin/log.c:1304 +#: builtin/log.c:1308 msgid "Failed to find exact merge base" msgstr "Kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1315 +#: builtin/log.c:1319 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1319 +#: builtin/log.c:1323 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1368 +#: builtin/log.c:1372 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1425 +#: builtin/log.c:1431 msgid "use [PATCH n/m] even with a single patch" msgstr "använd [PATCH n/m] även för en ensam patch" -#: builtin/log.c:1428 +#: builtin/log.c:1434 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1432 +#: builtin/log.c:1438 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1434 +#: builtin/log.c:1440 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1436 +#: builtin/log.c:1442 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1437 +#: builtin/log.c:1443 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1438 +#: builtin/log.c:1444 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1440 +#: builtin/log.c:1446 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1442 +#: builtin/log.c:1448 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1444 +#: builtin/log.c:1450 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Använd [RFC PATCH] istället för [PATCH]" -#: builtin/log.c:1447 +#: builtin/log.c:1453 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1450 +#: builtin/log.c:1456 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1453 +#: builtin/log.c:1459 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1456 +#: builtin/log.c:1462 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1458 +#: builtin/log.c:1464 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1460 +#: builtin/log.c:1466 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1462 +#: builtin/log.c:1468 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1464 +#: builtin/log.c:1470 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1465 +#: builtin/log.c:1471 msgid "header" msgstr "huvud" -#: builtin/log.c:1466 +#: builtin/log.c:1472 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1467 builtin/log.c:1469 +#: builtin/log.c:1473 builtin/log.c:1475 msgid "email" msgstr "epost" -#: builtin/log.c:1467 +#: builtin/log.c:1473 msgid "add To: header" msgstr "lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1469 +#: builtin/log.c:1475 msgid "add Cc: header" msgstr "lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1471 +#: builtin/log.c:1477 msgid "ident" msgstr "ident" -#: builtin/log.c:1472 +#: builtin/log.c:1478 msgid "set From address to <ident> (or committer ident if absent)" msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)" -#: builtin/log.c:1474 +#: builtin/log.c:1480 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1475 +#: builtin/log.c:1481 msgid "make first mail a reply to <message-id>" msgstr "gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1476 builtin/log.c:1479 +#: builtin/log.c:1482 builtin/log.c:1485 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1477 +#: builtin/log.c:1483 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1480 +#: builtin/log.c:1486 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1484 +#: builtin/log.c:1490 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1486 +#: builtin/log.c:1492 msgid "signature" msgstr "signatur" -#: builtin/log.c:1487 +#: builtin/log.c:1493 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1488 +#: builtin/log.c:1494 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1489 +#: builtin/log.c:1495 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1491 +#: builtin/log.c:1497 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1492 +#: builtin/log.c:1498 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1567 +#: builtin/log.c:1500 +msgid "show progress while generating patches" +msgstr "visa förloppsindikator medan patchar skapas" + +#: builtin/log.c:1575 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1582 +#: builtin/log.c:1590 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1584 +#: builtin/log.c:1592 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt." -#: builtin/log.c:1592 +#: builtin/log.c:1600 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1594 +#: builtin/log.c:1602 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1596 +#: builtin/log.c:1604 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1626 +#: builtin/log.c:1634 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1628 +#: builtin/log.c:1636 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1722 +#: builtin/log.c:1729 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:1794 +#: builtin/log.c:1761 +msgid "Generating patches" +msgstr "Skapar patchar" + +#: builtin/log.c:1805 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1843 +#: builtin/log.c:1855 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:1897 +#: builtin/log.c:1909 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:466 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<flaggor>] [<fil>...]" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:515 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:517 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:521 +#: builtin/ls-files.c:519 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:521 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:523 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:525 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:527 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:530 msgid "show staged contents' object name in the output" msgstr "visa köat innehålls objektnamn i utdata" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:532 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:536 +#: builtin/ls-files.c:534 msgid "show 'other' directories' names only" msgstr "visa endast namn för \"andra\" kataloger" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:536 msgid "show line endings of files" msgstr "visa radslut i filer" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:538 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:541 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:543 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:545 msgid "skip files matching pattern" msgstr "hoppa över filer som motsvarar mönster" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:548 msgid "exclude patterns are read from <file>" msgstr "exkludera mönster som läses från <fil>" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:551 msgid "read additional per-directory exclude patterns in <file>" msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:553 msgid "add the standard git exclusions" msgstr "lägg till git:s standardexkluderingar" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:556 msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:559 msgid "recurse through submodules" msgstr "rekursera ner i undermoduler" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:561 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:564 +#: builtin/ls-files.c:562 msgid "tree-ish" msgstr "träd-igt" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:563 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:567 +#: builtin/ls-files.c:565 msgid "show debugging data" msgstr "visa felsökningsutdata" @@ -9809,179 +10033,183 @@ msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" msgid "empty mbox: '%s'" msgstr "tom mbox: ”%s”" -#: builtin/merge.c:47 +#: builtin/merge.c:48 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<flaggor>] [<incheckning>...]" -#: builtin/merge.c:48 +#: builtin/merge.c:49 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:49 +#: builtin/merge.c:50 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:104 +#: builtin/merge.c:107 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:141 +#: builtin/merge.c:144 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:142 +#: builtin/merge.c:145 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:147 +#: builtin/merge.c:150 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:197 builtin/pull.c:134 +#: builtin/merge.c:200 builtin/pull.c:134 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:200 builtin/pull.c:137 +#: builtin/merge.c:203 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:201 builtin/pull.c:140 +#: builtin/merge.c:204 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:203 builtin/pull.c:143 +#: builtin/merge.c:206 builtin/pull.c:143 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:206 builtin/pull.c:146 +#: builtin/merge.c:209 builtin/pull.c:146 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:208 builtin/pull.c:149 +#: builtin/merge.c:211 builtin/pull.c:149 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:210 builtin/pull.c:152 +#: builtin/merge.c:213 builtin/pull.c:152 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:211 +#: builtin/merge.c:214 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:213 builtin/pull.c:158 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:217 builtin/pull.c:161 +#: builtin/merge.c:220 builtin/pull.c:161 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:218 builtin/notes.c:776 builtin/pull.c:165 +#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165 #: builtin/revert.c:109 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:219 builtin/pull.c:166 +#: builtin/merge.c:222 builtin/pull.c:166 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:220 builtin/pull.c:169 +#: builtin/merge.c:223 builtin/pull.c:169 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:221 builtin/pull.c:170 +#: builtin/merge.c:224 builtin/pull.c:170 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:223 +#: builtin/merge.c:226 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:227 +#: builtin/merge.c:230 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:229 +#: builtin/merge.c:232 msgid "continue the current in-progress merge" msgstr "fortsätt den pågående sammanslagningen" -#: builtin/merge.c:231 builtin/pull.c:177 +#: builtin/merge.c:234 builtin/pull.c:177 msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" -#: builtin/merge.c:259 +#: builtin/merge.c:240 +msgid "verify commit-msg hook" +msgstr "bekräfta commit-msg-krok" + +#: builtin/merge.c:265 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:264 +#: builtin/merge.c:270 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:269 +#: builtin/merge.c:275 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:288 builtin/merge.c:305 +#: builtin/merge.c:297 builtin/merge.c:314 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:335 +#: builtin/merge.c:344 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:346 +#: builtin/merge.c:355 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:396 +#: builtin/merge.c:405 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:447 +#: builtin/merge.c:456 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:537 +#: builtin/merge.c:546 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:666 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:671 +#: builtin/merge.c:680 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:686 +#: builtin/merge.c:695 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:738 +#: builtin/merge.c:747 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:747 +#: builtin/merge.c:756 #, 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:753 +#: builtin/merge.c:762 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9997,69 +10225,69 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:777 +#: builtin/merge.c:798 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:797 +#: builtin/merge.c:818 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:850 +#: builtin/merge.c:871 #, 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:889 +#: builtin/merge.c:910 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:891 +#: builtin/merge.c:912 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:893 +#: builtin/merge.c:914 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:898 +#: builtin/merge.c:919 #, 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:945 +#: builtin/merge.c:972 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1046 +#: builtin/merge.c:1073 #, 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:1080 +#: builtin/merge.c:1107 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1145 +#: builtin/merge.c:1172 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1149 +#: builtin/merge.c:1176 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1161 +#: builtin/merge.c:1188 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1165 +#: builtin/merge.c:1192 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1181 +#: builtin/merge.c:1208 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10067,7 +10295,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1188 +#: builtin/merge.c:1215 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10075,114 +10303,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:1191 +#: builtin/merge.c:1218 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:1200 +#: builtin/merge.c:1227 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1208 +#: builtin/merge.c:1235 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1225 +#: builtin/merge.c:1252 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1227 +#: builtin/merge.c:1254 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:1232 +#: builtin/merge.c:1259 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1234 +#: builtin/merge.c:1261 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:1268 +#: builtin/merge.c:1295 #, 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:1271 +#: builtin/merge.c:1298 #, 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:1274 +#: builtin/merge.c:1301 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: builtin/merge.c:1277 +#: builtin/merge.c:1304 #, 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:1339 +#: builtin/merge.c:1366 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1348 -msgid "Already up-to-date." +#: builtin/merge.c:1375 +msgid "Already up to date." msgstr "Redan à jour." -#: builtin/merge.c:1358 +#: builtin/merge.c:1385 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1399 +#: builtin/merge.c:1426 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1406 +#: builtin/merge.c:1433 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1431 -msgid "Already up-to-date. Yeeah!" +#: builtin/merge.c:1458 +msgid "Already up to date. Yeeah!" msgstr "Redan à jour. Toppen!" -#: builtin/merge.c:1437 +#: builtin/merge.c:1464 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1460 builtin/merge.c:1539 +#: builtin/merge.c:1487 builtin/merge.c:1566 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1464 +#: builtin/merge.c:1491 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1530 +#: builtin/merge.c:1557 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1559 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1541 +#: builtin/merge.c:1568 #, 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:1553 +#: builtin/merge.c:1580 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -10324,7 +10552,7 @@ msgstr "git mv [<flaggor>] <källa>... <mål>" msgid "Directory %s is in index and no submodule?" msgstr "Katalogen %s är i indexet och inte en undermodul?" -#: builtin/mv.c:85 builtin/rm.c:290 +#: builtin/mv.c:85 builtin/rm.c:289 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" @@ -10342,68 +10570,68 @@ msgstr "tvinga flytta/ändra namn även om målet finns" msgid "skip move/rename errors" msgstr "hoppa över fel vid flytt/namnändring" -#: builtin/mv.c:168 +#: builtin/mv.c:167 #, c-format msgid "destination '%s' is not a directory" msgstr "destinationen \"%s\" är ingen katalog" -#: builtin/mv.c:179 +#: 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:183 +#: builtin/mv.c:182 msgid "bad source" msgstr "felaktig källa" -#: builtin/mv.c:186 +#: builtin/mv.c:185 msgid "can not move directory into itself" msgstr "kan inte flytta katalog till sig själv" -#: builtin/mv.c:189 +#: builtin/mv.c:188 msgid "cannot move directory over file" msgstr "kan inte flytta katalog över fil" -#: builtin/mv.c:198 +#: builtin/mv.c:197 msgid "source directory is empty" msgstr "källkatalogen är tom" -#: builtin/mv.c:223 +#: builtin/mv.c:222 msgid "not under version control" msgstr "inte versionshanterad" -#: builtin/mv.c:226 +#: builtin/mv.c:225 msgid "destination exists" msgstr "destinationen finns" -#: builtin/mv.c:234 +#: builtin/mv.c:233 #, c-format msgid "overwriting '%s'" msgstr "skriver över \"%s\"" -#: builtin/mv.c:237 +#: builtin/mv.c:236 msgid "Cannot overwrite" msgstr "Kan inte skriva över" -#: builtin/mv.c:240 +#: builtin/mv.c:239 msgid "multiple sources for the same target" msgstr "flera källor för samma mål" -#: builtin/mv.c:242 +#: builtin/mv.c:241 msgid "destination directory does not exist" msgstr "destinationskatalogen finns inte" -#: builtin/mv.c:249 +#: builtin/mv.c:248 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, källa=%s, mål=%s" -#: builtin/mv.c:270 +#: builtin/mv.c:269 #, c-format msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390 +#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" @@ -10595,19 +10823,19 @@ 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:234 builtin/tag.c:517 +#: builtin/notes.c:234 builtin/tag.c:500 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/notes.c:236 builtin/tag.c:520 +#: builtin/notes.c:236 builtin/tag.c:503 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 -#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516 -#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661 +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 +#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "kunde inte slå upp \"%s\" som en giltig referens." @@ -10635,47 +10863,47 @@ msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\"" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c:348 +#: builtin/notes.c:349 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "vägrar utföra \"%s\" på anteckningar i %s (utanför refs/notes/)" -#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499 -#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654 -#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972 +#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 +#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 +#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 msgid "too many parameters" msgstr "för många parametrar" -#: builtin/notes.c:381 builtin/notes.c:667 +#: builtin/notes.c:382 builtin/notes.c:668 #, c-format msgid "no note found for object %s." msgstr "inga anteckningar hittades för objektet %s." -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:403 builtin/notes.c:566 msgid "note contents as a string" msgstr "anteckningsinnehåll som sträng" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:406 builtin/notes.c:569 msgid "note contents in a file" msgstr "anteckningsinnehåll i en fil" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:409 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "återanvänd och redigera angivet anteckningsobjekt" -#: builtin/notes.c:411 builtin/notes.c:574 +#: builtin/notes.c:412 builtin/notes.c:575 msgid "reuse specified note object" msgstr "återanvänd angivet anteckningsobjekt" -#: builtin/notes.c:414 builtin/notes.c:577 +#: builtin/notes.c:415 builtin/notes.c:578 msgid "allow storing empty note" msgstr "tillåt lagra tom anteckning" -#: builtin/notes.c:415 builtin/notes.c:486 +#: builtin/notes.c:416 builtin/notes.c:487 msgid "replace existing notes" msgstr "ersätt befintliga anteckningar" -#: builtin/notes.c:440 +#: builtin/notes.c:441 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -10684,29 +10912,29 @@ msgstr "" "Kan inte lägga till anteckningar. Hittade befintliga anteckningar för " "objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:455 builtin/notes.c:534 +#: builtin/notes.c:456 builtin/notes.c:535 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Skriver över befintliga anteckningar för objektet %s\n" -#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891 +#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 #, c-format msgid "Removing note for object %s\n" msgstr "Tar bort anteckning för objektet %s\n" -#: builtin/notes.c:487 +#: builtin/notes.c:488 msgid "read objects from stdin" msgstr "läs objekt från standard in" -#: builtin/notes.c:489 +#: builtin/notes.c:490 msgid "load rewriting config for <command> (implies --stdin)" msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)" -#: builtin/notes.c:507 +#: builtin/notes.c:508 msgid "too few parameters" msgstr "för få parametrar" -#: builtin/notes.c:528 +#: builtin/notes.c:529 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -10715,12 +10943,12 @@ msgstr "" "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet " "%s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:540 +#: builtin/notes.c:541 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "anteckningar på källobjektet %s saknas. Kan inte kopiera." -#: builtin/notes.c:592 +#: builtin/notes.c:593 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -10729,52 +10957,52 @@ msgstr "" "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n" "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n" -#: builtin/notes.c:687 +#: builtin/notes.c:688 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "misslyckades ta bort referensen NOTES_MERGE_PARTIAL" -#: builtin/notes.c:689 +#: builtin/notes.c:690 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "misslyckades ta bort referensen NOTES_MERGE_REF" -#: builtin/notes.c:691 +#: builtin/notes.c:692 msgid "failed to remove 'git notes merge' worktree" msgstr "misslyckades ta bort arbetskatalogen för \"git notes merge\"" -#: builtin/notes.c:711 +#: builtin/notes.c:712 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "misslyckades läsa references NOTES_MERGE_PARTIAL" -#: builtin/notes.c:713 +#: builtin/notes.c:714 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "kunde inte hitta incheckning från NOTES_MERGE_PARTIAL." -#: builtin/notes.c:715 +#: builtin/notes.c:716 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "kunde inte tolka incheckning från NOTES_MERGE_PARTIAL." -#: builtin/notes.c:728 +#: builtin/notes.c:729 msgid "failed to resolve NOTES_MERGE_REF" msgstr "misslyckades bestämma NOTES_MERGE_REF" -#: builtin/notes.c:731 +#: builtin/notes.c:732 msgid "failed to finalize notes merge" msgstr "misslyckades färdigställa sammanslagning av anteckningar" -#: builtin/notes.c:757 +#: builtin/notes.c:758 #, c-format msgid "unknown notes merge strategy %s" msgstr "okänd sammanslagningsstrategi för anteckningar: %s" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "General options" msgstr "Allmänna flaggor" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "Merge options" msgstr "Flaggor för sammanslagning" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -10782,48 +11010,48 @@ msgstr "" "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "Committing unmerged notes" msgstr "Checkar in ej sammanslagna anteckningar" -#: builtin/notes.c:781 +#: builtin/notes.c:782 msgid "finalize notes merge by committing unmerged notes" msgstr "" "färdigställ sammanslagning av anteckningar genom att checka in ej " "sammanslagna anteckningar" -#: builtin/notes.c:783 +#: builtin/notes.c:784 msgid "Aborting notes merge resolution" msgstr "Avbryt lösning av sammanslagning av anteckningar" -#: builtin/notes.c:785 +#: builtin/notes.c:786 msgid "abort notes merge" msgstr "avbryt sammanslagning av anteckningar" -#: builtin/notes.c:796 +#: builtin/notes.c:797 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "kan inte blanda --commit, --abort eller -s/--strategy" -#: builtin/notes.c:801 +#: builtin/notes.c:802 msgid "must specify a notes ref to merge" msgstr "måste ange en antecknings-referens att slå ihop" -#: builtin/notes.c:825 +#: builtin/notes.c:826 #, c-format msgid "unknown -s/--strategy: %s" msgstr "okänd -s/--strategy: %s" -#: builtin/notes.c:862 +#: builtin/notes.c:863 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "sammanslagning av anteckningar till %s är redan igångsatt på %s" -#: builtin/notes.c:865 +#: builtin/notes.c:866 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "misslyckades lagra länk till aktuell anteckningsreferens (%s)" -#: builtin/notes.c:867 +#: builtin/notes.c:868 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -10834,221 +11062,221 @@ msgstr "" "%s och checka in resultatet med \"git notes merge --commit\", eller avbryt " "sammanslagningen med \"git notes merge --abort\".\n" -#: builtin/notes.c:889 +#: builtin/notes.c:890 #, c-format msgid "Object %s has no note\n" msgstr "Objektet %s har ingen anteckning\n" -#: builtin/notes.c:901 +#: builtin/notes.c:902 msgid "attempt to remove non-existent note is not an error" msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel" -#: builtin/notes.c:904 +#: builtin/notes.c:905 msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128 +#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" -#: builtin/notes.c:943 +#: builtin/notes.c:944 msgid "report pruned notes" msgstr "rapportera borttagna anteckningar" -#: builtin/notes.c:985 +#: builtin/notes.c:986 msgid "notes-ref" msgstr "anteckningar-ref" -#: builtin/notes.c:986 +#: builtin/notes.c:987 msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1021 +#: builtin/notes.c:1022 #, c-format msgid "unknown subcommand: %s" msgstr "okänt underkommando: %s" -#: builtin/pack-objects.c:30 +#: builtin/pack-objects.c:31 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:31 +#: builtin/pack-objects.c:32 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:180 builtin/pack-objects.c:183 +#: builtin/pack-objects.c:181 builtin/pack-objects.c:184 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: builtin/pack-objects.c:776 +#: builtin/pack-objects.c:777 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:789 +#: builtin/pack-objects.c:790 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1069 +#: builtin/pack-objects.c:1070 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:2434 +#: builtin/pack-objects.c:2440 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2843 +#: builtin/pack-objects.c:2849 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2847 +#: builtin/pack-objects.c:2853 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2877 +#: builtin/pack-objects.c:2883 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:2879 +#: builtin/pack-objects.c:2885 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:2881 +#: builtin/pack-objects.c:2887 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2884 +#: builtin/pack-objects.c:2890 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2891 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2886 +#: builtin/pack-objects.c:2892 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2889 +#: builtin/pack-objects.c:2895 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2897 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:2893 +#: builtin/pack-objects.c:2899 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:2901 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2903 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:2899 +#: builtin/pack-objects.c:2905 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:2901 +#: builtin/pack-objects.c:2907 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:2903 +#: builtin/pack-objects.c:2909 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:2905 +#: builtin/pack-objects.c:2911 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2907 +#: builtin/pack-objects.c:2913 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:2909 +#: builtin/pack-objects.c:2915 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2917 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2919 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:2916 +#: builtin/pack-objects.c:2922 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2925 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:2928 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:2925 +#: builtin/pack-objects.c:2931 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:2927 +#: builtin/pack-objects.c:2933 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:2929 +#: builtin/pack-objects.c:2935 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:2931 +#: builtin/pack-objects.c:2937 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:2933 +#: builtin/pack-objects.c:2939 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:2936 +#: builtin/pack-objects.c:2942 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:2938 +#: builtin/pack-objects.c:2944 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:2940 +#: builtin/pack-objects.c:2946 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:2942 +#: builtin/pack-objects.c:2948 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:2944 +#: builtin/pack-objects.c:2950 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:2946 +#: builtin/pack-objects.c:2952 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:2948 +#: builtin/pack-objects.c:2954 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:3075 +#: builtin/pack-objects.c:3081 msgid "Counting objects" msgstr "Räknar objekt" @@ -11064,11 +11292,11 @@ msgstr "packa allt" msgid "prune loose refs (default)" msgstr "ta bort lösa referenser (standard)" -#: builtin/prune-packed.c:7 +#: builtin/prune-packed.c:8 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" -#: builtin/prune-packed.c:40 +#: builtin/prune-packed.c:41 msgid "Removing duplicate objects" msgstr "Tar bort duplicerade objekt" @@ -11109,7 +11337,7 @@ msgstr "Alternativ gällande sammanslagning" msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" -#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121 +#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121 msgid "allow fast-forward" msgstr "tillåt snabbspolning" @@ -11130,7 +11358,7 @@ msgstr "antal undermoduler som hämtas parallellt" msgid "Invalid value for pull.ff: %s" msgstr "Felaktigt värde för pull.ff: %s" -#: builtin/pull.c:399 +#: builtin/pull.c:403 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -11138,14 +11366,14 @@ msgstr "" "Det finns ingen kandidat för ombasering bland referenserna du precis har " "hämtat." -#: builtin/pull.c:401 +#: builtin/pull.c:405 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Det finns ingen kandidat för sammanslagning bland referenserna du precis har " "hämtat." -#: builtin/pull.c:402 +#: builtin/pull.c:406 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -11153,7 +11381,7 @@ msgstr "" "Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n" "motsvarade något i fjärränden." -#: builtin/pull.c:405 +#: builtin/pull.c:409 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -11164,42 +11392,42 @@ msgstr "" "gren. Eftersom det inte är den fjärr som är konfigurerad som\n" "standard för aktuell gren måste du ange en gren på kommandoraden." -#: builtin/pull.c:410 git-parse-remote.sh:73 +#: builtin/pull.c:414 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Du är inte på någon gren för närvarande." -#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79 +#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Ange vilken gren du vill ombasera mot." -#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82 +#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Ange vilken gren du vill slå samman med." -#: builtin/pull.c:415 builtin/pull.c:430 +#: builtin/pull.c:419 builtin/pull.c:434 msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." -#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432 +#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<fjärr>" -#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456 +#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<gren>" -#: builtin/pull.c:425 git-parse-remote.sh:75 +#: builtin/pull.c:429 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Det finns ingen spårningsinformation för aktuell gren." -#: builtin/pull.c:434 git-parse-remote.sh:95 +#: builtin/pull.c:438 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:" -#: builtin/pull.c:439 +#: builtin/pull.c:443 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -11208,27 +11436,27 @@ msgstr "" "Dina inställningar anger sammanslagning med referensen \"%s\"\n" "från fjärren, men någon sådan referens togs inte emot." -#: builtin/pull.c:792 +#: builtin/pull.c:796 msgid "ignoring --verify-signatures for rebase" msgstr "ignorera --verify-signatures för ombasering" -#: builtin/pull.c:840 +#: builtin/pull.c:844 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash är endast giltig med --rebase." -#: builtin/pull.c:848 +#: builtin/pull.c:852 msgid "Updating an unborn branch with changes added to the index." msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet." -#: builtin/pull.c:851 +#: builtin/pull.c:855 msgid "pull with rebase" msgstr "pull med ombasering" -#: builtin/pull.c:852 +#: builtin/pull.c:856 msgid "please commit or stash them." msgstr "checka in eller använd \"stash\" på dem." -#: builtin/pull.c:877 +#: builtin/pull.c:881 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11239,7 +11467,7 @@ msgstr "" "snabbspolar din arbetskatalog från\n" "incheckningen %s." -#: builtin/pull.c:882 +#: builtin/pull.c:886 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11256,15 +11484,15 @@ msgstr "" "$ git reset --hard\n" "för att återgå." -#: builtin/pull.c:897 +#: builtin/pull.c:901 msgid "Cannot merge multiple branches into empty head." msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: builtin/pull.c:901 +#: builtin/pull.c:905 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpå flera grenar." -#: builtin/pull.c:908 +#: builtin/pull.c:912 msgid "cannot rebase with locally recorded submodule modifications" msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" @@ -11643,19 +11871,47 @@ msgstr "felsök unpack-trees" msgid "git rebase--helper [<options>]" msgstr "git rebase--helper [<flaggor>]" -#: builtin/rebase--helper.c:20 +#: builtin/rebase--helper.c:22 +msgid "keep empty commits" +msgstr "behåll tomma incheckningar" + +#: builtin/rebase--helper.c:23 msgid "continue rebase" msgstr "fortsätt ombasering" -#: builtin/rebase--helper.c:22 +#: builtin/rebase--helper.c:25 msgid "abort rebase" msgstr "avbryt ombasering" -#: builtin/receive-pack.c:28 +#: builtin/rebase--helper.c:28 +msgid "make rebase script" +msgstr "skapa ombaseringsskript" + +#: builtin/rebase--helper.c:30 +msgid "shorten SHA-1s in the todo list" +msgstr "förkorta SHA-1 i todo-listan" + +#: builtin/rebase--helper.c:32 +msgid "expand SHA-1s in the todo list" +msgstr "utöka SHA-1 i todo-listan" + +#: builtin/rebase--helper.c:34 +msgid "check the todo list" +msgstr "kontrollera todo-listan" + +#: builtin/rebase--helper.c:36 +msgid "skip unnecessary picks" +msgstr "hoppa över onödiga \"pick\"-kommandon" + +#: builtin/rebase--helper.c:38 +msgid "rearrange fixup/squash lines" +msgstr "ordna om fixup-/squash-rader" + +#: builtin/receive-pack.c:29 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-katalog>" -#: builtin/receive-pack.c:838 +#: builtin/receive-pack.c:839 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -11685,7 +11941,7 @@ msgstr "" "För att undvika detta meddelande och fortfarande behålla det\n" "normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"." -#: builtin/receive-pack.c:858 +#: builtin/receive-pack.c:859 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -11706,11 +11962,11 @@ msgstr "" "\n" "För att undvika detta meddelande kan du sätta det till \"refuse\"." -#: builtin/receive-pack.c:1933 +#: builtin/receive-pack.c:1932 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:1947 +#: builtin/receive-pack.c:1946 msgid "You must specify a directory." msgstr "Du måste ange en katalog." @@ -11860,12 +12116,12 @@ msgstr "att ange en master-gren ger ingen mening med --mirror" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar" -#: builtin/remote.c:191 builtin/remote.c:630 +#: builtin/remote.c:191 builtin/remote.c:631 #, c-format msgid "remote %s already exists." msgstr "fjärrarkivet %s finns redan." -#: builtin/remote.c:195 builtin/remote.c:634 +#: builtin/remote.c:195 builtin/remote.c:635 #, c-format msgid "'%s' is not a valid remote name" msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" @@ -11888,17 +12144,17 @@ msgstr "(matchande)" msgid "(delete)" msgstr "(ta bort)" -#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857 +#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858 #, c-format msgid "No such remote: %s" msgstr "Inget sådant fjärrarkiv: %s" -#: builtin/remote.c:640 +#: builtin/remote.c:641 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\"" -#: builtin/remote.c:660 +#: builtin/remote.c:661 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -11909,17 +12165,17 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nödvändigt." -#: builtin/remote.c:696 +#: builtin/remote.c:697 #, c-format msgid "deleting '%s' failed" msgstr "misslyckades ta bort \"%s\"" -#: builtin/remote.c:730 +#: builtin/remote.c:731 #, c-format msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:795 +#: builtin/remote.c:796 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -11933,113 +12189,113 @@ msgstr[1] "" "Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n" "för att ta bort dem, använd:" -#: builtin/remote.c:809 +#: builtin/remote.c:810 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:910 +#: builtin/remote.c:911 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ny (nästa hämtning sparar i remotes/%s)" -#: builtin/remote.c:913 +#: builtin/remote.c:914 msgid " tracked" msgstr " spårad" -#: builtin/remote.c:915 +#: builtin/remote.c:916 msgid " stale (use 'git remote prune' to remove)" msgstr " förlegad (använd \"git remote prune\" för att ta bort)" -#: builtin/remote.c:917 +#: builtin/remote.c:918 msgid " ???" msgstr " ???" -#: builtin/remote.c:958 +#: builtin/remote.c:959 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren" -#: builtin/remote.c:966 +#: builtin/remote.c:967 #, c-format msgid "rebases interactively onto remote %s" msgstr "ombaseras interaktivt på fjärren %s" -#: builtin/remote.c:967 +#: builtin/remote.c:968 #, c-format msgid "rebases onto remote %s" msgstr "ombaseras på fjärren %s" -#: builtin/remote.c:970 +#: builtin/remote.c:971 #, c-format msgid " merges with remote %s" msgstr " sammanslås med fjärren %s" -#: builtin/remote.c:973 +#: builtin/remote.c:974 #, c-format msgid "merges with remote %s" msgstr "sammanslås med fjärren %s" -#: builtin/remote.c:976 +#: builtin/remote.c:977 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s och med fjärren %s\n" -#: builtin/remote.c:1019 +#: builtin/remote.c:1020 msgid "create" msgstr "skapa" -#: builtin/remote.c:1022 +#: builtin/remote.c:1023 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1026 +#: builtin/remote.c:1027 msgid "up to date" msgstr "àjour" -#: builtin/remote.c:1029 +#: builtin/remote.c:1030 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1032 +#: builtin/remote.c:1033 msgid "local out of date" msgstr "lokal föråldrad" -#: builtin/remote.c:1039 +#: builtin/remote.c:1040 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1042 +#: builtin/remote.c:1043 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sänder till %-*s (%s)" -#: builtin/remote.c:1046 +#: builtin/remote.c:1047 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1049 +#: builtin/remote.c:1050 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" -#: builtin/remote.c:1117 +#: builtin/remote.c:1118 msgid "do not query remotes" msgstr "fråga inte fjärrar" -#: builtin/remote.c:1144 +#: builtin/remote.c:1145 #, c-format msgid "* remote %s" msgstr "* fjärr %s" -#: builtin/remote.c:1145 +#: builtin/remote.c:1146 #, c-format msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301 +#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302 msgid "(no URL)" msgstr "(ingen URL)" @@ -12047,184 +12303,184 @@ msgstr "(ingen URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1160 builtin/remote.c:1162 +#: builtin/remote.c:1161 builtin/remote.c:1163 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168 +#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1164 +#: builtin/remote.c:1165 msgid "(not queried)" msgstr "(inte förfrågad)" -#: builtin/remote.c:1166 +#: builtin/remote.c:1167 msgid "(unknown)" msgstr "(okänd)" -#: builtin/remote.c:1170 +#: builtin/remote.c:1171 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n" -#: builtin/remote.c:1182 +#: builtin/remote.c:1183 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Fjärrgren:%s" msgstr[1] " Fjärrgrenar:%s" -#: builtin/remote.c:1185 builtin/remote.c:1211 +#: builtin/remote.c:1186 builtin/remote.c:1212 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1194 +#: builtin/remote.c:1195 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Lokal gren konfigurerad för \"git pull\":" msgstr[1] " Lokala grenar konfigurerade för \"git pull\":" -#: builtin/remote.c:1202 +#: builtin/remote.c:1203 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1208 +#: builtin/remote.c:1209 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:" msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:" -#: builtin/remote.c:1229 +#: builtin/remote.c:1230 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" -#: builtin/remote.c:1231 +#: builtin/remote.c:1232 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1246 +#: builtin/remote.c:1247 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1248 +#: builtin/remote.c:1249 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:" -#: builtin/remote.c:1258 +#: builtin/remote.c:1259 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1267 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1268 +#: builtin/remote.c:1269 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1286 +#: builtin/remote.c:1287 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1287 +#: builtin/remote.c:1288 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1297 +#: builtin/remote.c:1298 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1299 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1314 +#: builtin/remote.c:1315 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1317 +#: builtin/remote.c:1318 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1362 +#: builtin/remote.c:1363 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 +#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" -#: builtin/remote.c:1441 +#: builtin/remote.c:1442 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1448 +#: builtin/remote.c:1449 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1465 +#: builtin/remote.c:1466 msgid "query push URLs rather than fetch URLs" msgstr "fråga sänd-URL:er istället för hämta-URL:er" -#: builtin/remote.c:1467 +#: builtin/remote.c:1468 msgid "return all URLs" msgstr "returnera alla URL:er" -#: builtin/remote.c:1495 +#: builtin/remote.c:1496 #, c-format msgid "no URLs configured for remote '%s'" msgstr "ingen URL:er angivna för fjärren \"%s\"" -#: builtin/remote.c:1521 +#: builtin/remote.c:1522 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1523 +#: builtin/remote.c:1524 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1525 +#: builtin/remote.c:1526 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1532 +#: builtin/remote.c:1533 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1573 +#: builtin/remote.c:1572 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1580 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1583 +#: builtin/remote.c:1582 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" -#: builtin/remote.c:1597 +#: builtin/remote.c:1598 msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; måste skrivas före ett underkommando" -#: builtin/remote.c:1628 +#: builtin/remote.c:1629 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" @@ -12322,7 +12578,7 @@ msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable och -A kan inte användas samtidigt" -#: builtin/repack.c:406 builtin/worktree.c:116 +#: builtin/repack.c:406 builtin/worktree.c:134 #, c-format msgid "failed to remove '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -12455,120 +12711,120 @@ msgstr "sammanslagning" msgid "keep" msgstr "behåll" -#: builtin/reset.c:77 +#: builtin/reset.c:78 msgid "You do not have a valid HEAD." msgstr "Du har inte en giltig HEAD." -#: builtin/reset.c:79 +#: builtin/reset.c:80 msgid "Failed to find tree of HEAD." msgstr "Kunde inte hitta träder för HEAD." -#: builtin/reset.c:85 +#: builtin/reset.c:86 #, c-format msgid "Failed to find tree of %s." msgstr "Kunde inte hitta träder för %s." -#: builtin/reset.c:103 +#: builtin/reset.c:113 #, c-format msgid "HEAD is now at %s" msgstr "HEAD är nu på %s" -#: builtin/reset.c:186 +#: builtin/reset.c:197 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." -#: builtin/reset.c:286 +#: builtin/reset.c:297 msgid "be quiet, only report errors" msgstr "var tyst, rapportera endast fel" -#: builtin/reset.c:288 +#: builtin/reset.c:299 msgid "reset HEAD and index" msgstr "återställ HEAD och index" -#: builtin/reset.c:289 +#: builtin/reset.c:300 msgid "reset only HEAD" msgstr "återställ endast HEAD" -#: builtin/reset.c:291 builtin/reset.c:293 +#: builtin/reset.c:302 builtin/reset.c:304 msgid "reset HEAD, index and working tree" msgstr "återställ HEAD, index och arbetskatalog" -#: builtin/reset.c:295 +#: builtin/reset.c:306 msgid "reset HEAD but keep local changes" msgstr "återställ HEAD men behåll lokala ändringar" -#: builtin/reset.c:301 +#: builtin/reset.c:312 msgid "record only the fact that removed paths will be added later" msgstr "registrera endast att borttagna sökvägar kommer läggas till senare" -#: builtin/reset.c:320 +#: builtin/reset.c:329 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Kunde inte slå upp \"%s\" som en giltig revision." -#: builtin/reset.c:328 +#: builtin/reset.c:337 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd." -#: builtin/reset.c:337 +#: builtin/reset.c:346 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch är inkompatibel med --{hard,mixed,soft}" -#: builtin/reset.c:346 +#: builtin/reset.c:355 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"." -#: builtin/reset.c:348 +#: builtin/reset.c:357 #, c-format msgid "Cannot do %s reset with paths." msgstr "Kan inte göra %s återställning med sökvägar." -#: builtin/reset.c:358 +#: builtin/reset.c:367 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s återställning tillåts inte i ett naket arkiv" -#: builtin/reset.c:362 +#: builtin/reset.c:371 msgid "-N can only be used with --mixed" msgstr "-N kan endast användas med --mixed" -#: builtin/reset.c:379 +#: builtin/reset.c:388 msgid "Unstaged changes after reset:" msgstr "Oköade ändringar efter återställning:" -#: builtin/reset.c:385 +#: builtin/reset.c:394 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." -#: builtin/reset.c:389 +#: builtin/reset.c:398 msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-list.c:358 +#: builtin/rev-list.c:361 msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" -#: builtin/rev-parse.c:394 +#: builtin/rev-parse.c:402 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]" -#: builtin/rev-parse.c:399 +#: builtin/rev-parse.c:407 msgid "keep the `--` passed as an arg" msgstr "behåll \"--\" sänt som argument" -#: builtin/rev-parse.c:401 +#: builtin/rev-parse.c:409 msgid "stop parsing after the first non-option argument" msgstr "sluta tolka efter första argument som inte är flagga" -#: builtin/rev-parse.c:404 +#: builtin/rev-parse.c:412 msgid "output in stuck long form" msgstr "utdata fast i lång form" -#: builtin/rev-parse.c:535 +#: builtin/rev-parse.c:545 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -12660,11 +12916,11 @@ msgstr "tillåt incheckningar med tomt meddelande" msgid "keep redundant, empty commits" msgstr "behåll redundanta, tomma incheckningar" -#: builtin/revert.c:212 +#: builtin/revert.c:214 msgid "revert failed" msgstr "\"revert\" misslyckades" -#: builtin/revert.c:225 +#: builtin/revert.c:227 msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" @@ -12732,17 +12988,17 @@ msgstr "tillåt rekursiv borttagning" msgid "exit with a zero status even if nothing matched" msgstr "avsluta med nollstatus även om inget träffades" -#: builtin/rm.c:308 +#: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" msgstr "tar inte bort \"%s\" rekursivt utan -r" -#: builtin/rm.c:347 +#: builtin/rm.c:346 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: kan inte ta bort %s" -#: builtin/rm.c:370 +#: builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "kunde inte ta bort \"%s\"" @@ -12779,27 +13035,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:249 +#: builtin/shortlog.c:263 msgid "Group by committer rather than author" msgstr "Gruppera efter incheckare istället för författare" -#: builtin/shortlog.c:251 +#: builtin/shortlog.c:265 msgid "sort output according to the number of commits per author" msgstr "sortera utdata enligt antal incheckningar per författare" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:267 msgid "Suppress commit descriptions, only provides commit count" msgstr "Undertryck beskrivningar, visa bara antal incheckningar" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:269 msgid "Show the email address of each author" msgstr "Visa e-postadress för varje författare" -#: builtin/shortlog.c:256 +#: builtin/shortlog.c:270 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:271 msgid "Linewrap output" msgstr "Radbryt utdata" @@ -12999,35 +13255,35 @@ 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:25 builtin/submodule--helper.c:1075 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" -#: builtin/submodule--helper.c:72 +#: builtin/submodule--helper.c:71 #, c-format msgid "cannot strip one component off url '%s'" msgstr "kan inte ta bort en komponent från url:en \"%s\"" -#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" -#: builtin/submodule--helper.c:310 +#: builtin/submodule--helper.c:307 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380 +#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374 #, 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:395 +#: builtin/submodule--helper.c:389 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " @@ -13036,79 +13292,79 @@ msgstr "" "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sn eget " "officiella uppström." -#: builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:400 #, 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:410 +#: builtin/submodule--helper.c:404 #, 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:420 +#: builtin/submodule--helper.c:414 #, 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:427 +#: builtin/submodule--helper.c:421 #, 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:443 +#: builtin/submodule--helper.c:437 msgid "Suppress output for initializing a submodule" msgstr "Dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:448 +#: builtin/submodule--helper.c:442 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<sökväg>]" -#: builtin/submodule--helper.c:476 +#: builtin/submodule--helper.c:470 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sökväg>" -#: builtin/submodule--helper.c:482 +#: builtin/submodule--helper.c:475 #, 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:565 builtin/submodule--helper.c:568 +#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s" -#: builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:597 #, 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:611 +#: builtin/submodule--helper.c:604 #, 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:633 +#: builtin/submodule--helper.c:626 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen skall klonas till" -#: builtin/submodule--helper.c:636 +#: builtin/submodule--helper.c:629 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:639 +#: builtin/submodule--helper.c:632 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:645 +#: builtin/submodule--helper.c:638 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012 msgid "force cloning progress" msgstr "tvinga kloningsförlopp" -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:646 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -13116,82 +13372,82 @@ 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:684 +#: builtin/submodule--helper.c:677 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsökvägen ”%s”" -#: builtin/submodule--helper.c:699 +#: builtin/submodule--helper.c:692 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" -#: builtin/submodule--helper.c:764 +#: builtin/submodule--helper.c:757 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:768 +#: builtin/submodule--helper.c:761 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:793 +#: builtin/submodule--helper.c:790 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:814 +#: builtin/submodule--helper.c:819 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" -#: builtin/submodule--helper.c:942 +#: builtin/submodule--helper.c:952 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" -#: builtin/submodule--helper.c:953 +#: builtin/submodule--helper.c:963 #, 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:974 builtin/submodule--helper.c:1162 +#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:996 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:981 +#: builtin/submodule--helper.c:1000 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:985 +#: builtin/submodule--helper.c:1004 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:988 +#: builtin/submodule--helper.c:1007 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:1009 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:991 +#: builtin/submodule--helper.c:1010 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:998 +#: builtin/submodule--helper.c:1017 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:1008 +#: builtin/submodule--helper.c:1030 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:1079 +#: builtin/submodule--helper.c:1098 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -13200,20 +13456,20 @@ 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:1163 +#: builtin/submodule--helper.c:1214 msgid "recurse into submodules" msgstr "rekursera ner i undermoduler" -#: builtin/submodule--helper.c:1169 +#: builtin/submodule--helper.c:1220 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<sökväg>...]" -#: builtin/submodule--helper.c:1232 +#: builtin/submodule--helper.c:1278 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" -#: builtin/submodule--helper.c:1238 +#: builtin/submodule--helper.c:1284 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -13226,24 +13482,24 @@ msgstr "git symbolic-ref [<flaggor>] <namn> [<ref>]" msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <namn>" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" msgstr "" "undertryck felmeddelanden för icke-symboliska (frånkopplade) referenser" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:41 msgid "delete symbolic ref" msgstr "ta bort symbolisk referens" -#: builtin/symbolic-ref.c:43 +#: builtin/symbolic-ref.c:42 msgid "shorten ref output" msgstr "förkorta ref-utdata" -#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "skäl" -#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "skäl till uppdateringen" @@ -13273,17 +13529,17 @@ msgstr "" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<format>] <taggnamn>..." -#: builtin/tag.c:84 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "taggen \"%s\" hittades inte." -#: builtin/tag.c:100 +#: builtin/tag.c:102 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tog bort tagg \"%s\" (var %s)\n" -#: builtin/tag.c:129 +#: builtin/tag.c:131 #, c-format msgid "" "\n" @@ -13296,7 +13552,7 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/tag.c:133 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -13311,142 +13567,142 @@ msgstr "" "Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n" "du vill.\n" -#: builtin/tag.c:211 +#: builtin/tag.c:189 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:213 +#: builtin/tag.c:191 msgid "unable to write tag file" msgstr "kunde inte skriva tagg-filen" -#: builtin/tag.c:237 +#: builtin/tag.c:215 msgid "bad object type." msgstr "felaktig objekttyp." -#: builtin/tag.c:283 +#: builtin/tag.c:261 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:290 +#: builtin/tag.c:268 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:398 +#: builtin/tag.c:376 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:400 +#: builtin/tag.c:378 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:402 +#: builtin/tag.c:380 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:403 +#: builtin/tag.c:381 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:405 +#: builtin/tag.c:383 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:407 +#: builtin/tag.c:385 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:409 +#: builtin/tag.c:387 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:411 +#: builtin/tag.c:389 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:415 +#: builtin/tag.c:393 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:416 +#: builtin/tag.c:394 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:417 builtin/update-ref.c:369 +#: builtin/tag.c:395 builtin/update-ref.c:368 msgid "create a reflog" msgstr "skapa en reflog" -#: builtin/tag.c:419 +#: builtin/tag.c:397 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:420 +#: builtin/tag.c:398 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:421 builtin/tag.c:423 +#: builtin/tag.c:399 builtin/tag.c:401 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:422 builtin/tag.c:424 +#: builtin/tag.c:400 builtin/tag.c:402 msgid "print only tags that don't contain the commit" msgstr "visa endast taggar som inte innehåller incheckningen" -#: builtin/tag.c:425 +#: builtin/tag.c:403 msgid "print only tags that are merged" msgstr "visa endast taggar som slagits samman" -#: builtin/tag.c:426 +#: builtin/tag.c:404 msgid "print only tags that are not merged" msgstr "visa endast taggar som ej slagits samman" -#: builtin/tag.c:431 +#: builtin/tag.c:409 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:470 +#: builtin/tag.c:453 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" -#: builtin/tag.c:492 +#: builtin/tag.c:475 msgid "-n option is only allowed in list mode" msgstr "Flaggan -n är endast tillåten i listläge" -#: builtin/tag.c:494 +#: builtin/tag.c:477 msgid "--contains option is only allowed in list mode" msgstr "Flaggan --contains är endast tillåten i listläge" -#: builtin/tag.c:496 +#: builtin/tag.c:479 msgid "--no-contains option is only allowed in list mode" msgstr "Flaggan --no-contains är endast tillåten i listläge" -#: builtin/tag.c:498 +#: builtin/tag.c:481 msgid "--points-at option is only allowed in list mode" msgstr "Flaggan --points-at är endast tillåten i listläge" -#: builtin/tag.c:500 +#: builtin/tag.c:483 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "Flaggorna --merged och --no-merged är endast tillåtna i listläge" -#: builtin/tag.c:511 +#: builtin/tag.c:494 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:530 +#: builtin/tag.c:513 msgid "too many params" msgstr "för många parametrar" -#: builtin/tag.c:536 +#: builtin/tag.c:519 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:541 +#: builtin/tag.c:524 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:571 +#: builtin/tag.c:554 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" @@ -13516,127 +13772,127 @@ msgstr "stat-informationen för en katalog ändras inte när en katalog tas bort msgid " OK" msgstr " OK" -#: builtin/update-index.c:569 +#: builtin/update-index.c:571 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<flaggor>] [--] [<fil>...]" -#: builtin/update-index.c:924 +#: builtin/update-index.c:926 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är àjour" -#: builtin/update-index.c:927 +#: builtin/update-index.c:929 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:930 +#: builtin/update-index.c:932 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:932 +#: builtin/update-index.c:934 msgid "let files replace directories and vice-versa" msgstr "låt filer ersätta kataloger och omvänt" -#: builtin/update-index.c:934 +#: builtin/update-index.c:936 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:936 +#: builtin/update-index.c:938 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" -#: builtin/update-index.c:939 +#: builtin/update-index.c:941 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:943 +#: builtin/update-index.c:945 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:947 +#: builtin/update-index.c:949 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:948 +#: builtin/update-index.c:950 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:957 +#: builtin/update-index.c:959 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:960 +#: builtin/update-index.c:962 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:963 +#: builtin/update-index.c:965 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:966 +#: builtin/update-index.c:968 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:969 +#: builtin/update-index.c:971 msgid "add to index only; do not add content to object database" msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen" -#: builtin/update-index.c:971 +#: builtin/update-index.c:973 msgid "remove named paths even if present in worktree" msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen" -#: builtin/update-index.c:973 +#: builtin/update-index.c:975 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:975 +#: builtin/update-index.c:977 msgid "read list of paths to be updated from standard input" msgstr "läs lista över sökvägar att uppdatera från standard in" -#: builtin/update-index.c:979 +#: builtin/update-index.c:981 msgid "add entries from standard input to the index" msgstr "lägg poster från standard in till indexet" -#: builtin/update-index.c:983 +#: builtin/update-index.c:985 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "återfyll etapp 2 och 3 från angivna sökvägar" -#: builtin/update-index.c:987 +#: builtin/update-index.c:989 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: builtin/update-index.c:991 +#: builtin/update-index.c:993 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:994 +#: builtin/update-index.c:996 msgid "report actions to standard output" msgstr "rapportera åtgärder på standard ut" -#: builtin/update-index.c:996 +#: builtin/update-index.c:998 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:1002 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:1004 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1006 msgid "enable/disable untracked cache" msgstr "aktivera/inaktivera ospårad cache" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1008 msgid "test if the filesystem supports untracked cache" msgstr "testa om filsystemet stöder ospårad cache" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1010 msgid "enable untracked cache without testing the filesystem" msgstr "aktivera ospårad cache utan att testa filsystemet" -#: builtin/update-index.c:1108 +#: builtin/update-index.c:1107 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -13644,7 +13900,7 @@ msgstr "" "core.splitIndex är satt till false; ta bort eller ändra det om du verkligen " "vill aktivera delat index" -#: builtin/update-index.c:1117 +#: builtin/update-index.c:1116 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -13652,7 +13908,7 @@ msgstr "" "core.splitIndex är satt till true; ta bort eller ändra det om du verkligen " "vill inaktivera delat index" -#: builtin/update-index.c:1128 +#: builtin/update-index.c:1127 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -13660,11 +13916,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:1132 +#: builtin/update-index.c:1131 msgid "Untracked cache disabled" msgstr "Ospårad cache är inaktiverad" -#: builtin/update-index.c:1140 +#: builtin/update-index.c:1139 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -13672,7 +13928,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:1144 +#: builtin/update-index.c:1143 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Ospårad cache är aktiverad för \"%s\"" @@ -13689,19 +13945,19 @@ msgstr "git update-ref [<flaggor>] <refnamn> <gammaltvärde> [<nyttvärde>]" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<flaggor>] --stdin [-z]" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "ta bort referensen" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "uppdatera <refnamn> inte det den pekar på" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "standard in har NUL-terminerade argument" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "läs uppdateringar från standard in" @@ -13765,103 +14021,112 @@ msgstr "git worktree prune [<flaggor>]" msgid "git worktree unlock <path>" msgstr "git worktree unlock <sökväg>" -#: builtin/worktree.c:44 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Tar bort worktrees/%s: inte en giltig katalog" -#: builtin/worktree.c:50 +#: builtin/worktree.c:52 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte" -#: builtin/worktree.c:55 +#: builtin/worktree.c:57 builtin/worktree.c:66 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)" -#: builtin/worktree.c:66 +#: builtin/worktree.c:76 +#, c-format +msgid "" +"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " +"%<PRIuMAX>)" +msgstr "" +"Tar bort worktrees/%s: kort läsning (förväntade %<PRIuMAX> byte, läste " +"%<PRIuMAX>)" + +#: builtin/worktree.c:84 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" -#: builtin/worktree.c:82 +#: builtin/worktree.c:100 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats" -#: builtin/worktree.c:129 +#: builtin/worktree.c:147 msgid "report pruned working trees" msgstr "rapportera borttagna arbetskataloger" -#: builtin/worktree.c:131 +#: builtin/worktree.c:149 msgid "expire working trees older than <time>" msgstr "låt tid gå ut för arbetskataloger äldre än <tid>" -#: builtin/worktree.c:205 +#: builtin/worktree.c:223 #, c-format msgid "'%s' already exists" msgstr "\"%s\" finns redan" -#: builtin/worktree.c:236 +#: builtin/worktree.c:254 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:275 +#: builtin/worktree.c:293 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Förbereder %s (identifieraren %s)" -#: builtin/worktree.c:327 +#: builtin/worktree.c:345 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog" -#: builtin/worktree.c:329 +#: builtin/worktree.c:347 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:331 +#: builtin/worktree.c:349 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:333 +#: builtin/worktree.c:351 msgid "populate the new working tree" msgstr "befolka den nya arbetskatalogen" -#: builtin/worktree.c:334 +#: builtin/worktree.c:352 msgid "keep the new working tree locked" msgstr "låt arbetskatalogen förbli låst" -#: builtin/worktree.c:342 +#: builtin/worktree.c:360 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" -#: builtin/worktree.c:479 +#: builtin/worktree.c:499 msgid "reason for locking" msgstr "orsak till lås" -#: builtin/worktree.c:491 builtin/worktree.c:524 +#: builtin/worktree.c:511 builtin/worktree.c:544 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:493 builtin/worktree.c:526 +#: builtin/worktree.c:513 builtin/worktree.c:546 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:498 +#: builtin/worktree.c:518 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:500 +#: builtin/worktree.c:520 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:528 +#: builtin/worktree.c:548 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" @@ -13886,23 +14151,23 @@ msgstr "endast användbart vid felsökning" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<flaggor>] <katalog>" -#: upload-pack.c:1041 +#: upload-pack.c:1040 msgid "quit after a single request/response exchange" msgstr "avsluta omedelbart efter första anrop/svar-utväxling" -#: upload-pack.c:1043 +#: upload-pack.c:1042 msgid "exit immediately after initial ref advertisement" msgstr "avsluta omedelbart efter inledande kungörelse av referenser" -#: upload-pack.c:1045 +#: upload-pack.c:1044 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:1047 +#: upload-pack.c:1046 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "avbryt överföringen efter <n> sekunders inaktivitet" -#: credential-cache--daemon.c:224 +#: credential-cache--daemon.c:222 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -13915,7 +14180,7 @@ msgstr "" "\n" "\tchmod 0700 %s" -#: credential-cache--daemon.c:272 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "skriv felsökningsmeddelanden på standard fel" @@ -13929,20 +14194,20 @@ 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:337 +#: http.c:338 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "http.postbuffer har negativt värde; använder förvalet %d" -#: http.c:358 +#: http.c:359 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Delegerad styrning stöds inte av cURL < 7.22.0" -#: http.c:367 +#: http.c:368 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:1764 +#: http.c:1768 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14313,7 +14578,7 @@ msgstr "Kunde inte hitta gemensam incheckning med $pretty_name" #: git-merge-octopus.sh:77 #, sh-format -msgid "Already up-to-date with $pretty_name" +msgid "Already up to date with $pretty_name" msgstr "Redan à jour med $pretty_name" #: git-merge-octopus.sh:89 @@ -14332,50 +14597,53 @@ msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning. #: git-rebase.sh:58 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" -"To check out the original branch and stop rebasing, run \"git rebase --abort" -"\"." +"Resolve all conflicts manually, mark them as resolved with\n" +"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" +"You can instead skip this commit: run \"git rebase --skip\".\n" +"To abort and get back to the state before \"git rebase\", run \"git rebase --" +"abort\"." msgstr "" -"När du har löst problemet kör du \"git rebase --continue\".\n" -"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\"." +"Lös alla konflikter manuellt, märk dem som lösta med\n" +"\"git add/rm <filer_i_konflikt>\", kör sedan \"git rebase --continue\".\n" +"Du kan hoppa över incheckningen istället: kör \"git rebase --skip\".\n" +"För att avbryta och återgå till där du var före ombaseringen, kör \"git " +"rebase --abort\"." -#: git-rebase.sh:158 git-rebase.sh:397 +#: git-rebase.sh:160 git-rebase.sh:402 #, sh-format msgid "Could not move back to $head_name" msgstr "Kunde inte flytta tillbaka till $head_name" -#: git-rebase.sh:169 +#: git-rebase.sh:171 msgid "Applied autostash." msgstr "Tillämpade autostash." -#: git-rebase.sh:172 +#: git-rebase.sh:174 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Kan inte spara $stash_sha1" -#: git-rebase.sh:212 +#: git-rebase.sh:214 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: git-rebase.sh:217 +#: git-rebase.sh:219 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:358 +#: git-rebase.sh:363 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: git-rebase.sh:369 +#: git-rebase.sh:374 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:376 +#: git-rebase.sh:381 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: git-rebase.sh:379 +#: git-rebase.sh:384 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -14383,7 +14651,7 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: git-rebase.sh:419 +#: git-rebase.sh:424 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -14404,102 +14672,102 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där." -#: git-rebase.sh:470 +#: git-rebase.sh:480 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ogiltig uppström $upstream_name" -#: git-rebase.sh:494 +#: git-rebase.sh:504 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: mer än en sammanslagningsbas finns" -#: git-rebase.sh:497 git-rebase.sh:501 +#: git-rebase.sh:507 git-rebase.sh:511 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ingen sammanslagningsbas finns" -#: git-rebase.sh:506 +#: git-rebase.sh:516 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Peka på en giltig incheckning: $onto_name" -#: git-rebase.sh:529 +#: git-rebase.sh:539 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "ödesdigert: ingen sådan gren: $branch_name" -#: git-rebase.sh:562 +#: git-rebase.sh:572 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: git-rebase.sh:567 +#: git-rebase.sh:577 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Skapade autostash: $stash_abbrev" -#: git-rebase.sh:571 +#: git-rebase.sh:581 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: git-rebase.sh:591 +#: git-rebase.sh:601 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktuell gren $branch_name är à jour." -#: git-rebase.sh:595 +#: git-rebase.sh:605 #, 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:606 +#: git-rebase.sh:616 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Ändringar från $mb till $onto:" -#: git-rebase.sh:615 +#: git-rebase.sh:625 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:625 +#: git-rebase.sh:635 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Snabbspolade $branch_name till $onto_name." -#: git-stash.sh:54 +#: git-stash.sh:61 msgid "git stash clear with parameters is unimplemented" msgstr "\"git stash clear\" med parametrar har inte implementerats" -#: git-stash.sh:95 +#: git-stash.sh:102 msgid "You do not have the initial commit yet" msgstr "Du har inte den första incheckningen ännu" -#: git-stash.sh:110 +#: git-stash.sh:117 msgid "Cannot save the current index state" msgstr "Kan inte spara aktuellt tillstånd för indexet" -#: git-stash.sh:125 +#: git-stash.sh:132 msgid "Cannot save the untracked files" msgstr "Kan inte spara ospårade filer" -#: git-stash.sh:145 git-stash.sh:158 +#: git-stash.sh:152 git-stash.sh:165 msgid "Cannot save the current worktree state" msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" -#: git-stash.sh:162 +#: git-stash.sh:169 msgid "No changes selected" msgstr "Inga ändringar valda" -#: git-stash.sh:165 +#: git-stash.sh:172 msgid "Cannot remove temporary index (can't happen)" msgstr "Kan inte ta bort temporärt index (kan inte inträffa)" -#: git-stash.sh:178 +#: git-stash.sh:185 msgid "Cannot record working tree state" msgstr "Kan inte registrera tillstånd för arbetskatalog" -#: git-stash.sh:210 +#: git-stash.sh:217 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Kan inte uppdatera $ref_stash med $w_commit" @@ -14514,7 +14782,7 @@ msgstr "Kan inte uppdatera $ref_stash med $w_commit" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:266 +#: git-stash.sh:273 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -14523,107 +14791,107 @@ msgstr "" "fel: felaktig flagga för \"stash save\": $option\n" " För att ange ett meddelande, använd git stash save -- \"$option\"" -#: git-stash.sh:281 +#: git-stash.sh:288 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt" -#: git-stash.sh:289 +#: git-stash.sh:296 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" -#: git-stash.sh:294 +#: git-stash.sh:301 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: git-stash.sh:298 +#: git-stash.sh:305 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" -#: git-stash.sh:299 +#: git-stash.sh:306 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Sparade arbetskatalogen och indexstatus $stash_msg" -#: git-stash.sh:326 +#: git-stash.sh:334 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: git-stash.sh:474 +#: git-stash.sh:482 #, sh-format msgid "unknown option: $opt" msgstr "okänd flagga: $opt" -#: git-stash.sh:487 +#: git-stash.sh:495 msgid "No stash entries found." msgstr "Inga \"stash”-poster hittades." -#: git-stash.sh:494 +#: git-stash.sh:502 #, sh-format msgid "Too many revisions specified: $REV" msgstr "För många revisioner angivna: $REV" -#: git-stash.sh:509 +#: git-stash.sh:517 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference är inte en giltig referens" -#: git-stash.sh:537 +#: git-stash.sh:545 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "\"$args\" är inte en \"stash\"-liknande incheckning" -#: git-stash.sh:548 +#: git-stash.sh:556 #, sh-format msgid "'$args' is not a stash reference" msgstr "\"$args\" är inte en \"stash\"-referens" -#: git-stash.sh:556 +#: git-stash.sh:564 msgid "unable to refresh index" msgstr "kan inte uppdatera indexet" -#: git-stash.sh:560 +#: git-stash.sh:568 msgid "Cannot apply a stash in the middle of a merge" msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning" -#: git-stash.sh:568 +#: git-stash.sh:576 msgid "Conflicts in index. Try without --index." msgstr "Konflikter i indexet. Testa utan --index." -#: git-stash.sh:570 +#: git-stash.sh:578 msgid "Could not save index tree" msgstr "Kunde inte spara indexträd" -#: git-stash.sh:579 +#: git-stash.sh:587 msgid "Could not restore untracked files from stash entry" msgstr "Kunde inte återställa ospårade filer från stash-post" -#: git-stash.sh:604 +#: git-stash.sh:612 msgid "Cannot unstage modified files" msgstr "Kan inte ta bort ändrade filer ur kön" -#: git-stash.sh:619 +#: git-stash.sh:627 msgid "Index was not unstashed." msgstr "Indexet har inte tagits ur kön." -#: git-stash.sh:633 +#: git-stash.sh:641 msgid "The stash entry is kept in case you need it again." msgstr "Stash-posten behålls ifall du behöver den igen." -#: git-stash.sh:642 +#: git-stash.sh:650 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Kastade ${REV} ($s)" -#: git-stash.sh:643 +#: git-stash.sh:651 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-stash.sh:651 +#: git-stash.sh:659 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: git-stash.sh:730 +#: git-stash.sh:738 msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" @@ -14770,17 +15038,17 @@ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\"" -#: git-submodule.sh:638 +#: git-submodule.sh:637 #, 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:648 +#: git-submodule.sh:647 #, 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:653 +#: git-submodule.sh:652 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -14789,12 +15057,12 @@ msgstr "" "Kan inte hitta aktuell revision för ${remote_name}/${branch} i " "undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:671 +#: git-submodule.sh:670 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\"" -#: git-submodule.sh:677 +#: git-submodule.sh:676 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -14803,84 +15071,84 @@ msgstr "" "Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. " "Direkt hämtning av incheckningen misslyckades." -#: git-submodule.sh:684 +#: git-submodule.sh:683 #, 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:685 +#: git-submodule.sh:684 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:689 +#: git-submodule.sh:688 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:690 +#: git-submodule.sh:689 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:695 +#: git-submodule.sh:694 #, 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:696 +#: git-submodule.sh:695 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:701 +#: git-submodule.sh:700 #, 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:702 +#: git-submodule.sh:701 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" -#: git-submodule.sh:733 +#: git-submodule.sh:732 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:841 +#: git-submodule.sh:840 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" -#: git-submodule.sh:893 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:913 +#: git-submodule.sh:912 #, 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:916 +#: git-submodule.sh:915 #, 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:919 +#: git-submodule.sh:918 #, 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:1065 +#: git-submodule.sh:1064 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:1137 +#: git-submodule.sh:1136 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" @@ -14899,27 +15167,27 @@ msgstr "Ombaserar ($new_count/$total)" msgid "" "\n" "Commands:\n" -" p, pick = use commit\n" -" r, reword = use commit, but edit the commit message\n" -" e, edit = use commit, but stop for amending\n" -" s, squash = use commit, but meld into previous commit\n" -" f, fixup = like \"squash\", but discard this commit's log message\n" -" x, exec = run command (the rest of the line) using shell\n" -" d, drop = remove commit\n" +"p, pick = use commit\n" +"r, reword = use commit, but edit the commit message\n" +"e, edit = use commit, but stop for amending\n" +"s, squash = use commit, but meld into previous commit\n" +"f, fixup = like \"squash\", but discard this commit's log message\n" +"x, exec = run command (the rest of the line) using shell\n" +"d, drop = remove commit\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" "\n" "Kommandon:\n" -" p, pick = använd incheckning\n" -" r, reword = använd incheckning, men redigera incheckningsmeddelandet\n" -" e, edit = använd incheckning, men stanna för tillägg\n" -" s, squash = använd incheckning, men infoga i föregående incheckning\n" -" f, fixup = som \"squash\", men förkasta incheckningsmeddelandet\n" -" x, exec = kör kommando (resten av raden) i skalet\n" -" d, drop = ta bort incheckning\n" +"p, pick = använd incheckning\n" +"r, reword = använd incheckning, men redigera incheckningsmeddelandet\n" +"e, edit = använd incheckning, men stanna för tillägg\n" +"s, squash = använd incheckning, men infoga i föregående incheckning\n" +"f, fixup = som \"squash\", men förkasta incheckningsmeddelandet\n" +"x, exec = kör kommando (resten av raden) i skalet\n" +"d, drop = ta bort incheckning\n" "\n" -"Du kan byta ordning på raderna, de utförs uppifrån och ned.\n" +"Du kan byta ordning på raderna; de utförs uppifrån och ned.\n" #: git-rebase--interactive.sh:171 msgid "" @@ -14991,49 +15259,49 @@ msgstr "Kan inte flytta HEAD till $first_parent" msgid "Refusing to squash a merge: $sha1" msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1" -#: git-rebase--interactive.sh:399 +#: git-rebase--interactive.sh:400 #, sh-format msgid "Error redoing merge $sha1" msgstr "Fel när sammanslagningen $sha1 skulle göras om" -#: git-rebase--interactive.sh:407 +#: git-rebase--interactive.sh:408 #, sh-format msgid "Could not pick $sha1" msgstr "Kunde inte välja $sha1" -#: git-rebase--interactive.sh:416 +#: git-rebase--interactive.sh:417 #, sh-format msgid "This is the commit message #${n}:" msgstr "Det här är incheckningsmeddelande ${n}:" -#: git-rebase--interactive.sh:421 +#: git-rebase--interactive.sh:422 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Incheckningsmeddelande ${n} kommer hoppas över:" -#: git-rebase--interactive.sh:432 +#: git-rebase--interactive.sh:433 #, 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:441 +#: git-rebase--interactive.sh:442 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Kan inte skriva $fixup_msg" -#: git-rebase--interactive.sh:444 +#: git-rebase--interactive.sh:445 msgid "This is a combination of 2 commits." msgstr "Det här är en kombination av 2 incheckningar." -#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 -#: git-rebase--interactive.sh:531 +#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529 +#: git-rebase--interactive.sh:532 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Kunde inte tillämpa $sha1... $rest" -#: git-rebase--interactive.sh:559 +#: git-rebase--interactive.sh:560 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -15047,31 +15315,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:574 +#: git-rebase--interactive.sh:575 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Stoppade på $sha1_abbrev... $rest" -#: git-rebase--interactive.sh:589 +#: git-rebase--interactive.sh:590 #, 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:631 +#: git-rebase--interactive.sh:632 #, sh-format msgid "Executing: $rest" msgstr "Kör: $rest" -#: git-rebase--interactive.sh:639 +#: git-rebase--interactive.sh:640 #, sh-format msgid "Execution failed: $rest" msgstr "Körning misslyckades: $rest" -#: git-rebase--interactive.sh:641 +#: git-rebase--interactive.sh:642 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:643 +#: git-rebase--interactive.sh:644 msgid "" "You can fix the problem, and then run\n" "\n" @@ -15082,7 +15350,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:656 +#: git-rebase--interactive.sh:657 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -15097,96 +15365,29 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:667 +#: git-rebase--interactive.sh:668 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Okänt kommando: $command $sha1 $rest" -#: git-rebase--interactive.sh:668 +#: git-rebase--interactive.sh:669 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Rätta det med \"git rebase --edit-todo\"." -#: git-rebase--interactive.sh:703 +#: git-rebase--interactive.sh:704 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Lyckades ombasera och uppdatera $head_name." -#: 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:908 -#, sh-format -msgid "" -"Warning: the SHA-1 is missing or isn't a commit in the following line:\n" -" - $line" -msgstr "" -"Varning: SHA-1 saknas eller inte en incheckning på följande rad:\n" -" - $line" - -#: git-rebase--interactive.sh:941 -#, sh-format -msgid "" -"Warning: the command isn't recognized in the following line:\n" -" - $line" -msgstr "" -"Varning: kommandot kändes inte igen på följande rad:\n" -" - $line" - -#: git-rebase--interactive.sh:980 +#: git-rebase--interactive.sh:749 msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" -#: git-rebase--interactive.sh:1018 -msgid "" -"Warning: some commits may have been dropped accidentally.\n" -"Dropped commits (newer to older):" -msgstr "" -"Varning: vissa incheckningar kan av misstag ha tappats.\n" -"Tappade incheckningar (nyaste först):" - -#: git-rebase--interactive.sh:1026 -msgid "" -"To avoid this message, use \"drop\" to explicitly remove a commit.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of " -"warnings.\n" -"The possible behaviours are: ignore, warn, error." -msgstr "" -"För att undvika det här meddelandet kan du använda \"drop\" för att " -"explicit\n" -"kasta en incheckning.\n" -"\n" -"Använd \"git config rebase.missingCommitsCheck\" för att ändra " -"varningsnivån.\n" -"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error" -"\" (fel)." - -#: git-rebase--interactive.sh:1037 -#, sh-format -msgid "" -"Unrecognized setting $check_level for option rebase.missingCommitsCheck. " -"Ignoring." -msgstr "" -"Okänt val $check_level för flaggan rebase.missingCommitsCheck. Ignorerar." - -#: git-rebase--interactive.sh:1054 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'." -msgstr "" -"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --" -"continue\"." - -#: 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:1083 +#: git-rebase--interactive.sh:784 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Kunde inte ta bort CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:1088 +#: git-rebase--interactive.sh:789 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -15217,11 +15418,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:1105 +#: git-rebase--interactive.sh:806 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:1110 +#: git-rebase--interactive.sh:811 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -15229,11 +15430,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:1115 git-rebase--interactive.sh:1119 +#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820 msgid "Could not commit staged changes." msgstr "Kunde inte checka in köade ändringar." -#: git-rebase--interactive.sh:1147 +#: git-rebase--interactive.sh:848 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -15247,40 +15448,40 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313 +#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015 msgid "Could not execute editor" msgstr "Kunde inte starta textredigerare" -#: git-rebase--interactive.sh:1168 +#: git-rebase--interactive.sh:869 #, sh-format msgid "Could not checkout $switch_to" msgstr "Kunde inte checka ut $switch_to" -#: git-rebase--interactive.sh:1173 +#: git-rebase--interactive.sh:874 msgid "No HEAD?" msgstr "Inget HEAD?" -#: git-rebase--interactive.sh:1174 +#: git-rebase--interactive.sh:875 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Kunde inte skapa temporär $state_dir" -#: git-rebase--interactive.sh:1176 +#: git-rebase--interactive.sh:877 msgid "Could not mark as interactive" msgstr "Kunde inte markera som interaktiv" -#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191 +#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892 msgid "Could not init rewritten commits" msgstr "Kunde inte initiera omskrivna incheckningar" -#: git-rebase--interactive.sh:1291 +#: git-rebase--interactive.sh:993 #, 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:1296 +#: git-rebase--interactive.sh:998 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -15290,7 +15491,7 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: git-rebase--interactive.sh:1303 +#: git-rebase--interactive.sh:1005 msgid "Note that empty commits are commented out" msgstr "Observera att tomma incheckningar är utkommenterade" @@ -15871,61 +16072,61 @@ msgstr "lokal zon skiljer sig från GMT med delar av minuter\n" 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:208 git-send-email.perl:214 +#: git-send-email.perl:207 git-send-email.perl:213 msgid "the editor exited uncleanly, aborting everything" msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting" -#: git-send-email.perl:291 +#: git-send-email.perl:290 #, 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:296 +#: git-send-email.perl:295 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "\"%s.final\" innehåller det skrivna brevet.\n" -#: git-send-email.perl:314 +#: git-send-email.perl:313 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-alias är inkompatibelt med andra flaggor\n" -#: git-send-email.perl:379 git-send-email.perl:634 +#: git-send-email.perl:378 git-send-email.perl:629 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:448 +#: git-send-email.perl:447 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Okänt fält i --suppress-cc: \"%s\"\n" -#: git-send-email.perl:477 +#: git-send-email.perl:476 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Okänd inställning i --confirm: \"%s\"\n" -#: git-send-email.perl:509 +#: git-send-email.perl:504 #, 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:511 +#: git-send-email.perl:506 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "varning: \":include:\" stöds inte: %s\n" -#: git-send-email.perl:513 +#: git-send-email.perl:508 #, 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:518 +#: git-send-email.perl:513 #, 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:600 +#: git-send-email.perl:595 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -15940,12 +16141,12 @@ msgstr "" " * Säga \"./%s\" om du menar en fil; eller\n" " * Ange flaggan --format-patch om du menar ett intervall.\n" -#: git-send-email.perl:621 +#: git-send-email.perl:616 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Misslyckades utföra opendir %s: %s" -#: git-send-email.perl:645 +#: git-send-email.perl:640 #, perl-format msgid "" "fatal: %s: %s\n" @@ -15954,7 +16155,7 @@ msgstr "" "ödesdigert: %s: %s\n" "varning: inga patchar har sänts\n" -#: git-send-email.perl:656 +#: git-send-email.perl:651 msgid "" "\n" "No patch files specified!\n" @@ -15964,17 +16165,17 @@ msgstr "" "Inga patchfiler angavs!\n" "\n" -#: git-send-email.perl:669 +#: git-send-email.perl:664 #, perl-format msgid "No subject line in %s?" msgstr "Ingen ärenderad i %s?" -#: git-send-email.perl:679 +#: git-send-email.perl:674 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Kunde inte öppna för skrivning %s: %s" -#: git-send-email.perl:689 +#: git-send-email.perl:684 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -15988,42 +16189,42 @@ msgstr "" "\n" "Rensa brevkroppen om du inte vill sända någon sammanfattning.\n" -#: git-send-email.perl:712 +#: git-send-email.perl:707 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Misslyckades öppna %s.final: %s" -#: git-send-email.perl:715 +#: git-send-email.perl:710 #, perl-format msgid "Failed to open %s: %s" msgstr "Misslyckades öppna %s: %s" -#: git-send-email.perl:750 +#: git-send-email.perl:745 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:759 +#: git-send-email.perl:754 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:791 +#: git-send-email.perl:786 #, 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:820 +#: git-send-email.perl:815 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:825 +#: git-send-email.perl:820 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Vilken åttabitarsteckenkodning skall jag ange [UTF-8]? " -#: git-send-email.perl:833 +#: git-send-email.perl:828 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -16036,21 +16237,21 @@ msgstr "" "har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen " "vill sända.\n" -#: git-send-email.perl:852 +#: git-send-email.perl:847 msgid "To whom should the emails be sent (if anyone)?" msgstr "Till vem skall breven sändas (om någon)?" -#: git-send-email.perl:870 +#: git-send-email.perl:865 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n" -#: git-send-email.perl:882 +#: git-send-email.perl:877 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:932 git-send-email.perl:940 +#: git-send-email.perl:927 git-send-email.perl:935 #, 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" @@ -16058,16 +16259,16 @@ 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:944 +#: git-send-email.perl:939 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:1245 +#: git-send-email.perl:1260 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA-sökvägen \"%s\" finns inte" -#: git-send-email.perl:1320 +#: git-send-email.perl:1335 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -16094,124 +16295,124 @@ msgstr "" #. 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:1335 +#: git-send-email.perl:1350 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:1338 +#: git-send-email.perl:1353 msgid "Send this email reply required" msgstr "Svar krävs på frågan \"Sända brevet?\"" -#: git-send-email.perl:1364 +#: git-send-email.perl:1379 msgid "The required SMTP server is not properly defined." msgstr "Nödvändig SMTP-server har inte angivits korrekt." -#: git-send-email.perl:1411 +#: git-send-email.perl:1426 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Servern stöder inte SMARTTLS! %s" -#: git-send-email.perl:1416 git-send-email.perl:1420 +#: git-send-email.perl:1431 git-send-email.perl:1435 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS misslyckades! %s" -#: git-send-email.perl:1430 +#: git-send-email.perl:1445 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:1448 +#: git-send-email.perl:1463 #, perl-format msgid "Failed to send %s\n" msgstr "Misslyckades sända %s\n" -#: git-send-email.perl:1451 +#: git-send-email.perl:1466 #, perl-format msgid "Dry-Sent %s\n" msgstr "Test-Sände %s\n" -#: git-send-email.perl:1451 +#: git-send-email.perl:1466 #, perl-format msgid "Sent %s\n" msgstr "Sände %s\n" -#: git-send-email.perl:1453 +#: git-send-email.perl:1468 msgid "Dry-OK. Log says:\n" msgstr "Test-OK. Loggen säger:\n" -#: git-send-email.perl:1453 +#: git-send-email.perl:1468 msgid "OK. Log says:\n" msgstr "OK. Loggen säger:\n" -#: git-send-email.perl:1465 +#: git-send-email.perl:1480 msgid "Result: " msgstr "Resultat: " -#: git-send-email.perl:1468 +#: git-send-email.perl:1483 msgid "Result: OK\n" msgstr "Resultat: OK\n" -#: git-send-email.perl:1481 +#: git-send-email.perl:1496 #, perl-format msgid "can't open file %s" msgstr "kan inte öppna filen %s" -#: git-send-email.perl:1528 git-send-email.perl:1548 +#: git-send-email.perl:1543 git-send-email.perl:1563 #, 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:1534 +#: git-send-email.perl:1549 #, 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:1582 +#: git-send-email.perl:1597 #, 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:1605 +#: git-send-email.perl:1622 #, 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:1711 +#: git-send-email.perl:1728 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Kunde inte köra \"%s\"" -#: git-send-email.perl:1718 +#: git-send-email.perl:1735 #, 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:1722 +#: git-send-email.perl:1739 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) misslyckades stänga röret till \"%s\"" -#: git-send-email.perl:1749 +#: git-send-email.perl:1766 msgid "cannot send message as 7bit" msgstr "kan inte sända brev som sjubitars" -#: git-send-email.perl:1757 +#: git-send-email.perl:1774 msgid "invalid transfer encoding" msgstr "ogiltig överföringskondning" -#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856 +#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873 #, perl-format msgid "unable to open %s: %s\n" msgstr "kunde inte öppna %s: %s\n" -#: git-send-email.perl:1798 +#: git-send-email.perl:1815 #, 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:1814 +#: git-send-email.perl:1831 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" @@ -16219,59 +16420,63 @@ msgstr "" "säkerhetskopior.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1818 +#: git-send-email.perl:1835 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "%" +#~ msgid_plural "%" +#~ msgstr[0] "%" +#~ msgstr[1] "%" + +#~ msgid "%s, %" +#~ msgid_plural "%s, %" +#~ msgstr[0] "%s. %" +#~ msgstr[1] "%s. %" + +#~ msgid "submodule update strategy not supported for submodule '%s'" +#~ msgstr "" +#~ "uppdateringsstrategi för undermodul stöds inte för undermodulen \"%s\"" + +#~ msgid "change upstream info" +#~ msgstr "ändra uppströmsinformation" + +#~ msgid "" +#~ "\n" +#~ "If you wanted to make '%s' track '%s', do this:\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n" +#~ "\n" + +#~ msgid "basename" +#~ msgstr "basnamn" + +#~ msgid "prepend parent project's basename to output" +#~ msgstr "lägg till föräldraprojektets basnamn i utdata" + +#~ msgid "" +#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" +#~ " - $line" +#~ msgstr "" +#~ "Varning: SHA-1 saknas eller inte en incheckning på följande rad:\n" +#~ " - $line" + +#~ msgid "" +#~ "Warning: the command isn't recognized in the following line:\n" +#~ " - $line" +#~ msgstr "" +#~ "Varning: kommandot kändes inte igen på följande rad:\n" +#~ " - $line" + +#~ msgid "Or you can abort the rebase with 'git rebase --abort'." +#~ msgstr "Eller så kan du avbryta ombaseringen med \"git rebase --abort\"." + #~ msgid "Could not open file '%s'" #~ msgstr "Kunde inte öppna filen \"%s\"" -#~ msgid "%lu second ago" -#~ msgid_plural "%lu seconds ago" -#~ msgstr[0] "%lu sekund sedan" -#~ msgstr[1] "%lu sekunder sedan" - -#~ msgid "%lu minute ago" -#~ msgid_plural "%lu minutes ago" -#~ msgstr[0] "%lu minut sedan" -#~ msgstr[1] "%lu minuter sedan" - -#~ msgid "%lu hour ago" -#~ msgid_plural "%lu hours ago" -#~ msgstr[0] "%lu timme sedan" -#~ msgstr[1] "%lu timmar sedan" - -#~ msgid "%lu day ago" -#~ msgid_plural "%lu days ago" -#~ msgstr[0] "%lu dag sedan" -#~ msgstr[1] "%lu dagar sedan" - -#~ msgid "%lu week ago" -#~ msgid_plural "%lu weeks ago" -#~ msgstr[0] "%lu vecka sedan" -#~ msgstr[1] "%lu veckor sedan" - -#~ msgid "%lu month ago" -#~ msgid_plural "%lu months ago" -#~ msgstr[0] "%lu månad sedan" -#~ msgstr[1] "%lu månader sedan" - -#~ msgid "%lu year" -#~ msgid_plural "%lu years" -#~ msgstr[0] "%lu år" -#~ msgstr[1] "%lu år" - -#~ msgid "%s, %lu month ago" -#~ msgid_plural "%s, %lu months ago" -#~ msgstr[0] "%s, %lu månad sedan" -#~ msgstr[1] "%s, %lu månader sedan" - -#~ msgid "%lu year ago" -#~ msgid_plural "%lu years ago" -#~ msgstr[0] "%lu år sedan" -#~ msgstr[1] "%lu år sedan" - #~ msgid "in %0.1f seconds automatically..." #~ msgstr "automatiskt om %0.1f sekunder..." @@ -16727,9 +16932,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "Forward-port local commits to the updated upstream head" #~ msgstr "Framåtanpassa lokala kommandon på uppdaterat uppströmshuvud" -#~ msgid "unable to parse format" -#~ msgstr "kan inte tolka formatet" - #~ msgid "improper format entered align:%s" #~ msgstr "felaktigt format angivet align:%s" @@ -16948,9 +17150,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "no files added" #~ msgstr "inga filer har lagts till" -#~ msgid "force creation (when already exists)" -#~ msgstr "tvinga skapande (när den redan finns)" - #~ msgid "slot" #~ msgstr "plats" |