diff options
Diffstat (limited to 'po/sv.po')
| -rw-r--r-- | po/sv.po | 4082 |
1 files changed, 2153 insertions, 1929 deletions
@@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010-2017 Peter krefting <peter@softwolves.pp.se> +# Copyright (C) 2010-2018 Peter Krefting <peter@softwolves.pp.se> # This file is distributed under the same license as the Git package. -# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017. +# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018. # msgid "" msgstr "" -"Project-Id-Version: git 2.15.0\n" +"Project-Id-Version: git 2.16.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-10-17 09:44+0800\n" -"PO-Revision-Date: 2017-10-18 19:34+0100\n" +"POT-Creation-Date: 2018-01-07 07:50+0800\n" +"PO-Revision-Date: 2018-01-09 20:07+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -18,47 +18,47 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 2.91.7\n" -#: advice.c:58 +#: advice.c:62 #, c-format msgid "hint: %.*s\n" msgstr "tips: %.*s\n" -#: advice.c:86 +#: advice.c:90 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits " "samman." -#: advice.c:88 +#: advice.c:92 msgid "Committing is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en incheckning eftersom du har filer som inte slagits " "samman." -#: advice.c:90 +#: advice.c:94 msgid "Merging is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits " "samman." -#: advice.c:92 +#: advice.c:96 msgid "Pulling is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman." -#: advice.c:94 +#: advice.c:98 msgid "Reverting is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits " "samman." -#: advice.c:96 +#: advice.c:100 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" "Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman." -#: advice.c:104 +#: advice.c:108 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -66,23 +66,23 @@ msgstr "" "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n" "som lämpligt för att ange lösning och checka in." -#: advice.c:112 +#: advice.c:116 msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:117 builtin/merge.c:1211 +#: advice.c:121 builtin/merge.c:1213 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: advice.c:119 +#: advice.c:123 msgid "Please, commit your changes before merging." msgstr "Checka in dina ändringar innan du utför sammanslagningen." -#: advice.c:120 +#: advice.c:124 msgid "Exiting because of unfinished merge." msgstr "Avslutar på grund av ofullbordad sammanslagning." -#: advice.c:126 +#: advice.c:130 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -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:125 +#: apply.c:122 msgid "--reject and --3way cannot be used together." msgstr "--reject och --3way kan inte användas samtidigt." -#: apply.c:127 +#: apply.c:124 msgid "--cached and --3way cannot be used together." msgstr "--cached och --3way kan inte användas samtidigt." -#: apply.c:130 +#: apply.c:127 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: apply.c:141 +#: apply.c:138 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: apply.c:144 +#: apply.c:141 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: apply.c:845 +#: apply.c:821 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: apply.c:854 +#: apply.c:830 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: apply.c:928 +#: apply.c:904 #, c-format msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen på rad %d" -#: apply.c:966 +#: apply.c:942 #, 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:972 +#: apply.c:948 #, 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:973 +#: apply.c:949 #, 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:978 +#: apply.c:954 #, 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:1007 +#: apply.c:983 #, c-format msgid "invalid mode on line %d: %s" msgstr "ogiltigt läge på rad %d: %s" -#: apply.c:1325 +#: apply.c:1301 #, c-format msgid "inconsistent header lines %d and %d" msgstr "huvudet är inkonsekvent mellan rad %d och %d" -#: apply.c:1497 +#: apply.c:1473 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: apply.c:1566 +#: apply.c:1542 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: apply.c:1586 +#: apply.c:1562 #, 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:1599 +#: apply.c:1575 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)" -#: apply.c:1787 +#: apply.c:1763 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: apply.c:1789 +#: apply.c:1765 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: apply.c:1823 +#: apply.c:1799 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: apply.c:1860 +#: apply.c:1836 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: apply.c:1862 +#: apply.c:1838 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: apply.c:1865 +#: apply.c:1841 #, 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:2012 +#: apply.c:1988 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: apply.c:2049 +#: apply.c:2025 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: apply.c:2209 +#: apply.c:2185 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: apply.c:2295 +#: apply.c:2271 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: apply.c:2299 +#: apply.c:2275 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: apply.c:2958 +#: apply.c:2934 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: apply.c:3077 +#: apply.c:3055 #, 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:3089 +#: apply.c:3067 #, 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:3095 +#: apply.c:3073 #, c-format msgid "" "while searching for:\n" @@ -296,25 +296,25 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: apply.c:3117 +#: apply.c:3095 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: apply.c:3125 +#: apply.c:3103 #, 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:3171 +#: apply.c:3149 #, 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:3181 +#: apply.c:3159 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -322,420 +322,421 @@ msgstr "" "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande " "innehållet." -#: apply.c:3189 +#: apply.c:3167 #, 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:3207 +#: apply.c:3185 #, 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:3220 +#: apply.c:3198 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: apply.c:3226 +#: apply.c:3204 #, 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:3247 +#: apply.c:3225 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: apply.c:3369 +#: apply.c:3347 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" -#: apply.c:3426 +#: apply.c:3404 #, 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:3455 apply.c:3695 +#: apply.c:3433 apply.c:3673 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: apply.c:3538 apply.c:3709 +#: apply.c:3516 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: apply.c:3547 apply.c:3717 +#: apply.c:3525 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: apply.c:3582 +#: apply.c:3560 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: apply.c:3585 +#: apply.c:3563 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Faller tillbaka på trevägssammanslagning...\n" -#: apply.c:3601 apply.c:3605 +#: apply.c:3579 apply.c:3583 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kunde inte läsa aktuellt innehåll i \"%s\"" -#: apply.c:3617 +#: apply.c:3595 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n" -#: apply.c:3631 +#: apply.c:3609 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Applicerade patchen på \"%s\" med konflikter.\n" -#: apply.c:3636 +#: apply.c:3614 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Tillämpade patchen på \"%s\" rent.\n" -#: apply.c:3662 +#: apply.c:3640 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: apply.c:3734 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: apply.c:3736 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: apply.c:3886 apply.c:3888 +#: apply.c:3864 apply.c:3866 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg ”%s”" -#: apply.c:3944 +#: apply.c:3922 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: apply.c:3947 +#: apply.c:3925 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: apply.c:3967 +#: apply.c:3945 #, 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:3972 +#: apply.c:3950 #, 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:3992 +#: apply.c:3970 #, 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:3996 +#: apply.c:3974 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: apply.c:4011 +#: apply.c:3989 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: apply.c:4102 +#: apply.c:4080 #, 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:4109 +#: apply.c:4087 #, 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:4112 +#: apply.c:4090 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller är oanvändbar (%s)." -#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148 +#: apply.c:4095 builtin/checkout.c:236 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:4121 +#: apply.c:4099 #, c-format msgid "could not add %s to temporary index" msgstr "kunde inte lägga till %s till temporärt index" -#: apply.c:4131 +#: apply.c:4109 #, c-format msgid "could not write temporary index to %s" msgstr "kunde inte skriva temporärt index till %s" -#: apply.c:4269 +#: apply.c:4247 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: apply.c:4304 +#: apply.c:4282 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: apply.c:4310 +#: apply.c:4288 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: apply.c:4318 +#: apply.c:4296 #, 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:4324 apply.c:4468 +#: apply.c:4302 apply.c:4446 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: apply.c:4365 +#: apply.c:4343 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" -#: apply.c:4369 +#: apply.c:4347 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: apply.c:4439 +#: apply.c:4417 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: apply.c:4537 +#: apply.c:4515 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: apply.c:4545 +#: apply.c:4523 msgid "internal error" msgstr "internt fel" -#: apply.c:4548 +#: apply.c:4526 #, 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:4559 +#: apply.c:4537 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010 +#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" -#: apply.c:4581 +#: apply.c:4559 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: apply.c:4585 +#: apply.c:4563 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4695 +#: apply.c:4673 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4703 +#: apply.c:4681 msgid "unrecognized input" msgstr "indata känns inte igen" -#: apply.c:4722 +#: apply.c:4700 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4859 +#: apply.c:4837 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4886 +#: apply.c:4864 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "undertryckte %d fel i blanksteg" msgstr[1] "undertryckte %d fel i blanksteg" -#: apply.c:4892 apply.c:4907 +#: apply.c:4870 apply.c:4885 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d rad lägger till fel i blanksteg." msgstr[1] "%d rader lägger till fel i blanksteg." -#: apply.c:4900 +#: apply.c:4878 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg." msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg." -#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390 +#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: 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 +#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223 +#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193 +#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860 +#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230 +#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450 #: git-add--interactive.perl:197 msgid "path" msgstr "sökväg" -#: apply.c:4948 +#: apply.c:4922 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:4951 +#: apply.c:4925 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:4953 builtin/am.c:2265 +#: apply.c:4927 builtin/am.c:2229 msgid "num" msgstr "antal" -#: apply.c:4954 +#: apply.c:4928 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:4957 +#: apply.c:4931 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:4959 +#: apply.c:4933 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:4963 +#: apply.c:4937 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:4965 +#: apply.c:4939 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:4967 +#: apply.c:4941 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:4969 +#: apply.c:4943 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:4971 +#: apply.c:4945 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:4973 +#: apply.c:4947 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:4975 +#: apply.c:4949 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:4977 +#: apply.c:4951 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:4979 +#: apply.c:4953 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513 +#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: apply.c:4984 +#: apply.c:4958 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95 +#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 +#: builtin/pack-objects.c:3009 msgid "action" msgstr "åtgärd" -#: apply.c:4986 +#: apply.c:4960 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:4989 apply.c:4992 +#: apply.c:4963 apply.c:4966 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:4995 +#: apply.c:4969 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:4997 +#: apply.c:4971 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:4999 +#: apply.c:4973 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:5001 +#: apply.c:4975 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: 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 +#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21 +#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640 +#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "var pratsam" -#: apply.c:5004 +#: apply.c:4978 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:5007 +#: apply.c:4981 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:5009 builtin/am.c:2253 +#: apply.c:4983 builtin/am.c:2217 msgid "root" msgstr "rot" -#: apply.c:5010 +#: apply.c:4984 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" @@ -758,7 +759,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299 +#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" @@ -771,7 +772,7 @@ msgstr "fmt" msgid "archive format" msgstr "arkivformat" -#: archive.c:437 builtin/log.c:1452 +#: archive.c:437 builtin/log.c:1459 msgid "prefix" msgstr "prefix" @@ -779,9 +780,9 @@ msgstr "prefix" msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c: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 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861 +#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" @@ -816,7 +817,7 @@ msgid "list supported archive formats" msgstr "visa understödda arkivformat" #: 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 +#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239 msgid "repo" msgstr "arkiv" @@ -867,22 +868,22 @@ msgstr "" "Negativa mönster ignoreras i git-attribut\n" "Använd '\\!' för att inleda med ett utropstecken." -#: bisect.c:447 +#: bisect.c:458 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Felaktigt citerat innehåll i filen \"%s\": %s" -#: bisect.c:655 +#: bisect.c:666 #, c-format msgid "We cannot bisect more!\n" msgstr "Det finns inte mer att göra \"bisect\" på!\n" -#: bisect.c:708 +#: bisect.c:720 #, c-format msgid "Not a valid commit name %s" msgstr "Namnet på incheckningen är inte giltigt: %s" -#: bisect.c:732 +#: bisect.c:744 #, c-format msgid "" "The merge base %s is bad.\n" @@ -891,7 +892,7 @@ msgstr "" "Sammanslagningsbasen %s är trasig.\n" "Det betyder att felet har rättats mellan %s och [%s].\n" -#: bisect.c:737 +#: bisect.c:749 #, c-format msgid "" "The merge base %s is new.\n" @@ -900,7 +901,7 @@ msgstr "" "Sammanslagningsbasen %s är ny.\n" "Egenskapen har ändrats mellan %s och [%s].\n" -#: bisect.c:742 +#: bisect.c:754 #, c-format msgid "" "The merge base %s is %s.\n" @@ -909,7 +910,7 @@ msgstr "" "Sammanslagningsbasen %s är %s.\n" "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n" -#: bisect.c:750 +#: bisect.c:762 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -920,7 +921,7 @@ msgstr "" "git bisect kan inte fungera korrekt i detta fall.\n" "Kanske du skrev fel %s- och %s-revisioner?\n" -#: bisect.c:763 +#: bisect.c:775 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -932,36 +933,36 @@ msgstr "" "%s.\n" "Vi fortsätter ändå." -#: bisect.c:798 +#: bisect.c:810 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisect: en sammanslagningsbas måste testas\n" -#: bisect.c:850 +#: bisect.c:862 #, c-format msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234 +#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: bisect.c:918 +#: bisect.c:930 #, c-format msgid "could not read file '%s'" msgstr "kunde inte läsa filen \"%s\"" -#: bisect.c:948 +#: bisect.c:960 msgid "reading bisect refs failed" msgstr "misslyckades läsa bisect-referenser" -#: bisect.c:968 +#: bisect.c:979 #, c-format msgid "%s was both %s and %s\n" msgstr "%s var både %s och %s\n" -#: bisect.c:976 +#: bisect.c:987 #, c-format msgid "" "No testable commit found.\n" @@ -970,7 +971,7 @@ msgstr "" "Ingen testbar incheckning hittades.\n" "Kanske du startade med felaktiga sökvägsparametrar?\n" -#: bisect.c:995 +#: bisect.c:1006 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -980,7 +981,7 @@ msgstr[1] "(ungefär %d steg)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1001 +#: bisect.c:1012 #, 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" @@ -1001,9 +1002,9 @@ msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: blame.c:1797 bundle.c:169 ref-filter.c:1947 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 +#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177 +#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918 +#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369 #: builtin/shortlog.c:191 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -1099,31 +1100,31 @@ msgstr "Kan inte skriva inställningar för uppströmsgren" msgid "Not tracking: ambiguous information for ref %s" msgstr "Spårar inte: tvetydig information för referensen %s" -#: branch.c:185 +#: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." msgstr "\"%s\" är inte ett giltigt grennamn." -#: branch.c:190 +#: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "Det finns redan en gren som heter ”%s”." -#: branch.c:197 +#: branch.c:213 msgid "Cannot force update the current branch." msgstr "Kan inte tvinga uppdatering av aktuell gren." -#: branch.c:217 +#: branch.c:233 #, 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:219 +#: branch.c:235 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte" -#: branch.c:221 +#: branch.c:237 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1143,27 +1144,27 @@ 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:264 +#: branch.c:280 #, c-format msgid "Not a valid object name: '%s'." msgstr "Objektnamnet är inte giltigt: \"%s\"." -#: branch.c:284 +#: branch.c:300 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Objektnamnet är tvetydigt: \"%s\"." -#: branch.c:289 +#: branch.c:305 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Avgreningspunkten är inte giltig: ”%s”." -#: branch.c:343 +#: branch.c:359 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "\"%s\" är redan utcheckad på \"%s\"" -#: branch.c:366 +#: branch.c:382 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD i arbetskatalogen %s har inte uppdaterats" @@ -1178,9 +1179,8 @@ 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: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 +#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637 +#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -1224,7 +1224,7 @@ msgstr "rev-list dog" msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296 +#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -1247,8 +1247,8 @@ msgstr "index-pack dog" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465 -#: builtin/am.c:1467 builtin/am.c:2105 +#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1434 builtin/am.c:2069 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -1258,7 +1258,7 @@ msgstr "kunde inte tolka %s" msgid "%s %s is not a commit!" msgstr "%s %s är inte en incheckning!" -#: commit.c:1517 +#: commit.c:1524 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" @@ -1268,173 +1268,178 @@ msgstr "" "Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n" "i18n.commitencoding till den teckenkodning som används i ditt projekt.\n" -#: compat/obstack.c:406 compat/obstack.c:408 +#: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "minnet slut" -#: config.c:187 +#: config.c:186 msgid "relative config include conditionals must come from files" msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer" -#: config.c:721 +#: config.c:720 #, c-format msgid "bad config line %d in blob %s" msgstr "felaktig konfigurationsfil rad %d i blob:en %s" -#: config.c:725 +#: config.c:724 #, c-format msgid "bad config line %d in file %s" msgstr "felaktig konfigurationsfil rad %d i filen %s" -#: config.c:729 +#: config.c:728 #, c-format msgid "bad config line %d in standard input" msgstr "felaktig konfigurationsfil rad %d i standard in" -#: config.c:733 +#: config.c:732 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s" -#: config.c:737 +#: config.c:736 #, c-format msgid "bad config line %d in command line %s" msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s" -#: config.c:741 +#: config.c:740 #, c-format msgid "bad config line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:869 +#: config.c:868 msgid "out of range" msgstr "utanför intervallet" -#: config.c:869 +#: config.c:868 msgid "invalid unit" msgstr "ogiltig enhet" -#: config.c:875 +#: config.c:874 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:880 +#: config.c:879 #, 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:883 +#: config.c:882 #, 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:886 +#: config.c:885 #, 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:889 +#: config.c:888 #, 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:892 +#: config.c:891 #, 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:895 +#: config.c:894 #, 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:990 +#: config.c:989 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:1085 config.c:1096 +#: config.c:998 +#, c-format +msgid "'%s' for '%s' is not a valid timestamp" +msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" + +#: config.c:1094 config.c:1105 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:1213 +#: config.c:1222 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1372 +#: config.c:1378 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1568 +#: config.c:1574 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:1900 +#: config.c:1906 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2087 +#: config.c:2093 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:2130 +#: config.c:2136 #, 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:2156 +#: config.c:2162 #, 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:2167 +#: config.c:2187 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2169 +#: config.c:2189 #, 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:2228 +#: config.c:2248 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2571 config.c:2789 +#: config.c:2591 config.c:2808 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:2678 +#: config.c:2698 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:2680 builtin/remote.c:776 +#: config.c:2700 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" -#: connect.c:50 +#: connect.c:52 msgid "The remote end hung up upon initial contact" msgstr "Fjärren lade på vid inledande kontakt" -#: connect.c:52 +#: connect.c:54 msgid "" "Could not read from remote repository.\n" "\n" @@ -1565,7 +1570,7 @@ msgstr[1] "%<PRIuMAX> år sedan" msgid "failed to read orderfile '%s'" msgstr "kunde inte läsa orderfilen \"%s\"" -#: diffcore-rename.c:536 +#: diffcore-rename.c:535 msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" @@ -1597,7 +1602,7 @@ msgstr "" msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:398 +#: diff.c:401 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1606,20 +1611,20 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:3861 +#: diff.c:3799 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:4189 +#: diff.c:4127 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" -#: diff.c:4279 +#: diff.c:4215 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:4445 +#: diff.c:4381 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1628,50 +1633,55 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:4459 +#: diff.c:4395 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:5505 +#: diff.c:5446 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:5508 +#: diff.c:5449 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:5511 +#: diff.c:5452 #, 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:1983 +#: dir.c:2100 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:2102 +#: dir.c:2219 msgid "Untracked cache is disabled on this system or location." msgstr "Ospårad cache är inaktiverad på systemet eller platsen." -#: dir.c:2885 dir.c:2890 +#: dir.c:3002 dir.c:3007 #, c-format msgid "could not create directories for %s" msgstr "kunde inte skapa kataloger för %s" -#: dir.c:2915 +#: dir.c:3032 #, 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:176 +#: editor.c:61 +#, c-format +msgid "hint: Waiting for your editor to close the file...%c" +msgstr "tips: Väntar på att textredigeringsprogrammet skall stänga filen...%c" + +#: entry.c:177 msgid "Filtering content" msgstr "Filtrerar innehåll" -#: entry.c:433 +#: entry.c:435 #, c-format msgid "could not stat file '%s'" msgstr "kunde inte ta status på filen \"%s\"" @@ -1742,7 +1752,7 @@ msgstr "ogiltig incheckning %s" msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:534 progress.c:242 +#: fetch-pack.c:534 progress.c:229 msgid "done" msgstr "klart" @@ -1756,104 +1766,104 @@ msgstr "fick %s (%d) %s" msgid "Marking %s as complete" msgstr "Markerar %s som komplett" -#: fetch-pack.c:776 +#: fetch-pack.c:777 #, c-format msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:814 +#: fetch-pack.c:815 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:822 +#: fetch-pack.c:823 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:878 +#: fetch-pack.c:879 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-patch: kunde inte grena av %s" -#: fetch-pack.c:894 +#: fetch-pack.c:895 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:896 +#: fetch-pack.c:897 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:923 +#: fetch-pack.c:924 msgid "Server does not support shallow clients" msgstr "Servern stöder inte klienter med grunda arkiv" -#: fetch-pack.c:927 +#: fetch-pack.c:928 msgid "Server supports multi_ack_detailed" msgstr "Servern stöder \"multi_ack_detailed\"" -#: fetch-pack.c:930 +#: fetch-pack.c:931 msgid "Server supports no-done" msgstr "Servern stöder \"no-done\"" -#: fetch-pack.c:936 +#: fetch-pack.c:937 msgid "Server supports multi_ack" msgstr "Servern stöder \"multi_ack\"" -#: fetch-pack.c:940 +#: fetch-pack.c:941 msgid "Server supports side-band-64k" msgstr "Servern stöder \"side-band-64k\"" -#: fetch-pack.c:944 +#: fetch-pack.c:945 msgid "Server supports side-band" msgstr "Servern stöder \"side-band\"" -#: fetch-pack.c:948 +#: fetch-pack.c:949 msgid "Server supports allow-tip-sha1-in-want" msgstr "Servern stöder \"allow-tip-sha1-in-want\"" -#: fetch-pack.c:952 +#: fetch-pack.c:953 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Servern stöder \"allow-reachable-sha1-in-want\"" -#: fetch-pack.c:962 +#: fetch-pack.c:963 msgid "Server supports ofs-delta" msgstr "Servern stöder \"ofs-delta\"" -#: fetch-pack.c:969 +#: fetch-pack.c:970 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:975 +#: fetch-pack.c:976 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:979 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:981 +#: fetch-pack.c:982 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:992 +#: fetch-pack.c:993 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:1004 +#: fetch-pack.c:1005 msgid "git fetch-pack: fetch failed." msgstr "git fetch-patch: hämtning misslyckades." -#: fetch-pack.c:1166 +#: fetch-pack.c:1167 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1188 +#: fetch-pack.c:1189 #, c-format msgid "no such remote ref %s" msgstr "ingen sådan fjärreferens: %s" -#: fetch-pack.c:1191 +#: fetch-pack.c:1192 #, 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" @@ -1876,17 +1886,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:1970 +#: grep.c:2017 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:2034 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:1998 +#: grep.c:2045 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" @@ -1956,12 +1966,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "git version [<flaggor>]" -#: help.c:456 +#: help.c:462 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:460 +#: help.c:466 msgid "" "\n" "Did you mean this?" @@ -2034,6 +2044,15 @@ msgstr "namnet består enbart av ej tillåtna tecken: %s" msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" +#: list-objects-filter-options.c:30 +msgid "multiple object filter types cannot be combined" +msgstr "flera objektfiltertyper kan inte kombineras" + +#: list-objects-filter-options.c:41 list-objects-filter-options.c:68 +#, c-format +msgid "invalid filter-spec expression '%s'" +msgstr "ogiltig filterspec-utryck \"%s\"" + #: lockfile.c:151 #, c-format msgid "" @@ -2059,12 +2078,12 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "Kunde inte skapa \"%s.lock\": %s" -#: merge.c:41 +#: merge.c:74 msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380 -#: builtin/checkout.c:595 builtin/clone.c:754 +#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379 +#: builtin/checkout.c:600 builtin/clone.c:754 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" @@ -2258,7 +2277,7 @@ msgstr "Hoppade över %s (sammanslagen samma som befintlig)" msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1775 git-submodule.sh:944 +#: merge-recursive.c:1775 git-submodule.sh:932 msgid "submodule" msgstr "undermodul" @@ -2280,47 +2299,52 @@ msgstr "fil/katalog" msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:1908 +#: merge-recursive.c:1909 #, 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:1917 +#: merge-recursive.c:1918 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:1954 +#: merge-recursive.c:1958 +#, c-format +msgid "Dirty index: cannot merge (dirty: %s)" +msgstr "Smutsigt index: kan inte slå ihop (smutsiga: %s)" + +#: merge-recursive.c:1962 msgid "Already up to date!" msgstr "Redan à jour!" -#: merge-recursive.c:1963 +#: merge-recursive.c:1971 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:2060 +#: merge-recursive.c:2068 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:2073 +#: merge-recursive.c:2081 #, 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:2112 +#: merge-recursive.c:2120 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:2175 +#: merge-recursive.c:2183 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814 +#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -2488,15 +2512,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:571 -msgid "" -"empty strings as pathspecs will be made invalid in upcoming releases. please " -"use . instead if you meant to match all paths" -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:595 +#: pathspec.c:592 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" @@ -2505,7 +2521,7 @@ msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" -#: read-cache.c:1443 +#: read-cache.c:1472 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2514,7 +2530,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1453 +#: read-cache.c:1482 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2523,52 +2539,52 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:2316 builtin/merge.c:1046 +#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077 +#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" -#: read-cache.c:2407 +#: read-cache.c:2455 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte öppna git-katalog: %s" -#: read-cache.c:2419 +#: read-cache.c:2467 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort länken: %s" -#: refs.c:638 +#: refs.c:706 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: refs.c:1792 +#: refs.c:1850 msgid "ref updates forbidden inside quarantine environment" msgstr "referensuppdateringar förbjudna i karantänmiljö" -#: refs/files-backend.c:1136 +#: refs/files-backend.c:1189 #, 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 +#: refs/files-backend.c:1203 refs/packed-backend.c:1524 +#: refs/packed-backend.c:1534 #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" -#: refs/files-backend.c:1153 refs/packed-backend.c:1443 +#: refs/files-backend.c:1206 refs/packed-backend.c:1537 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" -#: ref-filter.c:35 wt-status.c:1811 +#: ref-filter.c:35 wt-status.c:1816 msgid "gone" msgstr "försvunnen" @@ -2587,157 +2603,157 @@ msgstr "bakom %d" msgid "ahead %d, behind %d" msgstr "före %d, bakom %d" -#: ref-filter.c:105 +#: ref-filter.c:107 #, c-format msgid "expected format: %%(color:<color>)" msgstr "förväntat format: %%(color:<color>)" -#: ref-filter.c:107 +#: ref-filter.c:109 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "okänd färg: %%(color:%s)" -#: ref-filter.c:127 +#: ref-filter.c:129 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Heltalsvärde förväntades refname:lstrip=%s" -#: ref-filter.c:131 +#: ref-filter.c:133 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Heltalsvärde förväntades refname:rstrip=%s" -#: ref-filter.c:133 +#: ref-filter.c:135 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "okänt %%(%s)-argument: %s" -#: ref-filter.c:173 +#: ref-filter.c:184 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) tar inte argument" -#: ref-filter.c:180 +#: ref-filter.c:191 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) tar inte argument" -#: ref-filter.c:198 +#: ref-filter.c:209 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "okänt %%(trailers)-argument: %s" -#: ref-filter.c:221 +#: ref-filter.c:232 #, c-format msgid "positive value expected contents:lines=%s" msgstr "positivt värde förväntat contents:lines=%s" -#: ref-filter.c:223 +#: ref-filter.c:234 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "okänt %%(contents)-argument: %s" -#: ref-filter.c:236 +#: ref-filter.c:247 #, c-format msgid "positive value expected objectname:short=%s" msgstr "positivt värde förväntat objectname:short=%s" -#: ref-filter.c:240 +#: ref-filter.c:251 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "okänt %%(objectname)-argument: %s" -#: ref-filter.c:267 +#: ref-filter.c:278 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "förväntat format: %%(align:<bredd>,<position>)" -#: ref-filter.c:279 +#: ref-filter.c:290 #, c-format msgid "unrecognized position:%s" msgstr "okänd position:%s" -#: ref-filter.c:283 +#: ref-filter.c:294 #, c-format msgid "unrecognized width:%s" msgstr "okänd bredd:%s" -#: ref-filter.c:289 +#: ref-filter.c:300 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "okänt %%(align)-argument: %s" -#: ref-filter.c:293 +#: ref-filter.c:304 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "positiv bredd förväntad med atomen %%(align)" -#: ref-filter.c:308 +#: ref-filter.c:319 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "okänt %%(if)-argument: %s" -#: ref-filter.c:398 +#: ref-filter.c:409 #, c-format msgid "malformed field name: %.*s" msgstr "felformat fältnamn: %.*s" -#: ref-filter.c:424 +#: ref-filter.c:435 #, c-format msgid "unknown field name: %.*s" msgstr "okänt fältnamn: %.*s" -#: ref-filter.c:536 +#: ref-filter.c:547 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: atomen %%(if) använd utan en %%(then)-atom" -#: ref-filter.c:596 +#: ref-filter.c:607 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: atomen %%(then) använd utan en %%(if)-atom" -#: ref-filter.c:598 +#: ref-filter.c:609 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: atomen %%(then) använd mer än en gång" -#: ref-filter.c:600 +#: ref-filter.c:611 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atomen %%(then) använd efter %%(else)" -#: ref-filter.c:626 +#: ref-filter.c:637 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: atomen %%(else) använd utan en %%(if)-atom" -#: ref-filter.c:628 +#: ref-filter.c:639 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format: atomen %%(else) använd utan en %%(then)-atom" -#: ref-filter.c:630 +#: ref-filter.c:641 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format: atomen %%(else) använd mer än en gång" -#: ref-filter.c:643 +#: ref-filter.c:654 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: atomen %%(end) använd utan motsvarande atom" -#: ref-filter.c:698 +#: ref-filter.c:709 #, c-format msgid "malformed format string %s" msgstr "felformad formatsträng %s" -#: ref-filter.c:1283 +#: ref-filter.c:1313 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: ref-filter.c:1286 +#: ref-filter.c:1316 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" @@ -2745,7 +2761,7 @@ msgstr "(ingen gren, \"bisect\" startad på %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1294 +#: ref-filter.c:1324 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD frånkopplat vid %s)" @@ -2753,137 +2769,137 @@ msgstr "(HEAD frånkopplat vid %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1301 +#: ref-filter.c:1331 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD frånkopplat från %s)" -#: ref-filter.c:1305 +#: ref-filter.c:1335 msgid "(no branch)" msgstr "(ingen gren)" -#: ref-filter.c:1454 ref-filter.c:1485 +#: ref-filter.c:1488 ref-filter.c:1519 #, c-format msgid "missing object %s for %s" msgstr "objektet %s saknas för %s" -#: ref-filter.c:1457 ref-filter.c:1488 +#: ref-filter.c:1491 ref-filter.c:1522 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer misslyckades på %s för %s" -#: ref-filter.c:1788 +#: ref-filter.c:1822 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:1855 +#: ref-filter.c:1889 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:1860 +#: ref-filter.c:1894 #, c-format msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" -#: ref-filter.c:2122 +#: ref-filter.c:2156 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:2216 +#: ref-filter.c:2250 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: remote.c:750 +#: remote.c:780 #, 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:754 +#: remote.c:784 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spårar vanligtvis %s, inte %s" -#: remote.c:758 +#: remote.c:788 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#: remote.c:766 +#: remote.c:796 msgid "Internal error" msgstr "Internt fel" -#: remote.c:1681 remote.c:1783 +#: remote.c:1711 remote.c:1813 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: remote.c:1690 +#: remote.c:1720 #, c-format msgid "no such branch: '%s'" msgstr "okänd gren: \"%s\"" -#: remote.c:1693 +#: remote.c:1723 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppström angiven för grenen \"%s\"" -#: remote.c:1699 +#: remote.c:1729 #, 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:1714 +#: remote.c:1744 #, 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:1726 +#: remote.c:1756 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "grenen \"%s\" har ingen fjärr för \"push\"" -#: remote.c:1737 +#: remote.c:1767 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\"" -#: remote.c:1750 +#: remote.c:1780 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mål (push.default är \"ingenting\")" -#: remote.c:1772 +#: remote.c:1802 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mål" -#: remote.c:2076 +#: remote.c:2106 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n" -#: remote.c:2080 +#: remote.c:2110 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:2083 +#: remote.c:2113 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:2087 +#: remote.c:2117 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n" msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n" -#: remote.c:2093 +#: remote.c:2123 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n" -#: remote.c:2096 +#: remote.c:2126 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2893,11 +2909,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2104 +#: remote.c:2134 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n" -#: remote.c:2107 +#: remote.c:2137 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2912,46 +2928,55 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2117 +#: remote.c:2147 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:2256 +#: revision.c:2268 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2259 +#: revision.c:2271 #, 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:2453 +#: revision.c:2465 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" -#: run-command.c:644 +#: run-command.c:645 msgid "open /dev/null failed" msgstr "misslyckades öppna /dev/null" -#: send-pack.c:151 +#: run-command.c:1188 +#, c-format +msgid "" +"The '%s' hook was ignored because it's not set as executable.\n" +"You can disable this warning with `git config advice.ignoredHook false`." +msgstr "" +"Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n" +"Du kan inaktivera varningen med \"git config advice.ignoredHook false\"." + +#: send-pack.c:141 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "kunde inte tolka fjärruppackningsstatus: %s" -#: send-pack.c:153 +#: send-pack.c:143 #, c-format msgid "remote unpack failed: %s" msgstr "fjärruppackning misslyckades: %s" -#: send-pack.c:316 +#: send-pack.c:306 msgid "failed to sign the push certificate" msgstr "misslyckades underteckna push-certifikatet" -#: send-pack.c:429 +#: send-pack.c:419 msgid "the receiving end does not support --signed push" msgstr "mottagarsidan stöder inte push med --signed" -#: send-pack.c:431 +#: send-pack.c:421 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -2959,11 +2984,11 @@ msgstr "" "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --" "signed" -#: send-pack.c:443 +#: send-pack.c:433 msgid "the receiving end does not support --atomic push" msgstr "mottagarsidan stöder inte push med --atomic" -#: send-pack.c:448 +#: send-pack.c:438 msgid "the receiving end does not support push options" msgstr "mottagarsidan stöder inte push-flaggor" @@ -3002,13 +3027,13 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:297 sequencer.c:1704 +#: sequencer.c:297 sequencer.c:1718 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723 -#: sequencer.c:2733 sequencer.c:2749 +#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737 +#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" @@ -3018,13 +3043,13 @@ msgstr "kunde inte skriva till \"%s\"" msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711 +#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725 #, c-format msgid "failed to finalize '%s'." msgstr "misslyckades färdigställa \"%s\"." -#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259 -#: builtin/commit.c:754 builtin/merge.c:1044 +#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259 +#: builtin/commit.c:754 builtin/merge.c:1046 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" @@ -3046,20 +3071,20 @@ msgstr "%s: snabbspola" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:474 +#: sequencer.c:477 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:493 -msgid "could not resolve HEAD commit\n" -msgstr "kunde inte bestämma HEAD:s incheckning\n" +#: sequencer.c:496 +msgid "could not resolve HEAD commit" +msgstr "kunde inte bestämma HEAD:s incheckning" -#: sequencer.c:513 -msgid "unable to update cache tree\n" -msgstr "kan inte uppdatera cacheträd\n" +#: sequencer.c:516 +msgid "unable to update cache tree" +msgstr "kan inte uppdatera cacheträd" -#: sequencer.c:597 +#: sequencer.c:600 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3088,17 +3113,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:699 +#: sequencer.c:702 #, c-format -msgid "could not parse commit %s\n" -msgstr "kunde inte tolka incheckningen %s\n" +msgid "could not parse commit %s" +msgstr "kunde inte tolka incheckningen %s" -#: sequencer.c:704 +#: sequencer.c:707 #, c-format -msgid "could not parse parent commit %s\n" -msgstr "kunde inte tolka föräldraincheckningen %s\n" +msgid "could not parse parent commit %s" +msgstr "kunde inte tolka föräldraincheckningen %s" -#: sequencer.c:826 +#: sequencer.c:836 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -3109,7 +3134,7 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:832 +#: sequencer.c:842 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -3120,232 +3145,242 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:838 sequencer.c:863 +#: sequencer.c:848 sequencer.c:873 #, c-format msgid "This is a combination of %d commits." msgstr "Det här är en kombination av %d incheckningar." -#: sequencer.c:847 sequencer.c:2681 +#: sequencer.c:857 sequencer.c:2748 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:849 +#: sequencer.c:859 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:851 +#: sequencer.c:861 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:857 +#: sequencer.c:867 #, c-format msgid "cannot write '%s'" msgstr "kan inte skriva \"%s\"" -#: sequencer.c:866 git-rebase--interactive.sh:446 +#: sequencer.c:876 git-rebase--interactive.sh:446 msgid "This is the 1st commit message:" msgstr "Det här är 1:a incheckningsmeddelandet:" -#: sequencer.c:874 +#: sequencer.c:884 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:881 +#: sequencer.c:891 #, c-format msgid "This is the commit message #%d:" msgstr "Det här är incheckningsmeddelande %d:" -#: sequencer.c:886 +#: sequencer.c:896 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Incheckningsmeddelande %d kommer hoppas över:" -#: sequencer.c:891 +#: sequencer.c:901 #, c-format msgid "unknown command: %d" msgstr "okänt kommando: %d" -#: sequencer.c:957 +#: sequencer.c:967 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:975 +#: sequencer.c:986 #, 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:983 +#: sequencer.c:994 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:987 +#: sequencer.c:998 #, 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:993 +#: sequencer.c:1004 #, 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:1014 +#: sequencer.c:1023 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:1077 sequencer.c:1853 +#: sequencer.c:1086 sequencer.c:1867 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:1128 +#: sequencer.c:1137 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:1129 +#: sequencer.c:1138 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:1171 +#: sequencer.c:1180 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:1181 +#: sequencer.c:1190 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:1188 +#: sequencer.c:1196 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:1308 +#: sequencer.c:1270 +#, c-format +msgid "%s does not accept arguments: '%s'" +msgstr "%s tar inte argument: \"%s\"" + +#: sequencer.c:1279 +#, c-format +msgid "missing arguments for %s" +msgstr "argument saknas för %s" + +#: sequencer.c:1322 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:1316 +#: sequencer.c:1330 #, c-format msgid "cannot '%s' without a previous commit" msgstr "kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614 -#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951 +#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642 +#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859 #, c-format msgid "could not read '%s'." msgstr "kunde inte läsa \"%s\"." -#: sequencer.c:1361 +#: sequencer.c:1375 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:1363 +#: sequencer.c:1377 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: ”%s”" -#: sequencer.c:1368 +#: sequencer.c:1382 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:1379 +#: sequencer.c:1393 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:1381 +#: sequencer.c:1395 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:1448 +#: sequencer.c:1462 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" -#: sequencer.c:1451 +#: sequencer.c:1465 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:1517 +#: sequencer.c:1531 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: ”%s”" -#: sequencer.c:1555 +#: sequencer.c:1569 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:1556 +#: sequencer.c:1570 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1559 +#: sequencer.c:1573 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:1574 +#: sequencer.c:1588 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:1632 sequencer.c:2211 +#: sequencer.c:1646 sequencer.c:2230 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:1634 +#: sequencer.c:1648 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:1636 sequencer.c:1671 +#: sequencer.c:1650 sequencer.c:1685 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:1657 builtin/grep.c:711 +#: sequencer.c:1671 builtin/grep.c:713 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:1659 +#: sequencer.c:1673 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:1660 +#: sequencer.c:1674 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:1666 +#: sequencer.c:1680 #, 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:1677 +#: sequencer.c:1691 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:1818 sequencer.c:2109 +#: sequencer.c:1832 sequencer.c:2128 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:1858 builtin/difftool.c:640 +#: sequencer.c:1872 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:1874 +#: sequencer.c:1891 msgid "could not read index" msgstr "kunde inte läsa indexet" -#: sequencer.c:1879 +#: sequencer.c:1896 #, c-format msgid "" "execution failed: %s\n" @@ -3360,11 +3395,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:1885 +#: sequencer.c:1902 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:1891 +#: sequencer.c:1908 #, c-format msgid "" "execution succeeded: %s\n" @@ -3381,17 +3416,17 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:1948 +#: sequencer.c:1967 #, c-format msgid "Applied autostash.\n" msgstr "Tillämpade autostash.\n" -#: sequencer.c:1960 +#: sequencer.c:1979 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:1963 git-rebase.sh:175 +#: sequencer.c:1982 git-rebase.sh:175 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3402,57 +3437,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:2045 +#: sequencer.c:2064 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:2087 +#: sequencer.c:2106 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:2117 +#: sequencer.c:2136 msgid "could not read orig-head" msgstr "kunde inte läsa orig-head" -#: sequencer.c:2122 sequencer.c:2678 +#: sequencer.c:2141 sequencer.c:2745 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:2129 +#: sequencer.c:2148 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:2136 +#: sequencer.c:2155 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:2220 +#: sequencer.c:2239 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:2225 +#: sequencer.c:2244 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:2234 +#: sequencer.c:2253 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:2236 +#: sequencer.c:2255 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:2238 +#: sequencer.c:2257 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:2241 +#: sequencer.c:2260 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3462,50 +3497,45 @@ 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:2251 +#: sequencer.c:2270 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:2331 +#: sequencer.c:2350 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen ”%s”" -#: sequencer.c:2335 +#: sequencer.c:2354 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:2368 +#: sequencer.c:2387 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" -#: sequencer.c:2471 +#: sequencer.c:2492 msgid "make_script: unhandled options" msgstr "make_script: flaggor som inte stöds" -#: sequencer.c:2474 +#: sequencer.c:2495 msgid "make_script: error preparing revisions" msgstr "make_script: fel när revisioner skulle förberedas" -#: sequencer.c:2510 +#: sequencer.c:2529 sequencer.c:2564 #, 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 +#: sequencer.c:2615 #, 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 +#: sequencer.c:2695 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -3514,7 +3544,7 @@ msgstr "" "Varning: vissa incheckningar kan av misstag ha tappats.\n" "Tappade incheckningar (nyaste först):\n" -#: sequencer.c:2648 +#: sequencer.c:2702 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3534,7 +3564,7 @@ msgstr "" "\" (fel).\n" "\n" -#: sequencer.c:2660 +#: sequencer.c:2714 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -3545,31 +3575,21 @@ msgstr "" "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 +#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" -#: sequencer.c:2756 +#: sequencer.c:2775 #, c-format -msgid "could not truncate '%s'" -msgstr "kunde inte trunkera \"%s\"" +msgid "could not parse commit '%s'" +msgstr "kunde inte tolka incheckningen\" %s\"" -#: sequencer.c:2848 +#: sequencer.c:2897 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 "" @@ -3603,34 +3623,34 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:499 +#: setup.c:501 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Förväntade git-arkivversion <= %d, hittade %d" -#: setup.c:507 +#: setup.c:509 msgid "unknown repository extensions found:" msgstr "okända arkivutökningar hittades:" -#: setup.c:806 +#: setup.c:811 #, 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:808 builtin/index-pack.c:1653 +#: setup.c:813 builtin/index-pack.c:1653 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: setup.c:1046 +#: setup.c:1052 msgid "Unable to read current working directory" msgstr "Kan inte läsa aktuell arbetskatalog" -#: setup.c:1058 setup.c:1064 +#: setup.c:1064 setup.c:1070 #, c-format msgid "Cannot change to '%s'" msgstr "Kan inte byta till \"%s\"" -#: setup.c:1077 +#: setup.c:1083 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -3640,7 +3660,7 @@ msgstr "" "monteringspunkten %s)\n" "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." -#: setup.c:1159 +#: setup.c:1167 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3649,41 +3669,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:528 +#: sha1_file.c:598 #, c-format msgid "path '%s' does not exist" msgstr "sökvägen \"%s\" finns inte" -#: sha1_file.c:554 +#: sha1_file.c:624 #, 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:560 +#: sha1_file.c:630 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: sha1_file.c:566 +#: sha1_file.c:636 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: sha1_file.c:574 +#: sha1_file.c:644 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: sha1_name.c:420 +#: sha1_name.c:422 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "kort SHA1 %s är tvetydig" -#: sha1_name.c:431 +#: sha1_name.c:433 msgid "The candidates are:" msgstr "Kandidaterna är:" -#: sha1_name.c:590 +#: sha1_name.c:693 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" @@ -3705,71 +3725,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:93 submodule.c:127 +#: submodule.c:96 submodule.c:130 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:97 submodule.c:131 +#: submodule.c:100 submodule.c:134 #, 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:105 +#: submodule.c:108 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Kunde inte uppdatera .gitmodules-posten %s" -#: submodule.c:138 +#: submodule.c:141 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Kunde inte ta bort .gitmodules-posten för %s" -#: submodule.c:149 +#: submodule.c:152 msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:309 +#: submodule.c:312 #, c-format msgid "in unpopulated submodule '%s'" msgstr "i ej utcheckad undermodul \"%s\"" -#: submodule.c:340 +#: submodule.c:343 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" -#: submodule.c:799 +#: submodule.c:833 #, 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 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens." -#: submodule.c:1304 +#: submodule.c:1370 #, c-format msgid "'%s' not recognized as a git repository" msgstr "\"%s\" känns inte igen som ett git-arkiv" -#: submodule.c:1442 +#: submodule.c:1508 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "kunde inte starta \"git status\" i undermodulen \"%s\"" -#: submodule.c:1455 +#: submodule.c:1521 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "kunde inte köra \"git status\" i undermodulen \"%s\"" -#: submodule.c:1548 +#: submodule.c:1614 #, c-format msgid "submodule '%s' has dirty index" msgstr "undermodulen \"%s\" har ett smutsigt index" -#: submodule.c:1809 +#: submodule.c:1876 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3777,18 +3797,18 @@ msgstr "" "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " "stöds ej" -#: submodule.c:1821 submodule.c:1877 +#: submodule.c:1888 submodule.c:1944 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" -#: submodule.c:1825 builtin/submodule--helper.c:671 -#: builtin/submodule--helper.c:681 +#: submodule.c:1892 builtin/submodule--helper.c:909 +#: builtin/submodule--helper.c:919 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: submodule.c:1828 +#: submodule.c:1895 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3799,20 +3819,20 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:1912 +#: submodule.c:1979 #, c-format msgid "could not recurse into submodule '%s'" msgstr "kunde inte rekursera in i undermodulen \"%s\"" -#: submodule.c:1956 +#: submodule.c:2023 msgid "could not start ls-files in .." msgstr "kunde inte starta ls-files i .." -#: submodule.c:1976 +#: submodule.c:2043 msgid "BUG: returned path string doesn't match cwd?" msgstr "BUG: returnerad sökvägssträng matchar inte cwd?" -#: submodule.c:1995 +#: submodule.c:2062 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en oväntad returkod %d" @@ -3873,24 +3893,24 @@ msgstr "filen %s är inte skrivbar av användaren" #: trailer.c:1024 msgid "could not open temporary file" -msgstr "kunde inte öppna temporär file" +msgstr "kunde inte öppna temporär fil" #: 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:62 +#: transport.c:63 #, 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:151 +#: transport.c:152 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: ogiltig flagga för depth: ”%s”" -#: transport.c:888 +#: transport.c:904 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3899,7 +3919,7 @@ msgstr "" "Följande undermodulsökvägar innehåller ändringar som\n" "inte kan hittas av fjärrarna:\n" -#: transport.c:892 +#: transport.c:908 #, c-format msgid "" "\n" @@ -3926,11 +3946,11 @@ msgstr "" "för att sända dem till fjärren.\n" "\n" -#: transport.c:900 +#: transport.c:916 msgid "Aborting." msgstr "Avbryter." -#: transport-helper.c:1071 +#: transport-helper.c:1074 #, c-format msgid "Could not read ref %s" msgstr "Kunde inte läsa referensen %s" @@ -3951,7 +3971,7 @@ msgstr "tomt filnamn i trädpost" msgid "too-short tree file" msgstr "trädfil för kort" -#: unpack-trees.c:106 +#: unpack-trees.c:107 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3960,7 +3980,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:108 +#: unpack-trees.c:109 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3969,7 +3989,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%s" -#: unpack-trees.c:111 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3979,7 +3999,7 @@ msgstr "" "sammanslagning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:113 +#: unpack-trees.c:114 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3989,7 +4009,7 @@ msgstr "" "sammanslagning:\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3998,7 +4018,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:118 +#: unpack-trees.c:119 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4007,7 +4027,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:123 +#: unpack-trees.c:124 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -4017,7 +4037,7 @@ msgstr "" "dem:\n" "%s" -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4026,7 +4046,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:129 +#: unpack-trees.c:130 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4035,7 +4055,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%s" -#: unpack-trees.c:132 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4045,7 +4065,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du slår samman." -#: unpack-trees.c:134 +#: unpack-trees.c:135 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4055,7 +4075,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4064,7 +4084,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:139 +#: unpack-trees.c:140 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4073,7 +4093,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%s" -#: unpack-trees.c:144 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4084,7 +4104,7 @@ msgstr "" "utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:146 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4095,7 +4115,7 @@ msgstr "" "utcheckningen:\n" "%%s" -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4105,7 +4125,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:151 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4115,7 +4135,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4124,7 +4144,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:156 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4133,12 +4153,12 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:163 +#: unpack-trees.c:164 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda." -#: unpack-trees.c:166 +#: unpack-trees.c:167 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -4147,7 +4167,7 @@ msgstr "" "Kan inte uppdatera gles utcheckning: följande poster är inte à jour:\n" "%s" -#: unpack-trees.c:168 +#: unpack-trees.c:169 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4158,7 +4178,7 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:170 +#: unpack-trees.c:171 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4169,7 +4189,7 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:172 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update submodule:\n" @@ -4178,12 +4198,12 @@ msgstr "" "Kan inte uppdatera undermodul:\n" "%s" -#: unpack-trees.c:249 +#: unpack-trees.c:250 #, c-format msgid "Aborting\n" msgstr "Avbryter\n" -#: unpack-trees.c:331 +#: unpack-trees.c:332 msgid "Checking out files" msgstr "Checkar ut filer" @@ -4226,8 +4246,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:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766 -#: builtin/am.c:858 builtin/merge.c:1041 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 +#: builtin/am.c:862 builtin/merge.c:1043 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" @@ -4241,16 +4261,6 @@ msgstr "kan inte komma åt \"%s\"" msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" -#: wrapper.c:656 -#, c-format -msgid "could not write to %s" -msgstr "kunde inte skriva till %s" - -#: wrapper.c:658 -#, c-format -msgid "could not close %s" -msgstr "kunde inte stänga %s" - #: wt-status.c:150 msgid "Unmerged paths:" msgstr "Ej sammanslagna sökvägar:" @@ -4276,11 +4286,11 @@ msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning) msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:198 wt-status.c:979 +#: wt-status.c:198 wt-status.c:984 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:216 wt-status.c:988 +#: wt-status.c:216 wt-status.c:993 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" @@ -4384,22 +4394,22 @@ msgstr "ändrat innehåll, " msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:819 +#: wt-status.c:824 #, 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:851 +#: wt-status.c:856 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:853 +#: wt-status.c:858 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:935 +#: wt-status.c:940 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -4407,107 +4417,107 @@ msgstr "" "Raden ovan får inte ändras eller tas bort.\n" "Allt under den kommer tas bort." -#: wt-status.c:1048 +#: wt-status.c:1053 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:1051 +#: wt-status.c:1056 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:1053 +#: wt-status.c:1058 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)" -#: wt-status.c:1058 +#: wt-status.c:1063 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:1061 +#: wt-status.c:1066 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:1071 +#: wt-status.c:1076 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:1074 +#: wt-status.c:1079 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:1078 +#: wt-status.c:1083 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:1080 +#: wt-status.c:1085 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:1082 +#: wt-status.c:1087 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" -#: wt-status.c:1214 +#: wt-status.c:1219 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo saknas." -#: wt-status.c:1216 +#: wt-status.c:1221 msgid "No commands done." msgstr "Inga kommandon utförda." -#: wt-status.c:1219 +#: wt-status.c:1224 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Sista kommandot utfört (%d kommando utfört):" msgstr[1] "Sista kommandot utfört (%d kommandon utfört):" -#: wt-status.c:1230 +#: wt-status.c:1235 #, c-format msgid " (see more in file %s)" msgstr " (se fler i filen %s)" -#: wt-status.c:1235 +#: wt-status.c:1240 msgid "No commands remaining." msgstr "Inga kommandon återstår." -#: wt-status.c:1238 +#: wt-status.c:1243 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Nästa kommando att utföra (%d kommando återstår):" msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):" -#: wt-status.c:1246 +#: wt-status.c:1251 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)" -#: wt-status.c:1259 +#: wt-status.c:1264 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"." -#: wt-status.c:1264 +#: wt-status.c:1269 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1278 +#: wt-status.c:1283 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1280 +#: wt-status.c:1285 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1282 +#: wt-status.c:1287 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)" -#: wt-status.c:1288 +#: wt-status.c:1293 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1292 +#: wt-status.c:1297 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -4515,126 +4525,126 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1297 +#: wt-status.c:1302 msgid "You are currently splitting a commit during a rebase." msgstr "Du håller på att dela upp en incheckning i en ombasering." -#: wt-status.c:1300 +#: wt-status.c:1305 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")" -#: wt-status.c:1304 +#: wt-status.c:1309 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1309 +#: wt-status.c:1314 msgid "You are currently editing a commit during a rebase." msgstr "Du håller på att redigera en incheckning under en ombasering." -#: wt-status.c:1312 +#: wt-status.c:1317 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)" -#: wt-status.c:1314 +#: wt-status.c:1319 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)" -#: wt-status.c:1324 +#: wt-status.c:1329 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s." -#: wt-status.c:1329 +#: wt-status.c:1334 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1332 +#: wt-status.c:1337 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1334 +#: wt-status.c:1339 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-" "operationen)" -#: wt-status.c:1343 +#: wt-status.c:1348 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1348 +#: wt-status.c:1353 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1351 +#: wt-status.c:1356 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1353 +#: wt-status.c:1358 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1364 +#: wt-status.c:1369 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"." -#: wt-status.c:1368 +#: wt-status.c:1373 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1371 +#: wt-status.c:1376 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)" -#: wt-status.c:1568 +#: wt-status.c:1573 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1574 +#: wt-status.c:1579 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå " -#: wt-status.c:1576 +#: wt-status.c:1581 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå " -#: wt-status.c:1581 +#: wt-status.c:1586 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1583 +#: wt-status.c:1588 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1586 +#: wt-status.c:1591 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1606 +#: wt-status.c:1611 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1607 +#: wt-status.c:1612 msgid "No commits yet" msgstr "Inga incheckningar ännu" -#: wt-status.c:1621 +#: wt-status.c:1626 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1623 +#: wt-status.c:1628 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1627 +#: wt-status.c:1632 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4646,32 +4656,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1633 +#: wt-status.c:1638 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1635 +#: wt-status.c:1640 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1641 +#: wt-status.c:1646 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1646 +#: wt-status.c:1651 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a" "\")\n" -#: wt-status.c:1649 +#: wt-status.c:1654 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1652 +#: wt-status.c:1657 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -4680,58 +4690,58 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1655 +#: wt-status.c:1660 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "inget köat för incheckning, men ospårade filer finns\n" -#: wt-status.c:1658 +#: wt-status.c:1663 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n" -#: wt-status.c:1661 wt-status.c:1666 +#: wt-status.c:1666 wt-status.c:1671 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1664 +#: wt-status.c:1669 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "inget att checka in (använd -u för att visa ospårade filer)\n" -#: wt-status.c:1668 +#: wt-status.c:1673 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1780 +#: wt-status.c:1785 msgid "No commits yet on " msgstr "Inga incheckningar ännu på " -#: wt-status.c:1784 +#: wt-status.c:1789 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1813 wt-status.c:1821 +#: wt-status.c:1818 wt-status.c:1826 msgid "behind " msgstr "efter " -#: wt-status.c:1816 wt-status.c:1819 +#: wt-status.c:1821 wt-status.c:1824 msgid "ahead " msgstr "före " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2311 +#: wt-status.c:2318 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "kan inte %s: Du har oköade ändringar." -#: wt-status.c:2317 +#: wt-status.c:2324 msgid "additionally, your index contains uncommitted changes." msgstr "dessutom innehåller dit index ändringar som inte har checkats in." -#: wt-status.c:2319 +#: wt-status.c:2326 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in." @@ -4745,122 +4755,126 @@ msgstr "misslyckades ta bort länken \"%s\"" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<flaggor>] [--] <sökväg>..." -#: builtin/add.c:82 +#: builtin/add.c:83 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:87 builtin/commit.c:291 +#: builtin/add.c:88 builtin/commit.c:291 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:97 +#: builtin/add.c:98 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:153 +#: builtin/add.c:173 msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:213 builtin/rev-parse.c:888 +#: builtin/add.c:233 builtin/rev-parse.c:888 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:224 +#: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning." -#: builtin/add.c:228 +#: builtin/add.c:248 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:231 +#: builtin/add.c:251 msgid "editing patch failed" msgstr "redigering av patch misslyckades" -#: builtin/add.c:234 +#: builtin/add.c:254 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:236 +#: builtin/add.c:256 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:241 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:251 +#: builtin/add.c:271 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: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/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124 +#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:274 +#: builtin/add.c:294 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310 +#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310 msgid "select hunks interactively" msgstr "välj stycken interaktivt" -#: builtin/add.c:276 +#: builtin/add.c:296 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:277 +#: builtin/add.c:297 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:278 +#: builtin/add.c:298 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:279 +#: builtin/add.c:299 +msgid "renormalize EOL of tracked files (implies -u)" +msgstr "åternormalisera radslut i spårade filer (implicerar -u)" + +#: builtin/add.c:300 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:280 +#: builtin/add.c:301 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:283 +#: builtin/add.c:304 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:285 +#: builtin/add.c:306 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:286 +#: builtin/add.c:307 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:287 +#: builtin/add.c:308 msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: builtin/add.c:288 builtin/update-index.c:954 +#: builtin/add.c:309 builtin/update-index.c:964 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:288 builtin/update-index.c:955 +#: builtin/add.c:309 builtin/update-index.c:965 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" -#: builtin/add.c:290 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "varna när ett inbyggt arkiv läggs till" -#: builtin/add.c:305 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -4891,47 +4905,47 @@ msgstr "" "\n" "Se ”git help submodule” för ytterligare information." -#: builtin/add.c:333 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "lägger till inbäddat git-arkiv: %s" -#: builtin/add.c:351 +#: builtin/add.c:372 #, 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:359 +#: builtin/add.c:380 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:396 +#: builtin/add.c:417 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:403 +#: builtin/add.c:424 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:407 +#: builtin/add.c:428 #, 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:422 +#: builtin/add.c:443 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:423 +#: builtin/add.c:444 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: 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 +#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281 +#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350 +#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249 +#: builtin/rm.c:271 builtin/submodule--helper.c:311 msgid "index file corrupt" msgstr "indexfilen trasig" @@ -4958,85 +4972,85 @@ msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:786 +#: builtin/am.c:790 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:851 +#: builtin/am.c:855 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:899 +#: builtin/am.c:903 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:904 builtin/am.c:916 +#: builtin/am.c:908 builtin/am.c:920 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:911 +#: builtin/am.c:915 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:1004 +#: builtin/am.c:1008 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:1009 builtin/clone.c:402 +#: builtin/am.c:1013 builtin/clone.c:402 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:1013 +#: builtin/am.c:1017 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1142 builtin/commit.c:376 +#: builtin/am.c:1146 builtin/commit.c:376 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/am.c:1193 +#: builtin/am.c:1160 #, 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:1194 +#: builtin/am.c:1161 #, 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:1195 +#: builtin/am.c:1162 #, 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:1302 +#: builtin/am.c:1269 msgid "Patch is empty." msgstr "Patchen är tom." -#: builtin/am.c:1368 +#: builtin/am.c:1335 #, c-format msgid "invalid ident line: %.*s" msgstr "ogiltig ident-rad: %.*s" -#: builtin/am.c:1390 +#: builtin/am.c:1357 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: builtin/am.c:1584 +#: builtin/am.c:1550 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:1586 +#: builtin/am.c:1552 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1605 +#: builtin/am.c:1571 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -5044,39 +5058,39 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1611 +#: builtin/am.c:1577 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1636 +#: builtin/am.c:1602 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1660 builtin/merge.c:641 +#: builtin/am.c:1626 builtin/merge.c:642 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: builtin/am.c:1667 +#: builtin/am.c:1633 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824 -#: builtin/merge.c:849 +#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825 +#: builtin/merge.c:850 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/am.c:1713 builtin/am.c:1717 +#: builtin/am.c:1679 builtin/am.c:1683 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1733 +#: builtin/am.c:1699 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:1738 +#: builtin/am.c:1704 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -5084,35 +5098,35 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1748 +#: builtin/am.c:1714 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:1798 +#: builtin/am.c:1764 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1838 builtin/am.c:1910 +#: builtin/am.c:1804 builtin/am.c:1876 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1854 +#: builtin/am.c:1820 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1862 +#: builtin/am.c:1828 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1868 +#: builtin/am.c:1834 #, 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:1913 +#: builtin/am.c:1879 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -5122,7 +5136,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:1920 +#: builtin/am.c:1886 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -5134,17 +5148,17 @@ msgstr "" "lösta.\n" "Du kan köra ”git rm” för att godta ”borttagen av dem” för den." -#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332 +#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 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:2081 +#: builtin/am.c:2045 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2116 +#: builtin/am.c:2080 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -5152,133 +5166,133 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2179 +#: builtin/am.c:2143 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt värde för --patch-format: %s" -#: builtin/am.c:2212 +#: builtin/am.c:2176 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2213 +#: builtin/am.c:2177 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2219 +#: builtin/am.c:2183 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2221 +#: builtin/am.c:2185 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2223 +#: builtin/am.c:2187 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57 #: builtin/repack.c:180 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2226 +#: builtin/am.c:2190 msgid "add a Signed-off-by line to the commit message" msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet" -#: builtin/am.c:2229 +#: builtin/am.c:2193 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2231 +#: builtin/am.c:2195 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2233 +#: builtin/am.c:2197 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2235 +#: builtin/am.c:2199 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2237 +#: builtin/am.c:2201 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:2240 +#: builtin/am.c:2204 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:2243 +#: builtin/am.c:2207 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: 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 +#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 +#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230 +#: builtin/am.c:2236 msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: 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/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 +#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203 #: 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:2268 builtin/branch.c:622 builtin/for-each-ref.c:38 +#: builtin/am.c:2232 builtin/branch.c:629 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:2269 +#: builtin/am.c:2233 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2275 +#: builtin/am.c:2239 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2277 +#: builtin/am.c:2241 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2280 +#: builtin/am.c:2244 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2283 +#: builtin/am.c:2247 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2286 +#: builtin/am.c:2250 msgid "restore the original branch and abort the patching operation." msgstr "återställ originalgrenen och avbryt patchningen." -#: builtin/am.c:2290 +#: builtin/am.c:2254 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2292 +#: builtin/am.c:2256 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392 +#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2295 +#: builtin/am.c:2259 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2298 +#: builtin/am.c:2262 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2316 +#: builtin/am.c:2280 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." @@ -5286,16 +5300,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:2323 +#: builtin/am.c:2287 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2338 +#: builtin/am.c:2302 #, 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:2362 +#: builtin/am.c:2326 #, c-format msgid "" "Stray %s directory found.\n" @@ -5304,7 +5318,7 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2368 +#: builtin/am.c:2332 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." @@ -5342,18 +5356,69 @@ msgstr "git archive: protokollfel" msgid "git archive: expected a flush" msgstr "git archive: förväntade en tömning (flush)" -#: builtin/bisect--helper.c:7 +#: builtin/bisect--helper.c:12 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "git bisect--helper --next-all [--no-checkout]" -#: builtin/bisect--helper.c:17 +#: builtin/bisect--helper.c:13 +msgid "git bisect--helper --write-terms <bad_term> <good_term>" +msgstr "git bisect--helper --write-terms <term-för-fel> <term-för-rätt>" + +#: builtin/bisect--helper.c:14 +msgid "git bisect--helper --bisect-clean-state" +msgstr "git bisect--helper --bisect-clean-state" + +#: builtin/bisect--helper.c:46 +#, c-format +msgid "'%s' is not a valid term" +msgstr "\"%s\" är inte en giltig term" + +#: builtin/bisect--helper.c:50 +#, c-format +msgid "can't use the builtin command '%s' as a term" +msgstr "kan inte använda det inbyggda kommandot \"%s\" som term" + +#: builtin/bisect--helper.c:60 +#, c-format +msgid "can't change the meaning of the term '%s'" +msgstr "kan inte ändra betydelsen av termen \"%s\"" + +#: builtin/bisect--helper.c:71 +msgid "please use two different terms" +msgstr "termerna måste vara olika" + +#: builtin/bisect--helper.c:78 +msgid "could not open the file BISECT_TERMS" +msgstr "kunde inte öppna filen BISECT_TERMS" + +#: builtin/bisect--helper.c:120 msgid "perform 'git bisect next'" msgstr "utför 'git bisect next'" -#: builtin/bisect--helper.c:19 +#: builtin/bisect--helper.c:122 +msgid "write the terms to .git/BISECT_TERMS" +msgstr "skriv termerna i .git/BISECT_TERMS" + +#: builtin/bisect--helper.c:124 +msgid "cleanup the bisection state" +msgstr "städar upp bisect-tillstånd" + +#: builtin/bisect--helper.c:126 +msgid "check for expected revs" +msgstr "kontrollera för förväntade versioner" + +#: builtin/bisect--helper.c:128 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning" +#: builtin/bisect--helper.c:143 +msgid "--write-terms requires two arguments" +msgstr "--write-terms kräver två argument" + +#: builtin/bisect--helper.c:147 +msgid "--bisect-clean-state requires no arguments" +msgstr "--bisect-clean-state tar inga argument" + #: builtin/blame.c:27 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" @@ -5610,52 +5675,52 @@ msgstr "Grenen %s ombaseras på %s" msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" på %s" -#: builtin/branch.c:470 +#: builtin/branch.c:471 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 +#: builtin/branch.c:473 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:483 +#: builtin/branch.c:484 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:504 +#: builtin/branch.c:511 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:506 +#: builtin/branch.c:513 msgid "Branch copy failed" msgstr "Misslyckades kopiera gren" -#: builtin/branch.c:510 +#: builtin/branch.c:517 #, c-format -msgid "Copied a misnamed branch '%s' away" -msgstr "Kopierade bort en felaktigt namngiven gren \"%s\"" +msgid "Created a copy of a misnamed branch '%s'" +msgstr "Skapade kopia av felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:513 +#: builtin/branch.c:520 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:519 +#: builtin/branch.c:526 #, 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:528 +#: builtin/branch.c:535 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:530 +#: builtin/branch.c:537 msgid "Branch is copied, but update of config-file failed" msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:546 +#: builtin/branch.c:553 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5666,225 +5731,221 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/branch.c:579 +#: builtin/branch.c:586 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:581 +#: builtin/branch.c:588 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:582 +#: builtin/branch.c:589 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:583 +#: builtin/branch.c:590 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:585 +#: builtin/branch.c:592 msgid "do not use" msgstr "använd ej" -#: builtin/branch.c:587 +#: builtin/branch.c:594 msgid "upstream" msgstr "uppströms" -#: builtin/branch.c:587 +#: builtin/branch.c:594 msgid "change the upstream info" msgstr "ändra uppströmsinformationen" -#: builtin/branch.c:588 +#: builtin/branch.c:595 msgid "Unset the upstream info" msgstr "Ta bort uppströmsinformationen" -#: builtin/branch.c:589 +#: builtin/branch.c:596 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:590 +#: builtin/branch.c:597 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:592 builtin/branch.c:594 +#: builtin/branch.c:599 builtin/branch.c:601 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:593 builtin/branch.c:595 +#: builtin/branch.c:600 builtin/branch.c:602 msgid "print only branches that don't contain the commit" msgstr "visa endast grenar som inte innehåller incheckningen" -#: builtin/branch.c:598 +#: builtin/branch.c:605 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:599 +#: builtin/branch.c:606 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:601 +#: builtin/branch.c:608 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:602 +#: builtin/branch.c:609 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:603 +#: builtin/branch.c:610 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:604 +#: builtin/branch.c:611 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:605 +#: builtin/branch.c:612 msgid "copy a branch and its reflog" msgstr "kopiera en gren och dess reflogg" -#: builtin/branch.c:606 +#: builtin/branch.c:613 msgid "copy a branch, even if target exists" msgstr "kopiera en gren, även om målet finns" -#: builtin/branch.c:607 +#: builtin/branch.c:614 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:608 +#: builtin/branch.c:615 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:610 +#: builtin/branch.c:617 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:611 +#: builtin/branch.c:618 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:612 +#: builtin/branch.c:619 msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:613 +#: builtin/branch.c:620 msgid "print only branches that are not merged" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:614 +#: builtin/branch.c:621 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405 msgid "key" msgstr "nyckel" -#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406 +#: builtin/branch.c:623 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:618 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/branch.c:625 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:619 +#: builtin/branch.c:626 msgid "print only branches of the object" msgstr "visa endast grenar för objektet" -#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415 +#: builtin/branch.c:628 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:622 builtin/for-each-ref.c:38 builtin/tag.c:413 +#: builtin/branch.c:629 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:645 builtin/clone.c:729 +#: builtin/branch.c:652 builtin/clone.c:730 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:668 +#: builtin/branch.c:675 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741 +#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:708 +#: builtin/branch.c:718 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:713 +#: builtin/branch.c:723 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:720 +#: builtin/branch.c:730 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu." -#: builtin/branch.c:723 +#: builtin/branch.c:733 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:738 +#: builtin/branch.c:748 msgid "too many branches for a copy operation" msgstr "för många grenar för kopiering" -#: builtin/branch.c:747 +#: builtin/branch.c:757 msgid "too many arguments for a rename operation" msgstr "för många flaggor för namnbyte" -#: builtin/branch.c:752 +#: builtin/branch.c:762 msgid "too many arguments to set new upstream" msgstr "för många flaggor för att byta uppström" -#: builtin/branch.c:756 +#: builtin/branch.c:766 #, 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:759 builtin/branch.c:781 builtin/branch.c:800 +#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:763 +#: builtin/branch.c:773 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:775 +#: builtin/branch.c:785 msgid "too many arguments to unset upstream" msgstr "för många flaggor för att ta bort uppström" -#: builtin/branch.c:779 +#: builtin/branch.c:789 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:785 +#: builtin/branch.c:795 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:797 -msgid "it does not make sense to create 'HEAD' manually" -msgstr "kan inte skapa \"HEAD\" manuellt" - -#: builtin/branch.c:803 +#: builtin/branch.c:810 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:806 +#: builtin/branch.c:813 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -5949,7 +6010,7 @@ msgstr "för blob-objekt, kör filter på objektets innehåll" msgid "for blob objects, run filters on object's content" msgstr "för blob-objekt, kör filger på objektets innehåll" -#: builtin/cat-file.c:569 git-submodule.sh:943 +#: builtin/cat-file.c:569 git-submodule.sh:931 msgid "blob" msgstr "blob" @@ -6006,7 +6067,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:1153 builtin/gc.c:358 +#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -6063,160 +6124,160 @@ msgstr "inga kontakter angavs" msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<flaggor>] [--] [<fil>...]" -#: builtin/checkout-index.c:145 +#: builtin/checkout-index.c:143 msgid "stage should be between 1 and 3 or all" msgstr "etapp måste vara mellan 1 och 3 eller \"all\"" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:159 msgid "check out all files in the index" msgstr "checka ut alla filer i indexet" -#: builtin/checkout-index.c:162 +#: builtin/checkout-index.c:160 msgid "force overwrite of existing files" msgstr "tvinga överskrivning av befintliga filer" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:162 msgid "no warning for existing files and files not in index" msgstr "ingen varning för existerande filer och filer ej i indexet" -#: builtin/checkout-index.c:166 +#: builtin/checkout-index.c:164 msgid "don't checkout new files" msgstr "checka inte ut nya filer" -#: builtin/checkout-index.c:168 +#: builtin/checkout-index.c:166 msgid "update stat information in the index file" msgstr "uppdatera stat-information i indexfilen" -#: builtin/checkout-index.c:172 +#: builtin/checkout-index.c:170 msgid "read list of paths from the standard input" msgstr "läs listan över sökvägar från standard in" -#: builtin/checkout-index.c:174 +#: builtin/checkout-index.c:172 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:628 builtin/submodule--helper.c:631 -#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999 -#: builtin/worktree.c:498 +#: builtin/checkout-index.c:173 builtin/column.c:31 +#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237 +#: builtin/worktree.c:552 msgid "string" msgstr "sträng" -#: builtin/checkout-index.c:176 +#: builtin/checkout-index.c:174 msgid "when creating files, prepend <string>" msgstr "när filer skapas, lägg till <sträng> först" -#: builtin/checkout-index.c:178 +#: builtin/checkout-index.c:176 msgid "copy out the files from named stage" msgstr "kopiera ut filer från namngiven etapp" -#: builtin/checkout.c:26 +#: builtin/checkout.c:27 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<flaggor>] <gren>" -#: builtin/checkout.c:27 +#: builtin/checkout.c:28 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..." -#: builtin/checkout.c:135 builtin/checkout.c:168 +#: builtin/checkout.c:136 builtin/checkout.c:169 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:137 builtin/checkout.c:170 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:153 +#: builtin/checkout.c:154 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner" -#: builtin/checkout.c:197 +#: builtin/checkout.c:198 #, c-format msgid "path '%s' does not have necessary versions" msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner" -#: builtin/checkout.c:214 +#: builtin/checkout.c:215 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:231 +#: builtin/checkout.c:232 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 -#: builtin/checkout.c:262 +#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260 +#: builtin/checkout.c:263 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar" -#: builtin/checkout.c:265 builtin/checkout.c:268 +#: builtin/checkout.c:266 builtin/checkout.c:269 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:271 +#: builtin/checkout.c:272 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt." -#: builtin/checkout.c:342 builtin/checkout.c:349 +#: builtin/checkout.c:341 builtin/checkout.c:348 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:501 +#: builtin/checkout.c:506 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:632 +#: builtin/checkout.c:637 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:673 +#: builtin/checkout.c:678 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:677 builtin/clone.c:683 +#: builtin/checkout.c:682 builtin/clone.c:684 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:681 +#: builtin/checkout.c:686 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:684 +#: builtin/checkout.c:689 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:688 +#: builtin/checkout.c:693 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:690 builtin/checkout.c:1086 +#: builtin/checkout.c:695 builtin/checkout.c:1051 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:692 +#: builtin/checkout.c:697 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:743 +#: builtin/checkout.c:748 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:749 +#: builtin/checkout.c:754 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6239,7 +6300,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:768 +#: builtin/checkout.c:773 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6266,161 +6327,161 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:809 +#: builtin/checkout.c:814 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:813 +#: builtin/checkout.c:818 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:843 builtin/checkout.c:1081 +#: builtin/checkout.c:848 builtin/checkout.c:1046 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:987 +#: builtin/checkout.c:952 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1027 builtin/worktree.c:233 +#: builtin/checkout.c:992 builtin/worktree.c:247 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1021 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1060 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1098 builtin/checkout.c:1102 +#: builtin/checkout.c:1063 builtin/checkout.c:1067 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114 -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079 +#: builtin/checkout.c:1082 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1087 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: 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 +#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369 +#: builtin/worktree.c:371 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1120 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1122 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1123 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1159 builtin/worktree.c:350 +#: builtin/checkout.c:1124 builtin/worktree.c:373 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1125 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1127 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1127 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1128 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1130 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1132 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1133 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:1169 builtin/merge.c:238 +#: builtin/checkout.c:1134 builtin/merge.c:238 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251 +#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251 msgid "style" msgstr "stil" -#: builtin/checkout.c:1171 +#: builtin/checkout.c:1136 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1174 +#: builtin/checkout.c:1139 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1141 msgid "second guess 'git checkout <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1178 +#: builtin/checkout.c:1143 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:1182 builtin/clone.c:81 builtin/fetch.c:136 -#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544 +#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137 +#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556 #: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1177 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1229 +#: builtin/checkout.c:1194 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1234 +#: builtin/checkout.c:1199 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1270 +#: builtin/checkout.c:1235 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1277 +#: builtin/checkout.c:1242 #, 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:1281 +#: builtin/checkout.c:1246 #, 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:1285 +#: builtin/checkout.c:1250 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6460,7 +6521,7 @@ msgstr "Skulle hoppa över arkivet %s\n" msgid "failed to remove %s" msgstr "misslyckades ta bort %s" -#: builtin/clean.c:301 git-add--interactive.perl:572 +#: builtin/clean.c:302 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -6473,7 +6534,7 @@ msgstr "" "foo - markera post baserad på unikt prefix\n" " - (tomt) markera ingenting\n" -#: builtin/clean.c:305 git-add--interactive.perl:581 +#: builtin/clean.c:306 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -6494,38 +6555,38 @@ msgstr "" "* - välj alla poster\n" " - (tomt) avsluta markering\n" -#: builtin/clean.c:521 git-add--interactive.perl:547 +#: builtin/clean.c:522 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:663 +#: builtin/clean.c:664 #, c-format msgid "Input ignore patterns>> " msgstr "Ange ignoreringsmönster>>" -#: builtin/clean.c:700 +#: builtin/clean.c:701 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "VARNING: Hittar inte poster som motsvarar: %s" -#: builtin/clean.c:721 +#: builtin/clean.c:722 msgid "Select items to delete" msgstr "Välj poster att ta bort" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:763 #, c-format msgid "Remove %s [y/N]? " msgstr "Ta bort %s [Y=ja / N=nej]? " -#: builtin/clean.c:787 git-add--interactive.perl:1616 +#: builtin/clean.c:788 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "Hej då.\n" -#: builtin/clean.c:795 +#: builtin/clean.c:796 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6543,63 +6604,64 @@ msgstr "" "help - denna skärm\n" "? - hjälp för kommandoval" -#: builtin/clean.c:822 git-add--interactive.perl:1692 +#: builtin/clean.c:823 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: builtin/clean.c:823 git-add--interactive.perl:1689 +#: builtin/clean.c:824 git-add--interactive.perl:1689 msgid "What now" msgstr "Vad nu" -#: builtin/clean.c:831 +#: builtin/clean.c:832 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:847 +#: builtin/clean.c:848 msgid "No more files to clean, exiting." msgstr "Inga fler filer att städa, avslutar." -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "do not print names of files removed" msgstr "skriv inte ut namn på borttagna filer" -#: builtin/clean.c:911 +#: builtin/clean.c:912 msgid "force" msgstr "tvinga" -#: builtin/clean.c:912 +#: builtin/clean.c:913 msgid "interactive cleaning" msgstr "städa interaktivt" -#: builtin/clean.c:914 +#: builtin/clean.c:915 msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: 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 +#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532 +#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157 +#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 +#: builtin/show-ref.c:176 msgid "pattern" msgstr "mönster" -#: builtin/clean.c:916 +#: builtin/clean.c:917 msgid "add <pattern> to ignore rules" msgstr "lägg till <mönster> till ignoreringsregler" -#: builtin/clean.c:917 +#: builtin/clean.c:918 msgid "remove ignored files, too" msgstr "ta även bort ignorerade filer" -#: builtin/clean.c:919 +#: builtin/clean.c:920 msgid "remove only ignored files" msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:937 +#: builtin/clean.c:938 msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" -#: builtin/clean.c:941 +#: builtin/clean.c:942 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -6607,7 +6669,7 @@ msgstr "" "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar " "städa" -#: builtin/clean.c:944 +#: builtin/clean.c:945 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6663,8 +6725,8 @@ msgstr "mallkatalog" msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635 -#: builtin/submodule--helper.c:1002 +#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873 +#: builtin/submodule--helper.c:1240 msgid "reference repository" msgstr "referensarkiv" @@ -6688,8 +6750,8 @@ msgstr "checka ut <gren> istället för fjärrens HEAD" msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804 -#: builtin/pull.c:205 +#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806 +#: builtin/pull.c:211 msgid "depth" msgstr "djup" @@ -6697,7 +6759,7 @@ msgstr "djup" msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938 +#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991 #: parse-options.h:142 msgid "time" msgstr "tid" @@ -6706,11 +6768,11 @@ msgstr "tid" msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon från en angiven tidpunkt" -#: builtin/clone.c:122 builtin/fetch.c:141 +#: builtin/clone.c:122 builtin/fetch.c:142 msgid "revision" msgstr "revision" -#: builtin/clone.c:123 builtin/fetch.c:142 +#: builtin/clone.c:123 builtin/fetch.c:143 msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" @@ -6742,11 +6804,13 @@ msgstr "nyckel=värde" msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555 +#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224 +#: builtin/push.c:567 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557 +#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227 +#: builtin/push.c:569 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" @@ -6788,12 +6852,12 @@ msgstr "misslyckades skapa länken \"%s\"" msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:471 +#: builtin/clone.c:472 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:483 +#: builtin/clone.c:484 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -6803,21 +6867,21 @@ 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:560 +#: builtin/clone.c:561 #, 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:655 +#: builtin/clone.c:656 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: builtin/clone.c:671 +#: builtin/clone.c:672 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:720 +#: builtin/clone.c:721 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" @@ -6838,7 +6902,7 @@ msgstr "kan inte packa om för att städa upp" msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:894 builtin/receive-pack.c:1944 +#: builtin/clone.c:894 builtin/receive-pack.c:1945 msgid "Too many arguments." msgstr "För många argument." @@ -6860,7 +6924,7 @@ msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:933 builtin/fetch.c:1360 +#: builtin/clone.c:933 builtin/fetch.c:1358 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" @@ -6876,7 +6940,7 @@ msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." #: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270 -#: builtin/worktree.c:240 builtin/worktree.c:270 +#: builtin/worktree.c:253 builtin/worktree.c:283 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" @@ -6924,17 +6988,12 @@ msgstr "källarkivet är grunt, ignorerar --local" msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1087 -#, c-format -msgid "Don't know how to clone %s" -msgstr "Vet inte hur man klonar %s" - -#: builtin/clone.c:1142 builtin/clone.c:1150 +#: builtin/clone.c:1139 builtin/clone.c:1147 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1153 +#: builtin/clone.c:1150 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -7136,7 +7195,7 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100 +#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" @@ -7237,127 +7296,136 @@ msgstr "%sIncheckare: %.*s <%.*s>" msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:958 +#: builtin/commit.c:959 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:972 builtin/tag.c:252 +#: builtin/commit.c:973 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:1075 +#: builtin/commit.c:1076 #, 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:1090 builtin/commit.c:1335 +#: builtin/commit.c:1090 +#, c-format +msgid "Invalid ignored mode '%s'" +msgstr "Ogiltigt ignorerat läge \"%s\"" + +#: builtin/commit.c:1104 builtin/commit.c:1349 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1128 +#: builtin/commit.c:1142 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1158 +#: builtin/commit.c:1172 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:1167 +#: builtin/commit.c:1181 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1170 +#: builtin/commit.c:1184 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:1172 +#: builtin/commit.c:1186 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:1175 +#: builtin/commit.c:1189 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1185 +#: builtin/commit.c:1199 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:1187 +#: builtin/commit.c:1201 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:1195 +#: builtin/commit.c:1209 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:1212 +#: builtin/commit.c:1226 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:1214 +#: builtin/commit.c:1228 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:1226 builtin/tag.c:535 +#: builtin/commit.c:1240 builtin/tag.c:535 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1231 +#: builtin/commit.c:1245 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1349 builtin/commit.c:1626 +#: builtin/commit.c:1363 builtin/commit.c:1648 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1351 builtin/commit.c:1628 +#: builtin/commit.c:1365 builtin/commit.c:1650 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1353 +#: builtin/commit.c:1367 msgid "show stash information" msgstr "visa information om stash" -#: builtin/commit.c:1355 +#: builtin/commit.c:1369 msgid "version" msgstr "version" -#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530 -#: builtin/worktree.c:469 +#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542 +#: builtin/worktree.c:523 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1358 builtin/commit.c:1632 +#: builtin/commit.c:1372 builtin/commit.c:1654 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1361 builtin/commit.c:1635 +#: builtin/commit.c:1375 builtin/commit.c:1657 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999 -#: builtin/fast-export.c:1002 builtin/tag.c:390 +#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660 +#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390 msgid "mode" msgstr "läge" -#: builtin/commit.c:1364 builtin/commit.c:1638 +#: builtin/commit.c:1378 builtin/commit.c:1660 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" -msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)" +msgstr "visa ospårade filer, valfria lägen: all, normal, no. (Standard: all)" -#: builtin/commit.c:1367 -msgid "show ignored files" -msgstr "visa ignorerade filer" +#: builtin/commit.c:1382 +msgid "" +"show ignored files, optional modes: traditional, matching, no. (Default: " +"traditional)" +msgstr "" +"visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: " +"traditional)" -#: builtin/commit.c:1368 parse-options.h:155 +#: builtin/commit.c:1384 parse-options.h:155 msgid "when" msgstr "när" -#: builtin/commit.c:1369 +#: builtin/commit.c:1385 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7365,202 +7433,210 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1371 +#: builtin/commit.c:1387 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1449 +#: builtin/commit.c:1406 +msgid "Unsupported combination of ignored and untracked-files arguments" +msgstr "Kombinationen av argument för ignorerade och ospårade filer stöds ej" + +#: builtin/commit.c:1469 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1451 +#: builtin/commit.c:1471 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1496 +#: builtin/commit.c:1516 +msgid "unable to resolve HEAD after creating commit" +msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning" + +#: builtin/commit.c:1518 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1499 +#: builtin/commit.c:1521 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1596 +#: builtin/commit.c:1618 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1597 +#: builtin/commit.c:1619 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1599 +#: builtin/commit.c:1621 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1600 builtin/tag.c:388 +#: builtin/commit.c:1622 builtin/tag.c:388 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1601 +#: builtin/commit.c:1623 msgid "author" msgstr "författare" -#: builtin/commit.c:1601 +#: builtin/commit.c:1623 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1602 builtin/gc.c:359 +#: builtin/commit.c:1624 builtin/gc.c:359 msgid "date" msgstr "datum" -#: builtin/commit.c:1602 +#: builtin/commit.c:1624 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402 +#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402 #: builtin/notes.c:565 builtin/tag.c:386 msgid "message" msgstr "meddelande" -#: builtin/commit.c:1603 +#: builtin/commit.c:1625 msgid "commit message" msgstr "incheckningsmeddelande" -#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606 -#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92 +#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628 +#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1604 +#: builtin/commit.c:1626 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1605 +#: builtin/commit.c:1627 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1606 +#: builtin/commit.c:1628 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1607 +#: builtin/commit.c:1629 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:1608 +#: builtin/commit.c:1630 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:1609 builtin/log.c:1436 builtin/merge.c:239 -#: builtin/revert.c:105 +#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239 +#: builtin/pull.c:149 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1610 +#: builtin/commit.c:1632 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1611 +#: builtin/commit.c:1633 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1612 +#: builtin/commit.c:1634 msgid "default" msgstr "standard" -#: builtin/commit.c:1612 builtin/tag.c:391 +#: builtin/commit.c:1634 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:1613 +#: builtin/commit.c:1635 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173 +#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "GPG-signera incheckning" -#: builtin/commit.c:1618 +#: builtin/commit.c:1640 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1619 +#: builtin/commit.c:1641 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1620 +#: builtin/commit.c:1642 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1621 +#: builtin/commit.c:1643 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1622 +#: builtin/commit.c:1644 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1623 +#: builtin/commit.c:1645 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1624 +#: builtin/commit.c:1646 msgid "bypass pre-commit and commit-msg hooks" msgstr "förbigå pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1625 +#: builtin/commit.c:1647 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1636 +#: builtin/commit.c:1658 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1637 +#: builtin/commit.c:1659 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1642 +#: builtin/commit.c:1664 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1644 +#: builtin/commit.c:1666 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1674 +#: builtin/commit.c:1696 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1719 +#: builtin/commit.c:1741 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1726 +#: builtin/commit.c:1748 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1745 +#: builtin/commit.c:1767 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1756 +#: builtin/commit.c:1778 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1761 +#: builtin/commit.c:1783 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1809 +#: builtin/commit.c:1831 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7575,139 +7651,143 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<flaggor>]" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "Config file location" msgstr "Konfigurationsfilens plats" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "use global config file" msgstr "använd global konfigurationsfil" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "use system config file" msgstr "använd systemets konfigurationsfil" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "use repository config file" msgstr "använd arkivets konfigurationsfil" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "use given config file" msgstr "använd angiven konfigurationsfil" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "read config from given blob object" msgstr "läs konfiguration från givet blob-objekt" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "Action" msgstr "Åtgärd" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "get value: name [value-regex]" msgstr "hämta värde: namn [värde-reguttr]" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "get all values: key [value-regex]" msgstr "hämta alla värden: nyckel [värde-reguttr]" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "get values for regexp: name-regex [value-regex]" msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "get value specific for the URL: section[.var] URL" msgstr "hämta värde specifikt URL:en: sektion[.var] URL" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "replace all matching variables: name value [value_regex]" msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "add a new variable: name value" msgstr "lägg till en ny variabel: namn värde" -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "remove a variable: name [value-regex]" msgstr "ta bort en variabel: namn [värde-reguttr]" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "remove all matches: name [value-regex]" msgstr "ta bort alla träffar: namn [värde-reguttr]" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "rename section: old-name new-name" msgstr "byt namn på sektion: gammalt-namn nytt-namn" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "remove a section: name" msgstr "ta bort en sektion: namn" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "list all" msgstr "visa alla" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "open an editor" msgstr "öppna textredigeringsprogram" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "find the color configured: slot [default]" msgstr "hitta den inställda färgen: slot [default]" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "find the color setting: slot [stdout-is-tty]" msgstr "hitta färginställningen: slot [stdout-is-tty]" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "Type" msgstr "Typ" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "value is \"true\" or \"false\"" msgstr "värdet är \"true\" eller \"false\"" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "value is decimal number" msgstr "värdet är ett decimalt tal" -#: builtin/config.c:81 +#: builtin/config.c:82 msgid "value is --bool or --int" msgstr "värdet är --bool eller --int" -#: builtin/config.c:82 +#: builtin/config.c:83 msgid "value is a path (file or directory name)" msgstr "värdet är en sökväg (fil- eller katalognamn)" -#: builtin/config.c:83 +#: builtin/config.c:84 +msgid "value is an expiry date" +msgstr "värdet är ett utgångsdatum" + +#: builtin/config.c:85 msgid "Other" msgstr "Andra" -#: builtin/config.c:84 +#: builtin/config.c:86 msgid "terminate values with NUL byte" msgstr "terminera värden med NUL-byte" -#: builtin/config.c:85 +#: builtin/config.c:87 msgid "show variable names only" msgstr "visa endast variabelnamn" -#: builtin/config.c:86 +#: builtin/config.c:88 msgid "respect include directives on lookup" msgstr "respektera inkluderingsdirektiv vid uppslag" -#: builtin/config.c:87 +#: builtin/config.c:89 msgid "show origin of config (file, standard input, blob, command line)" msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)" -#: builtin/config.c:327 +#: builtin/config.c:335 msgid "unable to parse default color value" msgstr "kan inte tolka standardfärgvärde" -#: builtin/config.c:471 +#: builtin/config.c:479 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7722,16 +7802,16 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:499 +#: builtin/config.c:507 msgid "--local can only be used inside a git repository" msgstr "--local kan bara användas inuti ett git-arkiv" -#: builtin/config.c:624 +#: builtin/config.c:632 #, c-format msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%s\"" -#: builtin/config.c:637 +#: builtin/config.c:645 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7748,67 +7828,58 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" -#: builtin/describe.c:19 +#: builtin/describe.c:22 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<flaggor>] [<incheckning-igt>...]" -#: builtin/describe.c:20 +#: builtin/describe.c:23 msgid "git describe [<options>] --dirty" msgstr "git describe [<flaggor>] --dirty" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "head" msgstr "huvud" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "lightweight" msgstr "lättviktig" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "annotated" msgstr "annoterad" -#: builtin/describe.c:264 +#: builtin/describe.c:267 #, c-format msgid "annotated tag %s not available" msgstr "den annoterade taggen %s inte tillgänglig" -#: builtin/describe.c:268 +#: builtin/describe.c:271 #, c-format msgid "annotated tag %s has no embedded name" msgstr "den annoterade taggen %s har inget inbäddat namn" -#: builtin/describe.c:270 +#: builtin/describe.c:273 #, c-format msgid "tag '%s' is really '%s' here" msgstr "taggen \"%s\" är i verkligheten \"%s\" här" -#: 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:300 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "%s är inte ett giltigt \"%s\"-objekt" - -#: builtin/describe.c:317 +#: builtin/describe.c:314 #, c-format msgid "no tag exactly matches '%s'" msgstr "ingen tagg motsvarar \"%s\" exakt" -#: builtin/describe.c:319 +#: builtin/describe.c:316 #, c-format -msgid "searching to describe %s\n" -msgstr "söker för att beskriva %s\n" +msgid "No exact match on refs or tags, searching to describe\n" +msgstr "" +"Ingen exakt träff mot referenser eller taggar, söker för att beskriva\n" -#: builtin/describe.c:366 +#: builtin/describe.c:363 #, c-format msgid "finished search at %s\n" msgstr "avslutade sökning på %s\n" -#: builtin/describe.c:393 +#: builtin/describe.c:389 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7817,7 +7888,7 @@ msgstr "" "Inga annoterade taggar kan beskriva \"%s\".\n" "Det finns dock oannoterade taggar: testa --tags." -#: builtin/describe.c:397 +#: builtin/describe.c:393 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7826,12 +7897,12 @@ msgstr "" "Inga taggar kan beskriva \"%s\".\n" "Testa --always, eller skapa några taggar." -#: builtin/describe.c:427 +#: builtin/describe.c:423 #, c-format msgid "traversed %lu commits\n" msgstr "traverserade %lu incheckningar\n" -#: builtin/describe.c:430 +#: builtin/describe.c:426 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -7840,75 +7911,90 @@ msgstr "" "mer än %i taggar hittades; listar de %i senaste\n" "gav upp sökningen vid %s\n" -#: builtin/describe.c:452 +#: builtin/describe.c:494 +#, c-format +msgid "describe %s\n" +msgstr "beskriva %s\n" + +#: builtin/describe.c:497 builtin/log.c:500 +#, c-format +msgid "Not a valid object name %s" +msgstr "Objektnamnet är inte giltigt: %s" + +#: builtin/describe.c:505 +#, c-format +msgid "%s is neither a commit nor blob" +msgstr "%s är varken incheckning eller blob" + +#: builtin/describe.c:519 msgid "find the tag that comes after the commit" msgstr "hitta taggen som kommer efter incheckningen" -#: builtin/describe.c:453 +#: builtin/describe.c:520 msgid "debug search strategy on stderr" msgstr "felsök sökstrategin på standard fel" -#: builtin/describe.c:454 +#: builtin/describe.c:521 msgid "use any ref" msgstr "använd alla referenser" -#: builtin/describe.c:455 +#: builtin/describe.c:522 msgid "use any tag, even unannotated" msgstr "använd alla taggar, även oannoterade" -#: builtin/describe.c:456 +#: builtin/describe.c:523 msgid "always use long format" msgstr "använd alltid långt format" -#: builtin/describe.c:457 +#: builtin/describe.c:524 msgid "only follow first parent" msgstr "följ endast första föräldern" -#: builtin/describe.c:460 +#: builtin/describe.c:527 msgid "only output exact matches" msgstr "skriv endast ut exakta träffar" -#: builtin/describe.c:462 +#: builtin/describe.c:529 msgid "consider <n> most recent tags (default: 10)" msgstr "överväg de <n> nyaste taggarna (standard: 10)" -#: builtin/describe.c:464 +#: builtin/describe.c:531 msgid "only consider tags matching <pattern>" msgstr "överväg endast taggar som motsvarar <mönster>" -#: builtin/describe.c:466 +#: builtin/describe.c:533 msgid "do not consider tags matching <pattern>" msgstr "överväg inte taggar som motsvarar <mönster>" -#: builtin/describe.c:468 builtin/name-rev.c:406 +#: builtin/describe.c:535 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" -#: builtin/describe.c:469 builtin/describe.c:472 +#: builtin/describe.c:536 builtin/describe.c:539 msgid "mark" msgstr "märke" -#: builtin/describe.c:470 +#: builtin/describe.c:537 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")" -#: builtin/describe.c:473 +#: builtin/describe.c:540 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")" -#: builtin/describe.c:491 +#: builtin/describe.c:558 msgid "--long is incompatible with --abbrev=0" msgstr "--long är inkompatibel med --abbrev=0" -#: builtin/describe.c:520 +#: builtin/describe.c:587 msgid "No names found, cannot describe anything." msgstr "Inga namn hittades, kan inte beskriva något." -#: builtin/describe.c:563 +#: builtin/describe.c:637 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden" -#: builtin/describe.c:565 +#: builtin/describe.c:639 msgid "--broken is incompatible with commit-ishes" msgstr "--broken är inkompatibelt med \"commit-ish\"-värden" @@ -7917,26 +8003,26 @@ msgstr "--broken är inkompatibelt med \"commit-ish\"-värden" msgid "'%s': not a regular file or symlink" msgstr "\"%s\": inte en normal fil eller symbolisk länk" -#: builtin/diff.c:235 +#: builtin/diff.c:234 #, c-format msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:357 +#: builtin/diff.c:356 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:400 +#: builtin/diff.c:399 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:409 +#: builtin/diff.c:408 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:414 +#: builtin/diff.c:413 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." @@ -7974,53 +8060,53 @@ msgstr "" "kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n" "katalogdiffläge (\"-d\" och \"--dir-diff\")." -#: builtin/difftool.c:633 +#: builtin/difftool.c:632 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "bägge filerna ändrade: \"%s\" och \"%s\"." -#: builtin/difftool.c:635 +#: builtin/difftool.c:634 msgid "working tree file has been left." msgstr "filen i arbetskatalogen lämnades kvar." -#: builtin/difftool.c:646 +#: builtin/difftool.c:645 #, c-format msgid "temporary files exist in '%s'." msgstr "temporära filer finns i \"%s\"." -#: builtin/difftool.c:647 +#: builtin/difftool.c:646 msgid "you may want to cleanup or recover these." msgstr "du kanske vill städa eller rädda dem." -#: builtin/difftool.c:696 +#: builtin/difftool.c:695 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "använd \"diff.guitool\" istället för \"diff.tool\"" -#: builtin/difftool.c:698 +#: builtin/difftool.c:697 msgid "perform a full-directory diff" msgstr "utför diff för hela katalogen" -#: builtin/difftool.c:700 +#: builtin/difftool.c:699 msgid "do not prompt before launching a diff tool" msgstr "fråga inte vid start av diff-verktyg" -#: builtin/difftool.c:706 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "använd symboliska länkar i katalogdiffläge" -#: builtin/difftool.c:707 +#: builtin/difftool.c:706 msgid "<tool>" msgstr "<verktyg>" -#: builtin/difftool.c:708 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "använd angivet diff-verktyg" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 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:713 +#: builtin/difftool.c:712 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -8028,19 +8114,19 @@ msgstr "" "låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde " "skilt från noll" -#: builtin/difftool.c:715 +#: builtin/difftool.c:714 msgid "<command>" msgstr "<kommando>" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "ange eget kommando för att visa diffar" -#: builtin/difftool.c:740 +#: builtin/difftool.c:739 msgid "no <tool> given for --tool=<tool>" msgstr "inget <verktyg> angavs för --tool=<verktyg>" -#: builtin/difftool.c:747 +#: builtin/difftool.c:746 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "inget <kommando> angavs för --extcmd=<kommando>" @@ -8096,95 +8182,95 @@ msgstr "Applicera referensspecifikation på exporterade referenser" msgid "anonymize output" msgstr "anonymisera utdata" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch [<options>] <group>" msgstr "git fetch [<flaggor>] <grupp>" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" -#: builtin/fetch.c:26 +#: builtin/fetch.c:27 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:112 builtin/pull.c:182 +#: builtin/fetch.c:113 builtin/pull.c:188 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:114 builtin/pull.c:185 +#: builtin/fetch.c:115 builtin/pull.c:191 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:116 builtin/pull.c:188 +#: builtin/fetch.c:117 builtin/pull.c:194 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:117 builtin/pull.c:190 +#: builtin/fetch.c:118 builtin/pull.c:196 msgid "force overwrite of local branch" msgstr "tvinga överskrivning av lokal gren" -#: builtin/fetch.c:119 +#: builtin/fetch.c:120 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:121 builtin/pull.c:192 +#: builtin/fetch.c:122 builtin/pull.c:198 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:123 +#: builtin/fetch.c:124 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:125 +#: builtin/fetch.c:126 msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:127 builtin/pull.c:195 +#: builtin/fetch.c:128 builtin/pull.c:201 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123 +#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:129 +#: builtin/fetch.c:130 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:133 builtin/pull.c:203 +#: builtin/fetch.c:134 builtin/pull.c:209 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:135 +#: builtin/fetch.c:136 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206 +#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:140 +#: builtin/fetch.c:141 msgid "deepen history of shallow repository based on time" msgstr "fördjupa historik för grund klon baserad på tid" -#: builtin/fetch.c:146 builtin/pull.c:209 +#: builtin/fetch.c:147 builtin/pull.c:215 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:148 builtin/log.c:1456 +#: builtin/fetch.c:149 builtin/log.c:1463 msgid "dir" msgstr "kat" -#: builtin/fetch.c:149 +#: builtin/fetch.c:150 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:152 +#: builtin/fetch.c:153 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -8192,89 +8278,89 @@ msgstr "" "standard för rekursiv hämtning av undermoduler (lägre prioritet än " "konfigurationsfiler)" -#: builtin/fetch.c:156 builtin/pull.c:212 +#: builtin/fetch.c:157 builtin/pull.c:218 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:157 builtin/pull.c:214 +#: builtin/fetch.c:158 builtin/pull.c:220 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:158 builtin/pull.c:215 +#: builtin/fetch.c:159 builtin/pull.c:221 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:416 +#: builtin/fetch.c:417 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:534 +#: builtin/fetch.c:535 #, 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:627 +#: builtin/fetch.c:628 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:631 +#: builtin/fetch.c:632 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:644 builtin/fetch.c:724 +#: builtin/fetch.c:645 builtin/fetch.c:725 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:645 +#: builtin/fetch.c:646 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:654 +#: builtin/fetch.c:655 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704 -#: builtin/fetch.c:719 +#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705 +#: builtin/fetch.c:720 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:674 +#: builtin/fetch.c:675 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:677 +#: builtin/fetch.c:678 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:680 +#: builtin/fetch.c:681 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:719 +#: builtin/fetch.c:720 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:724 +#: builtin/fetch.c:725 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:769 +#: builtin/fetch.c:770 #, 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:789 +#: builtin/fetch.c:790 #, 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:877 builtin/fetch.c:973 +#: builtin/fetch.c:878 builtin/fetch.c:974 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:889 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -8283,55 +8369,50 @@ 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:943 +#: builtin/fetch.c:944 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:944 +#: builtin/fetch.c:945 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:976 +#: builtin/fetch.c:977 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:977 builtin/remote.c:1024 +#: builtin/fetch.c:978 builtin/remote.c:1024 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1001 #, 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:1019 +#: builtin/fetch.c:1020 #, 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:1022 +#: builtin/fetch.c:1023 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: 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:1258 +#: builtin/fetch.c:1256 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1260 builtin/remote.c:97 +#: builtin/fetch.c:1258 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1278 +#: builtin/fetch.c:1276 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8339,40 +8420,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:1301 +#: builtin/fetch.c:1299 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1344 +#: builtin/fetch.c:1342 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1346 +#: builtin/fetch.c:1344 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1351 +#: builtin/fetch.c:1349 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1353 +#: builtin/fetch.c:1351 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1366 +#: builtin/fetch.c:1364 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1368 +#: builtin/fetch.c:1366 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1379 +#: builtin/fetch.c:1377 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1387 +#: builtin/fetch.c:1385 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -8382,23 +8463,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]" -#: builtin/fmt-merge-msg.c:665 +#: builtin/fmt-merge-msg.c:666 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:668 +#: builtin/fmt-merge-msg.c:669 msgid "alias for --log (deprecated)" msgstr "alias för --log (avråds)" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:673 msgid "use <text> as start of message" msgstr "inled meddelande med <text>" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:674 msgid "file to read from" msgstr "fil att läsa från" @@ -8623,241 +8704,241 @@ msgstr "felaktigt antal trådar angivet (%d) för %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693 +#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613 +#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:628 +#: builtin/grep.c:630 #, c-format msgid "unable to grep from object of type %s" msgstr "kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:694 +#: builtin/grep.c:696 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:781 +#: builtin/grep.c:783 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:783 +#: builtin/grep.c:785 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:785 +#: builtin/grep.c:787 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:787 +#: builtin/grep.c:789 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:789 +#: builtin/grep.c:791 msgid "recursively search in each submodule" msgstr "sök varje undermodul rekursivt" -#: builtin/grep.c:792 +#: builtin/grep.c:794 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:794 +#: builtin/grep.c:796 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:796 +#: builtin/grep.c:798 msgid "match patterns only at word boundaries" msgstr "matcha endast mönster vid ordgränser" -#: builtin/grep.c:798 +#: builtin/grep.c:800 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:800 +#: builtin/grep.c:802 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:803 +#: builtin/grep.c:805 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:805 +#: builtin/grep.c:807 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:809 +#: builtin/grep.c:811 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:812 +#: builtin/grep.c:814 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:815 +#: builtin/grep.c:817 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:818 +#: builtin/grep.c:820 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:821 +#: builtin/grep.c:823 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:822 +#: builtin/grep.c:824 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:823 +#: builtin/grep.c:825 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:825 +#: builtin/grep.c:827 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:827 +#: builtin/grep.c:829 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:829 +#: builtin/grep.c:831 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:832 +#: builtin/grep.c:834 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:834 +#: builtin/grep.c:836 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:836 +#: builtin/grep.c:838 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:837 +#: builtin/grep.c:839 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:839 +#: builtin/grep.c:841 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:841 +#: builtin/grep.c:843 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:844 +#: builtin/grep.c:846 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:847 +#: builtin/grep.c:849 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:851 +#: builtin/grep.c:853 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:852 +#: builtin/grep.c:854 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:857 +#: builtin/grep.c:859 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:864 +#: builtin/grep.c:866 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:876 +#: builtin/grep.c:878 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:878 +#: builtin/grep.c:880 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:880 +#: builtin/grep.c:882 msgid "show parse tree for grep expression" msgstr "visa analysträd för grep-uttryck" -#: builtin/grep.c:884 +#: builtin/grep.c:886 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:884 +#: builtin/grep.c:886 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:950 +#: builtin/grep.c:952 msgid "no pattern given." msgstr "inget mönster angavs." -#: builtin/grep.c:982 +#: builtin/grep.c:984 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index och --untracked kan inte användas med revisioner" -#: builtin/grep.c:989 +#: builtin/grep.c:991 #, c-format msgid "unable to resolve revision: %s" msgstr "kan inte slå upp revision: %s" -#: builtin/grep.c:1023 builtin/index-pack.c:1491 +#: builtin/grep.c:1026 builtin/index-pack.c:1491 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:1028 +#: builtin/grep.c:1031 msgid "no threads support, ignoring --threads" msgstr "trådstöd saknas, ignorerar --threads" -#: builtin/grep.c:1052 +#: builtin/grep.c:1055 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1075 +#: builtin/grep.c:1078 msgid "option not supported with --recurse-submodules." msgstr "flaggan stöds inte med --recurse-submodules." -#: builtin/grep.c:1081 +#: builtin/grep.c:1084 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached och --untracked kan inte användas med --no-index." -#: builtin/grep.c:1087 +#: builtin/grep.c:1090 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:1095 +#: builtin/grep.c:1098 msgid "both --cached and trees are given." msgstr "både --cached och träd angavs." @@ -9141,8 +9222,8 @@ msgstr "allvarlig inflate-inkonsekvens" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:752 builtin/pack-objects.c:168 -#: builtin/pack-objects.c:262 +#: builtin/index-pack.c:752 builtin/pack-objects.c:179 +#: builtin/pack-objects.c:273 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" @@ -9302,21 +9383,21 @@ msgstr[1] "kedjelängd = %d: %lu objekt" msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1705 builtin/index-pack.c:1708 -#: builtin/index-pack.c:1724 builtin/index-pack.c:1728 +#: builtin/index-pack.c:1700 builtin/index-pack.c:1703 +#: builtin/index-pack.c:1719 builtin/index-pack.c:1723 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1744 +#: builtin/index-pack.c:1739 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1746 +#: builtin/index-pack.c:1741 msgid "--stdin requires a git repository" msgstr "--stdin kräver ett git-arkiv" -#: builtin/index-pack.c:1754 +#: builtin/index-pack.c:1749 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" @@ -9513,99 +9594,107 @@ msgstr "git show [<flaggor>] <objekt>..." msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:148 +#: builtin/log.c:151 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: builtin/log.c:149 +#: builtin/log.c:152 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:150 +#: builtin/log.c:153 msgid "Use mail map file" msgstr "Använd e-postmappningsfil" -#: builtin/log.c:151 +#: builtin/log.c:155 +msgid "only decorate refs that match <pattern>" +msgstr "dekorera endast referenser som motsvarar <mönster>" + +#: builtin/log.c:157 +msgid "do not decorate refs that match <pattern>" +msgstr "dekorera inte referenser som motsvarar <mönster>" + +#: builtin/log.c:158 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:154 +#: builtin/log.c:161 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:250 +#: builtin/log.c:257 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:501 +#: builtin/log.c:508 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:516 builtin/log.c:610 +#: builtin/log.c:523 builtin/log.c:617 #, c-format msgid "Could not read object %s" msgstr "Kunde inte läsa objektet %s" -#: builtin/log.c:634 +#: builtin/log.c:641 #, c-format msgid "Unknown type: %d" msgstr "Okänd typ: %d" -#: builtin/log.c:755 +#: builtin/log.c:762 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:856 +#: builtin/log.c:863 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:872 +#: builtin/log.c:879 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte öppna patchfilen %s" -#: builtin/log.c:889 +#: builtin/log.c:896 msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:899 +#: builtin/log.c:906 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:1005 +#: builtin/log.c:1012 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:1085 +#: builtin/log.c:1092 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1112 +#: builtin/log.c:1119 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1162 +#: builtin/log.c:1169 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934 +#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" -#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516 +#: builtin/log.c:1286 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:1284 +#: builtin/log.c:1291 msgid "Could not find exact merge base." msgstr "Kunde inte hitta exakt sammanslagningsbas." -#: builtin/log.c:1288 +#: builtin/log.c:1295 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" @@ -9616,328 +9705,332 @@ msgstr "" "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> " "manuellt." -#: builtin/log.c:1308 +#: builtin/log.c:1315 msgid "Failed to find exact merge base" msgstr "Kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1319 +#: builtin/log.c:1326 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1323 +#: builtin/log.c:1330 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1372 +#: builtin/log.c:1379 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1431 +#: builtin/log.c:1438 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:1434 +#: builtin/log.c:1441 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1438 +#: builtin/log.c:1445 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1440 +#: builtin/log.c:1447 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1442 +#: builtin/log.c:1449 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1443 +#: builtin/log.c:1450 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1444 +#: builtin/log.c:1451 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1446 +#: builtin/log.c:1453 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1448 +#: builtin/log.c:1455 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1450 +#: builtin/log.c:1457 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Använd [RFC PATCH] istället för [PATCH]" -#: builtin/log.c:1453 +#: builtin/log.c:1460 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1456 +#: builtin/log.c:1463 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1459 +#: builtin/log.c:1466 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1462 +#: builtin/log.c:1469 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1464 +#: builtin/log.c:1471 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1466 +#: builtin/log.c:1473 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1468 +#: builtin/log.c:1475 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1470 +#: builtin/log.c:1477 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1471 +#: builtin/log.c:1478 msgid "header" msgstr "huvud" -#: builtin/log.c:1472 +#: builtin/log.c:1479 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1473 builtin/log.c:1475 +#: builtin/log.c:1480 builtin/log.c:1482 msgid "email" msgstr "epost" -#: builtin/log.c:1473 +#: builtin/log.c:1480 msgid "add To: header" msgstr "lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1475 +#: builtin/log.c:1482 msgid "add Cc: header" msgstr "lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1477 +#: builtin/log.c:1484 msgid "ident" msgstr "ident" -#: builtin/log.c:1478 +#: builtin/log.c:1485 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:1480 +#: builtin/log.c:1487 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1481 +#: builtin/log.c:1488 msgid "make first mail a reply to <message-id>" msgstr "gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1482 builtin/log.c:1485 +#: builtin/log.c:1489 builtin/log.c:1492 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1483 +#: builtin/log.c:1490 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1486 +#: builtin/log.c:1493 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1490 +#: builtin/log.c:1497 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1492 +#: builtin/log.c:1499 msgid "signature" msgstr "signatur" -#: builtin/log.c:1493 +#: builtin/log.c:1500 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1494 +#: builtin/log.c:1501 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1495 +#: builtin/log.c:1502 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1497 +#: builtin/log.c:1504 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1498 +#: builtin/log.c:1505 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1500 +#: builtin/log.c:1507 msgid "show progress while generating patches" msgstr "visa förloppsindikator medan patchar skapas" -#: builtin/log.c:1575 +#: builtin/log.c:1582 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1590 +#: builtin/log.c:1597 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1592 +#: builtin/log.c:1599 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt." -#: builtin/log.c:1600 +#: builtin/log.c:1607 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1602 +#: builtin/log.c:1609 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1604 +#: builtin/log.c:1611 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1634 +#: builtin/log.c:1641 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1636 +#: builtin/log.c:1643 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1729 +#: builtin/log.c:1736 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:1761 +#: builtin/log.c:1768 msgid "Generating patches" msgstr "Skapar patchar" -#: builtin/log.c:1805 +#: builtin/log.c:1812 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1855 +#: builtin/log.c:1862 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:1909 +#: builtin/log.c:1916 #, 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:466 +#: builtin/ls-files.c:468 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<flaggor>] [<fil>...]" -#: builtin/ls-files.c:515 +#: builtin/ls-files.c:517 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:519 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:519 +#: builtin/ls-files.c:521 +msgid "use lowercase letters for 'fsmonitor clean' files" +msgstr "använd små bokstäver för \"fsmonitor clean\"-filer" + +#: builtin/ls-files.c:523 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:525 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:527 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:529 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:531 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:534 msgid "show staged contents' object name in the output" msgstr "visa köat innehålls objektnamn i utdata" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:536 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:534 +#: builtin/ls-files.c:538 msgid "show 'other' directories' names only" msgstr "visa endast namn för \"andra\" kataloger" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:540 msgid "show line endings of files" msgstr "visa radslut i filer" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:542 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:541 +#: builtin/ls-files.c:545 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:547 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:549 msgid "skip files matching pattern" msgstr "hoppa över filer som motsvarar mönster" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:552 msgid "exclude patterns are read from <file>" msgstr "exkludera mönster som läses från <fil>" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:555 msgid "read additional per-directory exclude patterns in <file>" msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:557 msgid "add the standard git exclusions" msgstr "lägg till git:s standardexkluderingar" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:560 msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:563 msgid "recurse through submodules" msgstr "rekursera ner i undermoduler" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:565 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:562 +#: builtin/ls-files.c:566 msgid "tree-ish" msgstr "träd-igt" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:567 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:565 +#: builtin/ls-files.c:569 msgid "show debugging data" msgstr "visa felsökningsutdata" @@ -10059,32 +10152,32 @@ msgstr "Tillgängliga strategier är:" msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:200 builtin/pull.c:134 +#: builtin/merge.c:200 builtin/pull.c:137 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:203 builtin/pull.c:137 +#: builtin/merge.c:203 builtin/pull.c:140 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:204 builtin/pull.c:140 +#: builtin/merge.c:204 builtin/pull.c:143 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:206 builtin/pull.c:143 +#: builtin/merge.c:206 builtin/pull.c:146 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:209 builtin/pull.c:146 +#: builtin/merge.c:209 builtin/pull.c:152 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:211 builtin/pull.c:149 +#: builtin/merge.c:211 builtin/pull.c:155 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:213 builtin/pull.c:152 +#: builtin/merge.c:213 builtin/pull.c:158 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" @@ -10092,28 +10185,28 @@ msgstr "redigera meddelande innan incheckning" msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:216 builtin/pull.c:158 +#: builtin/merge.c:216 builtin/pull.c:164 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:220 builtin/pull.c:161 +#: builtin/merge.c:220 builtin/pull.c:167 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:221 builtin/notes.c:777 builtin/pull.c:165 +#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171 #: builtin/revert.c:109 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:222 builtin/pull.c:166 +#: builtin/merge.c:222 builtin/pull.c:172 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:223 builtin/pull.c:169 +#: builtin/merge.c:223 builtin/pull.c:175 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:224 builtin/pull.c:170 +#: builtin/merge.c:224 builtin/pull.c:176 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" @@ -10129,7 +10222,7 @@ msgstr "avbryt den pågående sammanslagningen" msgid "continue the current in-progress merge" msgstr "fortsätt den pågående sammanslagningen" -#: builtin/merge.c:234 builtin/pull.c:177 +#: builtin/merge.c:234 builtin/pull.c:183 msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" @@ -10168,43 +10261,43 @@ msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:456 +#: builtin/merge.c:455 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:546 +#: builtin/merge.c:545 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:666 +#: builtin/merge.c:667 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:680 +#: builtin/merge.c:681 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:695 +#: builtin/merge.c:696 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:747 +#: builtin/merge.c:748 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:756 +#: builtin/merge.c:757 #, 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:762 +#: builtin/merge.c:763 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -10220,69 +10313,69 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:798 +#: builtin/merge.c:799 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:818 +#: builtin/merge.c:819 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:871 +#: builtin/merge.c:872 #, 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:910 +#: builtin/merge.c:911 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:912 +#: builtin/merge.c:913 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:914 +#: builtin/merge.c:915 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:919 +#: builtin/merge.c:920 #, 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:972 +#: builtin/merge.c:973 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1073 +#: builtin/merge.c:1075 #, 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:1107 +#: builtin/merge.c:1109 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1172 +#: builtin/merge.c:1174 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1176 +#: builtin/merge.c:1178 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1188 +#: builtin/merge.c:1190 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1192 +#: builtin/merge.c:1194 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1208 +#: builtin/merge.c:1210 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10290,7 +10383,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1215 +#: builtin/merge.c:1217 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10298,114 +10391,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:1218 +#: builtin/merge.c:1220 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:1227 +#: builtin/merge.c:1229 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1235 +#: builtin/merge.c:1237 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1252 +#: builtin/merge.c:1254 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1254 +#: builtin/merge.c:1256 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:1259 +#: builtin/merge.c:1261 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1261 +#: builtin/merge.c:1263 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:1295 +#: builtin/merge.c:1297 #, 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:1298 +#: builtin/merge.c:1300 #, 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:1301 +#: builtin/merge.c:1303 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: builtin/merge.c:1304 +#: builtin/merge.c:1306 #, 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:1366 +#: builtin/merge.c:1368 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1375 +#: builtin/merge.c:1377 msgid "Already up to date." msgstr "Redan à jour." -#: builtin/merge.c:1385 +#: builtin/merge.c:1387 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1426 +#: builtin/merge.c:1428 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1433 +#: builtin/merge.c:1435 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1458 +#: builtin/merge.c:1460 msgid "Already up to date. Yeeah!" msgstr "Redan à jour. Toppen!" -#: builtin/merge.c:1464 +#: builtin/merge.c:1466 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1487 builtin/merge.c:1566 +#: builtin/merge.c:1489 builtin/merge.c:1568 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1491 +#: builtin/merge.c:1493 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1557 +#: builtin/merge.c:1559 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1559 +#: builtin/merge.c:1561 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1568 +#: builtin/merge.c:1570 #, 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:1580 +#: builtin/merge.c:1582 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -10431,23 +10524,23 @@ msgstr "git merge-base --is-ancestor <incheckning> <incheckning>" msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <ref> [<incheckning>]" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:220 msgid "output all common ancestors" msgstr "skriv ut alla gemensamma anfäder" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:222 msgid "find ancestors for a single n-way merge" msgstr "hitta anfader för enkel n-vägssammanslagning" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:224 msgid "list revs not reachable from others" msgstr "visa revisioner som inte kan nås från andra" -#: builtin/merge-base.c:224 +#: builtin/merge-base.c:226 msgid "is the first one ancestor of the other?" msgstr "är den första anfader till den andra?" -#: builtin/merge-base.c:226 +#: builtin/merge-base.c:228 msgid "find where <commit> forked from reflog of <ref>" msgstr "se var <incheckning> grenades av från referensloggen från <ref>" @@ -10728,8 +10821,8 @@ msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]" #: builtin/notes.c:36 -msgid "git notes [--ref <notes-ref>] prune [-n | -v]" -msgstr "git notes [--ref <anteckningsref>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" +msgstr "git notes [--ref <anteckningsref>] prune [-n] [-v]" #: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] get-ref" @@ -11070,7 +11163,7 @@ msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel" msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146 +#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" @@ -11091,187 +11184,195 @@ msgstr "använd anteckningar från <anteckningsref>" msgid "unknown subcommand: %s" msgstr "okänt underkommando: %s" -#: builtin/pack-objects.c:31 +#: builtin/pack-objects.c:33 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:32 +#: builtin/pack-objects.c:34 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:181 builtin/pack-objects.c:184 +#: builtin/pack-objects.c:192 builtin/pack-objects.c:195 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: builtin/pack-objects.c:777 +#: builtin/pack-objects.c:788 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:790 +#: builtin/pack-objects.c:801 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1070 +#: builtin/pack-objects.c:1081 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:2440 +#: builtin/pack-objects.c:2451 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2849 +#: builtin/pack-objects.c:2599 +msgid "invalid value for --missing" +msgstr "ogiltigt värde för --missing" + +#: builtin/pack-objects.c:2902 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2853 +#: builtin/pack-objects.c:2906 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:2936 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2938 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:2887 +#: builtin/pack-objects.c:2940 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2890 +#: builtin/pack-objects.c:2943 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2944 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2892 +#: builtin/pack-objects.c:2945 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:2948 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2950 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:2952 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2901 +#: builtin/pack-objects.c:2954 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:2903 +#: builtin/pack-objects.c:2956 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:2905 +#: builtin/pack-objects.c:2958 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:2907 +#: builtin/pack-objects.c:2960 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:2909 +#: builtin/pack-objects.c:2962 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2964 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2966 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:2915 +#: builtin/pack-objects.c:2968 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:2917 +#: builtin/pack-objects.c:2970 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2972 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:2922 +#: builtin/pack-objects.c:2975 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:2925 +#: builtin/pack-objects.c:2978 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:2981 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:2931 +#: builtin/pack-objects.c:2984 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:2933 +#: builtin/pack-objects.c:2986 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:2935 +#: builtin/pack-objects.c:2988 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:2937 +#: builtin/pack-objects.c:2990 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:2939 +#: builtin/pack-objects.c:2992 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:2942 +#: builtin/pack-objects.c:2995 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:2944 +#: builtin/pack-objects.c:2997 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:2946 +#: builtin/pack-objects.c:2999 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:3001 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:2950 +#: builtin/pack-objects.c:3003 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:2952 +#: builtin/pack-objects.c:3005 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:2954 +#: builtin/pack-objects.c:3007 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:3081 +#: builtin/pack-objects.c:3010 +msgid "handling for missing objects" +msgstr "hantering av saknade objekt" + +#: builtin/pack-objects.c:3144 msgid "Counting objects" msgstr "Räknar objekt" @@ -11296,8 +11397,8 @@ msgid "Removing duplicate objects" msgstr "Tar bort duplicerade objekt" #: builtin/prune.c:11 -msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" -msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]" +msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" +msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]" #: builtin/prune.c:106 msgid "report pruned objects" @@ -11320,40 +11421,40 @@ msgstr "Felaktigt värde för %s: %s" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/pull.c:124 +#: builtin/pull.c:127 msgid "control for recursive fetching of submodules" msgstr "styrning för rekursiv hämtning av undermoduler" -#: builtin/pull.c:128 +#: builtin/pull.c:131 msgid "Options related to merging" msgstr "Alternativ gällande sammanslagning" -#: builtin/pull.c:131 +#: builtin/pull.c:134 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:21 builtin/revert.c:121 +#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121 msgid "allow fast-forward" msgstr "tillåt snabbspolning" -#: builtin/pull.c:164 +#: builtin/pull.c:170 msgid "automatically stash/stash pop before and after rebase" msgstr "utför automatiskt stash/stash pop före och efter ombasering" -#: builtin/pull.c:180 +#: builtin/pull.c:186 msgid "Options related to fetching" msgstr "Alternativ gällande hämtningar" -#: builtin/pull.c:198 +#: builtin/pull.c:204 msgid "number of submodules pulled in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/pull.c:287 +#: builtin/pull.c:299 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Felaktigt värde för pull.ff: %s" -#: builtin/pull.c:403 +#: builtin/pull.c:415 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -11361,14 +11462,14 @@ msgstr "" "Det finns ingen kandidat för ombasering bland referenserna du precis har " "hämtat." -#: builtin/pull.c:405 +#: builtin/pull.c:417 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:406 +#: builtin/pull.c:418 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -11376,7 +11477,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:409 +#: builtin/pull.c:421 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -11387,42 +11488,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:414 git-parse-remote.sh:73 +#: builtin/pull.c:426 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:416 builtin/pull.c:431 git-parse-remote.sh:79 +#: builtin/pull.c:428 builtin/pull.c:443 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:418 builtin/pull.c:433 git-parse-remote.sh:82 +#: builtin/pull.c:430 builtin/pull.c:445 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:419 builtin/pull.c:434 +#: builtin/pull.c:431 builtin/pull.c:446 msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." -#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436 +#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<fjärr>" -#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466 +#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<gren>" -#: builtin/pull.c:429 git-parse-remote.sh:75 +#: builtin/pull.c:441 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:438 git-parse-remote.sh:95 +#: builtin/pull.c:450 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:443 +#: builtin/pull.c:455 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -11431,27 +11532,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:796 +#: builtin/pull.c:817 msgid "ignoring --verify-signatures for rebase" msgstr "ignorera --verify-signatures för ombasering" -#: builtin/pull.c:844 +#: builtin/pull.c:865 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash är endast giltig med --rebase." -#: builtin/pull.c:852 +#: builtin/pull.c:873 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:855 +#: builtin/pull.c:876 msgid "pull with rebase" msgstr "pull med ombasering" -#: builtin/pull.c:856 +#: builtin/pull.c:877 msgid "please commit or stash them." msgstr "checka in eller använd \"stash\" på dem." -#: builtin/pull.c:881 +#: builtin/pull.c:902 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11462,7 +11563,7 @@ msgstr "" "snabbspolar din arbetskatalog från\n" "incheckningen %s." -#: builtin/pull.c:886 +#: builtin/pull.c:907 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11479,15 +11580,15 @@ msgstr "" "$ git reset --hard\n" "för att återgå." -#: builtin/pull.c:901 +#: builtin/pull.c:922 msgid "Cannot merge multiple branches into empty head." msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: builtin/pull.c:905 +#: builtin/pull.c:926 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpå flera grenar." -#: builtin/pull.c:912 +#: builtin/pull.c:933 msgid "cannot rebase with locally recorded submodule modifications" msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" @@ -11495,15 +11596,15 @@ msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/push.c:90 +#: builtin/push.c:92 msgid "tag shorthand without <tag>" msgstr "taggförkortning utan <tagg>" -#: builtin/push.c:100 +#: builtin/push.c:102 msgid "--delete only accepts plain target ref names" msgstr "--delete godtar endast enkla målreferensnamn" -#: builtin/push.c:144 +#: builtin/push.c:146 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -11512,7 +11613,7 @@ msgstr "" "För att välja ett av alternativen permanent, se push.default i \"git help " "config\"." -#: builtin/push.c:147 +#: builtin/push.c:149 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -11537,7 +11638,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:162 +#: builtin/push.c:164 #, c-format msgid "" "You are not currently on a branch.\n" @@ -11552,7 +11653,7 @@ msgstr "" "\n" " git push %s HEAD:<namn-på-fjärrgren>\n" -#: builtin/push.c:176 +#: builtin/push.c:178 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -11565,12 +11666,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:184 +#: builtin/push.c:186 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända." -#: builtin/push.c:187 +#: builtin/push.c:189 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -11581,14 +11682,14 @@ msgstr "" "aktuella grenen \"%s\", utan att tala om för mig vad som\n" "skall sändas för att uppdatera fjärrgrenen." -#: builtin/push.c:246 +#: builtin/push.c:248 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Du angav inga referensspecifikationer att sända, och push.default är " "\"nothing\"." -#: builtin/push.c:253 +#: builtin/push.c:255 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -11600,7 +11701,7 @@ msgstr "" "\"git pull ....\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:259 +#: builtin/push.c:261 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -11612,7 +11713,7 @@ msgstr "" "\"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:265 +#: builtin/push.c:267 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -11626,11 +11727,11 @@ msgstr "" "(t.ex. \"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer." -#: builtin/push.c:272 +#: builtin/push.c:274 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren." -#: builtin/push.c:275 +#: builtin/push.c:277 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -11641,22 +11742,22 @@ msgstr "" "pekar på något som inte är en incheckning, utan att använda flaggan\n" "\"--force\".\n" -#: builtin/push.c:335 +#: builtin/push.c:337 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:339 +#: builtin/push.c:341 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:370 +#: builtin/push.c:372 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:371 +#: builtin/push.c:373 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -11677,114 +11778,114 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:389 +#: builtin/push.c:391 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:390 +#: builtin/push.c:392 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:395 +#: builtin/push.c:397 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:396 +#: builtin/push.c:398 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:401 +#: builtin/push.c:403 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:523 +#: builtin/push.c:535 msgid "repository" msgstr "arkiv" -#: builtin/push.c:524 builtin/send-pack.c:163 +#: builtin/push.c:536 builtin/send-pack.c:163 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:525 builtin/send-pack.c:165 +#: builtin/push.c:537 builtin/send-pack.c:165 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:527 +#: builtin/push.c:539 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:528 +#: builtin/push.c:540 msgid "push tags (can't be used with --all or --mirror)" msgstr "sänd taggar (kan inte användas med --all eller --mirror)" -#: builtin/push.c:531 builtin/send-pack.c:166 +#: builtin/push.c:543 builtin/send-pack.c:166 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:533 builtin/send-pack.c:180 +#: builtin/push.c:545 builtin/send-pack.c:180 msgid "refname>:<expect" msgstr "refnamn>:<förvänta" -#: builtin/push.c:534 builtin/send-pack.c:181 +#: builtin/push.c:546 builtin/send-pack.c:181 msgid "require old value of ref to be at this value" msgstr "kräv att ref:s tidigare värde är detta" -#: builtin/push.c:537 +#: builtin/push.c:549 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:539 builtin/send-pack.c:174 +#: builtin/push.c:551 builtin/send-pack.c:174 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160 +#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160 #: builtin/send-pack.c:161 msgid "receive pack program" msgstr "program för att ta emot paket" -#: builtin/push.c:542 +#: builtin/push.c:554 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:545 +#: builtin/push.c:557 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:547 +#: builtin/push.c:559 msgid "bypass pre-push hook" msgstr "förbigå pre-push-krok" -#: builtin/push.c:548 +#: builtin/push.c:560 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:551 builtin/send-pack.c:168 +#: builtin/push.c:563 builtin/send-pack.c:168 msgid "GPG sign the push" msgstr "GPG-signera insändningen" -#: builtin/push.c:553 builtin/send-pack.c:175 +#: builtin/push.c:565 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" msgstr "begär atomiska transaktioner på fjärrsidan" -#: builtin/push.c:554 builtin/send-pack.c:171 +#: builtin/push.c:566 builtin/send-pack.c:171 msgid "server-specific" msgstr "serverspecifik" -#: builtin/push.c:554 builtin/send-pack.c:172 +#: builtin/push.c:566 builtin/send-pack.c:172 msgid "option to transmit" msgstr "" "inget att checka in\n" "flagga att sända" -#: builtin/push.c:568 +#: builtin/push.c:583 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är inkompatibel med --all, --mirror och --tags" -#: builtin/push.c:570 +#: builtin/push.c:585 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" -#: builtin/push.c:589 +#: builtin/push.c:604 msgid "push options must not have new line characters" msgstr "push-flaggor kan inte innehålla radbrytning" @@ -11866,47 +11967,51 @@ msgstr "felsök unpack-trees" msgid "git rebase--helper [<options>]" msgstr "git rebase--helper [<flaggor>]" -#: builtin/rebase--helper.c:22 +#: builtin/rebase--helper.c:24 msgid "keep empty commits" msgstr "behåll tomma incheckningar" -#: builtin/rebase--helper.c:23 +#: builtin/rebase--helper.c:25 msgid "continue rebase" msgstr "fortsätt ombasering" -#: builtin/rebase--helper.c:25 +#: builtin/rebase--helper.c:27 msgid "abort rebase" msgstr "avbryt ombasering" -#: builtin/rebase--helper.c:28 +#: builtin/rebase--helper.c:30 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" +msgid "shorten commit ids in the todo list" +msgstr "förkorta inchecknings-id i todo-listan" #: builtin/rebase--helper.c:34 +msgid "expand commit ids in the todo list" +msgstr "utöka inchecknings-id i todo-listan" + +#: builtin/rebase--helper.c:36 msgid "check the todo list" msgstr "kontrollera todo-listan" -#: builtin/rebase--helper.c:36 +#: builtin/rebase--helper.c:38 msgid "skip unnecessary picks" msgstr "hoppa över onödiga \"pick\"-kommandon" -#: builtin/rebase--helper.c:38 +#: builtin/rebase--helper.c:40 msgid "rearrange fixup/squash lines" msgstr "ordna om fixup-/squash-rader" -#: builtin/receive-pack.c:29 +#: builtin/rebase--helper.c:42 +msgid "insert exec commands in todo list" +msgstr "lägg in exec-kommandon i todo-listan" + +#: builtin/receive-pack.c:30 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-katalog>" -#: builtin/receive-pack.c:839 +#: builtin/receive-pack.c:840 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" @@ -11936,7 +12041,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:859 +#: builtin/receive-pack.c:860 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" @@ -11957,20 +12062,15 @@ msgstr "" "\n" "För att undvika detta meddelande kan du sätta det till \"refuse\"." -#: builtin/receive-pack.c:1932 +#: builtin/receive-pack.c:1933 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:1946 +#: builtin/receive-pack.c:1947 msgid "You must specify a directory." msgstr "Du måste ange en katalog." -#: builtin/reflog.c:424 -#, c-format -msgid "'%s' for '%s' is not a valid timestamp" -msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" - -#: builtin/reflog.c:541 builtin/reflog.c:546 +#: builtin/reflog.c:531 builtin/reflog.c:536 #, c-format msgid "'%s' is not a valid timestamp" msgstr "\"%s\" är inte en giltig tidsstämpel" @@ -12573,7 +12673,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:134 +#: builtin/repack.c:406 builtin/worktree.c:146 #, c-format msgid "failed to remove '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -12799,10 +12899,23 @@ msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-list.c:361 +#: builtin/rev-list.c:399 +msgid "object filtering requires --objects" +msgstr "objektfiltrering kräver --objects" + +#: builtin/rev-list.c:402 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "ogiltigt värde för sparse: \"%s\"" + +#: builtin/rev-list.c:442 msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" +#: builtin/rev-list.c:445 +msgid "cannot combine --use-bitmap-index with object filtering" +msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering" + #: builtin/rev-parse.c:402 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]" @@ -13250,35 +13363,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:24 builtin/submodule--helper.c:1094 +#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103 +#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" -#: builtin/submodule--helper.c:71 +#: builtin/submodule--helper.c:81 #, 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:302 builtin/submodule--helper.c:623 +#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" -#: builtin/submodule--helper.c:307 +#: builtin/submodule--helper.c:375 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374 +#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449 #, 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:389 +#: builtin/submodule--helper.c:464 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " @@ -13287,79 +13400,109 @@ msgstr "" "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sn eget " "officiella uppström." -#: builtin/submodule--helper.c:400 +#: builtin/submodule--helper.c:475 #, 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:404 +#: builtin/submodule--helper.c:479 #, 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:414 +#: builtin/submodule--helper.c:489 #, 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:421 +#: builtin/submodule--helper.c:496 #, 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:437 +#: builtin/submodule--helper.c:518 msgid "Suppress output for initializing a submodule" msgstr "Dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:442 +#: builtin/submodule--helper.c:523 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<sökväg>]" -#: builtin/submodule--helper.c:470 -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper name <sökväg>" - -#: builtin/submodule--helper.c:475 +#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713 #, 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:558 builtin/submodule--helper.c:561 +#: builtin/submodule--helper.c:626 +#, c-format +msgid "could not resolve HEAD ref inside the submodule '%s'" +msgstr "kunde inte bestämma HEAD:s incheckning i undermodulen \"%s\"" + +#: builtin/submodule--helper.c:653 +#, c-format +msgid "failed to recurse into submodule '%s'" +msgstr "misslyckades rekursera in i undermodulen \"%s\"" + +#: builtin/submodule--helper.c:677 +msgid "Suppress submodule status output" +msgstr "Hindra statusutskrift för undermodul" + +#: builtin/submodule--helper.c:678 +msgid "" +"Use commit stored in the index instead of the one stored in the submodule " +"HEAD" +msgstr "" +"Visa incheckning från indexet istället för den som lagrats i undermodulens " +"HEAD" + +#: builtin/submodule--helper.c:679 +msgid "recurse into nested submodules" +msgstr "rekursera in i nästlade undermoduler" + +#: builtin/submodule--helper.c:684 +msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" +msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]" + +#: builtin/submodule--helper.c:708 +msgid "git submodule--helper name <path>" +msgstr "git submodule--helper name <sökväg>" + +#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:835 #, 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:604 +#: builtin/submodule--helper.c:842 #, 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:626 +#: builtin/submodule--helper.c:864 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen skall klonas till" -#: builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:867 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:632 +#: builtin/submodule--helper.c:870 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:638 +#: builtin/submodule--helper.c:876 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012 +#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250 msgid "force cloning progress" msgstr "tvinga kloningsförlopp" -#: builtin/submodule--helper.c:646 +#: builtin/submodule--helper.c:884 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -13367,82 +13510,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:677 +#: builtin/submodule--helper.c:915 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsökvägen ”%s”" -#: builtin/submodule--helper.c:692 +#: builtin/submodule--helper.c:930 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" -#: builtin/submodule--helper.c:757 +#: builtin/submodule--helper.c:995 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:761 +#: builtin/submodule--helper.c:999 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:790 +#: builtin/submodule--helper.c:1028 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:819 +#: builtin/submodule--helper.c:1057 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" -#: builtin/submodule--helper.c:952 +#: builtin/submodule--helper.c:1190 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" -#: builtin/submodule--helper.c:963 +#: builtin/submodule--helper.c:1201 #, 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:993 builtin/submodule--helper.c:1213 +#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:996 +#: builtin/submodule--helper.c:1234 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:1000 +#: builtin/submodule--helper.c:1238 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:1004 +#: builtin/submodule--helper.c:1242 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:1007 +#: builtin/submodule--helper.c:1245 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:1009 +#: builtin/submodule--helper.c:1247 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:1010 +#: builtin/submodule--helper.c:1248 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:1017 +#: builtin/submodule--helper.c:1255 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:1030 +#: builtin/submodule--helper.c:1268 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:1098 +#: builtin/submodule--helper.c:1336 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -13451,20 +13594,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:1214 +#: builtin/submodule--helper.c:1452 msgid "recurse into submodules" msgstr "rekursera ner i undermoduler" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1458 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<sökväg>...]" -#: builtin/submodule--helper.c:1278 +#: builtin/submodule--helper.c:1517 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" -#: builtin/submodule--helper.c:1284 +#: builtin/submodule--helper.c:1523 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -13706,188 +13849,204 @@ msgstr "Uppdaterad tagg \"%s\" (var %s)\n" msgid "Unpacking objects" msgstr "Packar upp objekt" -#: builtin/update-index.c:80 +#: builtin/update-index.c:82 #, c-format msgid "failed to create directory %s" msgstr "misslyckades skapa katalogen %s" -#: builtin/update-index.c:86 +#: builtin/update-index.c:88 #, c-format msgid "failed to stat %s" msgstr "misslyckades ta status på %s" -#: builtin/update-index.c:96 +#: builtin/update-index.c:98 #, c-format msgid "failed to create file %s" msgstr "misslyckades skapa filen %s" -#: builtin/update-index.c:104 +#: builtin/update-index.c:106 #, c-format msgid "failed to delete file %s" msgstr "misslyckades ta bort filen %s" -#: builtin/update-index.c:111 builtin/update-index.c:217 +#: builtin/update-index.c:113 builtin/update-index.c:219 #, c-format msgid "failed to delete directory %s" msgstr "misslyckades ta bort katalogen %s" -#: builtin/update-index.c:136 +#: builtin/update-index.c:138 #, c-format msgid "Testing mtime in '%s' " msgstr "Testar mtime i \"%s\" " -#: builtin/update-index.c:150 +#: builtin/update-index.c:152 msgid "directory stat info does not change after adding a new file" msgstr "stat-informationen för en katalog ändras inte när nya filer läggs till" -#: builtin/update-index.c:163 +#: builtin/update-index.c:165 msgid "directory stat info does not change after adding a new directory" msgstr "" "stat-informationen för en katalog ändras inte när nya kataloger läggs till" -#: builtin/update-index.c:176 +#: builtin/update-index.c:178 msgid "directory stat info changes after updating a file" msgstr "stat-informationen för en katalog ändras när filer uppdateras" -#: builtin/update-index.c:187 +#: builtin/update-index.c:189 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "stat-informationen för en katalog ändras när filer läggs till i en " "underkatalog" -#: builtin/update-index.c:198 +#: builtin/update-index.c:200 msgid "directory stat info does not change after deleting a file" msgstr "stat-informationen för en katalog ändras inte när en fil tas bort" -#: builtin/update-index.c:211 +#: builtin/update-index.c:213 msgid "directory stat info does not change after deleting a directory" msgstr "stat-informationen för en katalog ändras inte när en katalog tas bort" -#: builtin/update-index.c:218 +#: builtin/update-index.c:220 msgid " OK" msgstr " OK" -#: builtin/update-index.c:571 +#: builtin/update-index.c:579 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<flaggor>] [--] [<fil>...]" -#: builtin/update-index.c:926 +#: builtin/update-index.c:936 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är àjour" -#: builtin/update-index.c:929 +#: builtin/update-index.c:939 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:932 +#: builtin/update-index.c:942 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:934 +#: builtin/update-index.c:944 msgid "let files replace directories and vice-versa" msgstr "låt filer ersätta kataloger och omvänt" -#: builtin/update-index.c:936 +#: builtin/update-index.c:946 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:938 +#: builtin/update-index.c:948 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" -#: builtin/update-index.c:941 +#: builtin/update-index.c:951 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:945 +#: builtin/update-index.c:955 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:949 +#: builtin/update-index.c:959 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:950 +#: builtin/update-index.c:960 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:959 +#: builtin/update-index.c:969 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:962 +#: builtin/update-index.c:972 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:965 +#: builtin/update-index.c:975 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:968 +#: builtin/update-index.c:978 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:971 +#: builtin/update-index.c:981 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:973 +#: builtin/update-index.c:983 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:975 +#: builtin/update-index.c:985 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:977 +#: builtin/update-index.c:987 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:981 +#: builtin/update-index.c:991 msgid "add entries from standard input to the index" msgstr "lägg poster från standard in till indexet" -#: builtin/update-index.c:985 +#: builtin/update-index.c:995 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:989 +#: builtin/update-index.c:999 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: builtin/update-index.c:993 +#: builtin/update-index.c:1003 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:996 +#: builtin/update-index.c:1006 msgid "report actions to standard output" msgstr "rapportera åtgärder på standard ut" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1008 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:1012 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1014 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1016 msgid "enable/disable untracked cache" msgstr "aktivera/inaktivera ospårad cache" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1018 msgid "test if the filesystem supports untracked cache" msgstr "testa om filsystemet stöder ospårad cache" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:1020 msgid "enable untracked cache without testing the filesystem" msgstr "aktivera ospårad cache utan att testa filsystemet" -#: builtin/update-index.c:1107 +#: builtin/update-index.c:1022 +msgid "write out the index even if is not flagged as changed" +msgstr "skriv ut indexet även om det inte angivits som ändrat" + +#: builtin/update-index.c:1024 +msgid "enable or disable file system monitor" +msgstr "aktivera eller inaktivera filsystemsövervakning" + +#: builtin/update-index.c:1026 +msgid "mark files as fsmonitor valid" +msgstr "markera filer som \"fsmonitor valid\"" + +#: builtin/update-index.c:1029 +msgid "clear fsmonitor valid bit" +msgstr "töm \"fsmonitor valid\"-bit" + +#: builtin/update-index.c:1127 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -13895,7 +14054,7 @@ msgstr "" "core.splitIndex är satt till false; ta bort eller ändra det om du verkligen " "vill aktivera delat index" -#: builtin/update-index.c:1116 +#: builtin/update-index.c:1136 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -13903,7 +14062,7 @@ msgstr "" "core.splitIndex är satt till true; ta bort eller ändra det om du verkligen " "vill inaktivera delat index" -#: builtin/update-index.c:1127 +#: builtin/update-index.c:1147 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -13911,11 +14070,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:1131 +#: builtin/update-index.c:1151 msgid "Untracked cache disabled" msgstr "Ospårad cache är inaktiverad" -#: builtin/update-index.c:1139 +#: builtin/update-index.c:1159 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -13923,11 +14082,29 @@ 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:1143 +#: builtin/update-index.c:1163 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Ospårad cache är aktiverad för \"%s\"" +#: builtin/update-index.c:1171 +msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" +msgstr "core.fsmonitor inte satt; sätt om du verkligen vill aktivera fsmonitor" + +#: builtin/update-index.c:1175 +msgid "fsmonitor enabled" +msgstr "fsmonitor aktiverat" + +#: builtin/update-index.c:1178 +msgid "" +"core.fsmonitor is set; remove it if you really want to disable fsmonitor" +msgstr "" +"core.fsmonitor är satt; ta bort om du verkligen vill inaktivera fsmonitor" + +#: builtin/update-index.c:1182 +msgid "fsmonitor disabled" +msgstr "fsmonitor inaktiverat" + #: builtin/update-ref.c:10 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<flaggor>] -d <refnamn> [<gammaltvärde>]" @@ -13996,42 +14173,42 @@ msgstr "git verify-tag [-v | --verbose] [--format=<format] <tagg>..." msgid "print tag contents" msgstr "visa innehåll för tag" -#: builtin/worktree.c:16 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<branch>]" msgstr "git worktree add [<flaggor>] <sökväg> [<gren>]" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<flaggor>]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<flaggor>] <sökväg>" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<flaggor>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree unlock <path>" msgstr "git worktree unlock <sökväg>" -#: builtin/worktree.c:46 +#: builtin/worktree.c:58 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Tar bort worktrees/%s: inte en giltig katalog" -#: builtin/worktree.c:52 +#: builtin/worktree.c:64 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte" -#: builtin/worktree.c:57 builtin/worktree.c:66 +#: builtin/worktree.c:69 builtin/worktree.c:78 #, 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:76 +#: builtin/worktree.c:88 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -14040,88 +14217,100 @@ msgstr "" "Tar bort worktrees/%s: kort läsning (förväntade %<PRIuMAX> byte, läste " "%<PRIuMAX>)" -#: builtin/worktree.c:84 +#: builtin/worktree.c:96 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" -#: builtin/worktree.c:100 +#: builtin/worktree.c:112 #, 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:147 +#: builtin/worktree.c:159 msgid "report pruned working trees" msgstr "rapportera borttagna arbetskataloger" -#: builtin/worktree.c:149 +#: builtin/worktree.c:161 msgid "expire working trees older than <time>" msgstr "låt tid gå ut för arbetskataloger äldre än <tid>" -#: builtin/worktree.c:223 +#: builtin/worktree.c:236 #, c-format msgid "'%s' already exists" msgstr "\"%s\" finns redan" -#: builtin/worktree.c:254 +#: builtin/worktree.c:267 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:293 +#: builtin/worktree.c:306 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Förbereder %s (identifieraren %s)" -#: builtin/worktree.c:345 +#: builtin/worktree.c:368 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:347 +#: builtin/worktree.c:370 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:349 +#: builtin/worktree.c:372 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:351 +#: builtin/worktree.c:374 msgid "populate the new working tree" msgstr "befolka den nya arbetskatalogen" -#: builtin/worktree.c:352 +#: builtin/worktree.c:375 msgid "keep the new working tree locked" msgstr "låt arbetskatalogen förbli låst" -#: builtin/worktree.c:360 +#: builtin/worktree.c:377 +msgid "set up tracking mode (see git-branch(1))" +msgstr "ställ in spårningsläge (se git-branch(1))" + +#: builtin/worktree.c:380 +msgid "try to match the new branch name with a remote-tracking branch" +msgstr "försök matcha namn på ny gren mot en fjärrspårande gren" + +#: builtin/worktree.c:388 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" -#: builtin/worktree.c:499 +#: builtin/worktree.c:453 +msgid "--[no-]track can only be used if a new branch is created" +msgstr "--[no-]track kan endast användas när ny gran skapas" + +#: builtin/worktree.c:553 msgid "reason for locking" msgstr "orsak till lås" -#: builtin/worktree.c:511 builtin/worktree.c:544 +#: builtin/worktree.c:565 builtin/worktree.c:598 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:513 builtin/worktree.c:546 +#: builtin/worktree.c:567 builtin/worktree.c:600 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:518 +#: builtin/worktree.c:572 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:520 +#: builtin/worktree.c:574 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:548 +#: builtin/worktree.c:602 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" @@ -14142,23 +14331,23 @@ msgstr "visa trädobjekt för underkatalogen <prefix>" msgid "only useful for debugging" msgstr "endast användbart vid felsökning" -#: upload-pack.c:23 +#: upload-pack.c:24 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<flaggor>] <katalog>" -#: upload-pack.c:1040 +#: upload-pack.c:1041 msgid "quit after a single request/response exchange" msgstr "avsluta omedelbart efter första anrop/svar-utväxling" -#: upload-pack.c:1042 +#: upload-pack.c:1043 msgid "exit immediately after initial ref advertisement" msgstr "avsluta omedelbart efter inledande kungörelse av referenser" -#: upload-pack.c:1044 +#: upload-pack.c:1045 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:1046 +#: upload-pack.c:1047 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "avbryt överföringen efter <n> sekunders inaktivitet" @@ -14189,20 +14378,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:338 +#: http.c:339 #, 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:359 +#: http.c:360 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Delegerad styrning stöds inte av cURL < 7.22.0" -#: http.c:368 +#: http.c:369 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:1768 +#: http.c:1791 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14218,6 +14407,14 @@ msgstr "" msgid "redirecting to %s" msgstr "omdirigerar till %s" +#: list-objects-filter-options.h:54 +msgid "args" +msgstr "argument" + +#: list-objects-filter-options.h:55 +msgid "object filtering" +msgstr "objektfiltrering" + #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "starta arbetskatalog (se också: git help tutorial)" @@ -14393,27 +14590,27 @@ msgstr "Felaktigt HEAD - konstig symbolisk referens" msgid "Bad bisect_write argument: $state" msgstr "Felaktigt argument till bisect_write: $state" -#: git-bisect.sh:262 +#: git-bisect.sh:246 #, sh-format msgid "Bad rev input: $arg" msgstr "Felaktig rev-indata: $arg" -#: git-bisect.sh:281 +#: git-bisect.sh:265 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "Felaktig rev-indata: $bisected_head" -#: git-bisect.sh:290 +#: git-bisect.sh:274 #, sh-format msgid "Bad rev input: $rev" msgstr "Felaktig rev-indata: $rev" -#: git-bisect.sh:299 +#: git-bisect.sh:283 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "\"git bisect $TERM_BAD\" kan bara ta ett argument." -#: git-bisect.sh:322 +#: git-bisect.sh:306 #, sh-format msgid "Warning: bisecting only with a $TERM_BAD commit." msgstr "" @@ -14422,11 +14619,11 @@ msgstr "" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:328 +#: git-bisect.sh:312 msgid "Are you sure [Y/n]? " msgstr "Är du säker [Y=ja/N=nej]? " -#: git-bisect.sh:340 +#: git-bisect.sh:324 #, sh-format msgid "" "You need to give me at least one $bad_syn and one $good_syn revision.\n" @@ -14437,7 +14634,7 @@ msgstr "" "(Du kan använda \"git bisect $bad_syn\" och \"git bisect $good_syn\" för " "detta.)" -#: git-bisect.sh:343 +#: git-bisect.sh:327 #, sh-format msgid "" "You need to start by \"git bisect start\".\n" @@ -14450,16 +14647,16 @@ msgstr "" "(Du kan använda \"git bisect $bad_syn\" och \"git bisect $good_syn\" för " "detta.)" -#: git-bisect.sh:414 git-bisect.sh:546 +#: git-bisect.sh:398 git-bisect.sh:512 msgid "We are not bisecting." msgstr "Vi utför ingen bisect för tillfället." -#: git-bisect.sh:421 +#: git-bisect.sh:405 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "\"$invalid\" är inte en giltig incheckning" -#: git-bisect.sh:430 +#: git-bisect.sh:414 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" @@ -14468,25 +14665,29 @@ msgstr "" "Kunde inte checka ut original-HEAD \"$branch\".\n" "Försök \"git bisect reset <incheckning>\"." -#: git-bisect.sh:458 +#: git-bisect.sh:422 msgid "No logfile given" msgstr "Ingen loggfil angiven" -#: git-bisect.sh:459 +#: git-bisect.sh:423 #, sh-format msgid "cannot read $file for replaying" msgstr "kan inte läsa $file för uppspelning" -#: git-bisect.sh:480 +#: git-bisect.sh:444 msgid "?? what are you talking about?" msgstr "?? vad menar du?" -#: git-bisect.sh:492 +#: git-bisect.sh:453 +msgid "bisect run failed: no command provided." +msgstr "bisect-körning misslyckades: inget kommando gavs." + +#: git-bisect.sh:458 #, sh-format msgid "running $command" msgstr "kör $command" -#: git-bisect.sh:499 +#: git-bisect.sh:465 #, sh-format msgid "" "bisect run failed:\n" @@ -14495,11 +14696,11 @@ msgstr "" "\"bisect\"-körningen misslyckades:\n" "felkod $res från \"$command\" är < 0 eller >= 128" -#: git-bisect.sh:525 +#: git-bisect.sh:491 msgid "bisect run cannot continue any more" msgstr "\"bisect\"-körningen kan inte fortsätta längre" -#: git-bisect.sh:531 +#: git-bisect.sh:497 #, sh-format msgid "" "bisect run failed:\n" @@ -14508,40 +14709,21 @@ msgstr "" "\"bisect\"-körningen misslyckades:\n" "\"bisect_state $state\" avslutades med felkoden $res" -#: git-bisect.sh:538 +#: git-bisect.sh:504 msgid "bisect run success" msgstr "\"bisect\"-körningen lyckades" -#: git-bisect.sh:565 -msgid "please use two different terms" -msgstr "termerna måste vara olika" - -#: git-bisect.sh:575 -#, sh-format -msgid "'$term' is not a valid term" -msgstr "\"$term\" är inte en giltig term" - -#: git-bisect.sh:578 -#, sh-format -msgid "can't use the builtin command '$term' as a term" -msgstr "kan inte använda det inbyggda kommandot \"$term\" som term" - -#: git-bisect.sh:587 git-bisect.sh:593 -#, sh-format -msgid "can't change the meaning of term '$term'" -msgstr "kan inte ändra betydelsen av termen \"$term\"" - -#: git-bisect.sh:606 +#: git-bisect.sh:533 #, sh-format msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." msgstr "" "Ogiltigt kommando: du utför just nu en \"bisect\" med $TERM_BAD/$TERM_GOOD." -#: git-bisect.sh:636 +#: git-bisect.sh:567 msgid "no terms defined" msgstr "inga termer angivna" -#: git-bisect.sh:653 +#: git-bisect.sh:584 #, sh-format msgid "" "invalid argument $arg for 'git bisect terms'.\n" @@ -14623,8 +14805,8 @@ msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." #: 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." +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:363 msgid "No rebase in progress?" @@ -14669,8 +14851,8 @@ msgstr "" #: git-rebase.sh:480 #, sh-format -msgid "invalid upstream $upstream_name" -msgstr "ogiltig uppström $upstream_name" +msgid "invalid upstream '$upstream_name'" +msgstr "ogiltig uppström \"$upstream_name\"" #: git-rebase.sh:504 #, sh-format @@ -14687,45 +14869,55 @@ msgstr "$onto_name: ingen sammanslagningsbas finns" msgid "Does not point to a valid commit: $onto_name" msgstr "Peka på en giltig incheckning: $onto_name" -#: git-rebase.sh:539 +#: git-rebase.sh:542 #, sh-format -msgid "fatal: no such branch: $branch_name" -msgstr "ödesdigert: ingen sådan gren: $branch_name" +msgid "fatal: no such branch/commit '$branch_name'" +msgstr "ödesdigert: ingen sådan gren/incheckning: $branch_name" -#: git-rebase.sh:572 +#: git-rebase.sh:575 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: git-rebase.sh:577 +#: git-rebase.sh:580 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Skapade autostash: $stash_abbrev" -#: git-rebase.sh:581 +#: git-rebase.sh:584 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: git-rebase.sh:601 +#: git-rebase.sh:607 +#, sh-format +msgid "HEAD is up to date." +msgstr "HEAD är à jour." + +#: git-rebase.sh:609 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktuell gren $branch_name är à jour." -#: git-rebase.sh:605 +#: git-rebase.sh:617 +#, sh-format +msgid "HEAD is up to date, rebase forced." +msgstr "HEAD är à jour, ombasering framtvingad." + +#: git-rebase.sh:619 #, 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:616 +#: git-rebase.sh:631 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Ändringar från $mb till $onto:" -#: git-rebase.sh:625 +#: git-rebase.sh:640 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:635 +#: git-rebase.sh:650 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Snabbspolade $branch_name till $onto_name." @@ -14734,159 +14926,145 @@ msgstr "Snabbspolade $branch_name till $onto_name." msgid "git stash clear with parameters is unimplemented" msgstr "\"git stash clear\" med parametrar har inte implementerats" -#: git-stash.sh:102 +#: git-stash.sh:108 msgid "You do not have the initial commit yet" msgstr "Du har inte den första incheckningen ännu" -#: git-stash.sh:117 +#: git-stash.sh:123 msgid "Cannot save the current index state" msgstr "Kan inte spara aktuellt tillstånd för indexet" -#: git-stash.sh:132 +#: git-stash.sh:138 msgid "Cannot save the untracked files" msgstr "Kan inte spara ospårade filer" -#: git-stash.sh:152 git-stash.sh:165 +#: git-stash.sh:158 git-stash.sh:171 msgid "Cannot save the current worktree state" msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" -#: git-stash.sh:169 +#: git-stash.sh:175 msgid "No changes selected" msgstr "Inga ändringar valda" -#: git-stash.sh:172 +#: git-stash.sh:178 msgid "Cannot remove temporary index (can't happen)" msgstr "Kan inte ta bort temporärt index (kan inte inträffa)" -#: git-stash.sh:185 +#: git-stash.sh:191 msgid "Cannot record working tree state" msgstr "Kan inte registrera tillstånd för arbetskatalog" -#: git-stash.sh:217 +#: git-stash.sh:229 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Kan inte uppdatera $ref_stash med $w_commit" -#. TRANSLATORS: $option is an invalid option, like -#. `--blah-blah'. The 7 spaces at the beginning of the -#. second line correspond to "error: ". So you should line -#. up the second line with however many characters the -#. translation of "error: " takes in your language. E.g. in -#. English this is: -#. -#. $ 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:273 +#: git-stash.sh:281 #, sh-format -msgid "" -"error: unknown option for 'stash save': $option\n" -" To provide a message, use git stash save -- '$option'" -msgstr "" -"fel: felaktig flagga för \"stash save\": $option\n" -" För att ange ett meddelande, använd git stash save -- \"$option\"" +msgid "error: unknown option for 'stash push': $option" +msgstr "fel: okänd flagga för \"stash push\": $option" -#: git-stash.sh:288 +#: git-stash.sh:295 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:296 +#: git-stash.sh:303 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" -#: git-stash.sh:301 +#: git-stash.sh:308 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: git-stash.sh:305 +#: git-stash.sh:312 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" -#: git-stash.sh:306 +#: git-stash.sh:313 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Sparade arbetskatalogen och indexstatus $stash_msg" -#: git-stash.sh:334 +#: git-stash.sh:341 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: git-stash.sh:482 +#: git-stash.sh:489 #, sh-format msgid "unknown option: $opt" msgstr "okänd flagga: $opt" -#: git-stash.sh:495 +#: git-stash.sh:502 msgid "No stash entries found." msgstr "Inga \"stash”-poster hittades." -#: git-stash.sh:502 +#: git-stash.sh:509 #, sh-format msgid "Too many revisions specified: $REV" msgstr "För många revisioner angivna: $REV" -#: git-stash.sh:517 +#: git-stash.sh:524 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference är inte en giltig referens" -#: git-stash.sh:545 +#: git-stash.sh:552 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "\"$args\" är inte en \"stash\"-liknande incheckning" -#: git-stash.sh:556 +#: git-stash.sh:563 #, sh-format msgid "'$args' is not a stash reference" msgstr "\"$args\" är inte en \"stash\"-referens" -#: git-stash.sh:564 +#: git-stash.sh:571 msgid "unable to refresh index" msgstr "kan inte uppdatera indexet" -#: git-stash.sh:568 +#: git-stash.sh:575 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:576 +#: git-stash.sh:583 msgid "Conflicts in index. Try without --index." msgstr "Konflikter i indexet. Testa utan --index." -#: git-stash.sh:578 +#: git-stash.sh:585 msgid "Could not save index tree" msgstr "Kunde inte spara indexträd" -#: git-stash.sh:587 +#: git-stash.sh:594 msgid "Could not restore untracked files from stash entry" msgstr "Kunde inte återställa ospårade filer från stash-post" -#: git-stash.sh:612 +#: git-stash.sh:619 msgid "Cannot unstage modified files" msgstr "Kan inte ta bort ändrade filer ur kön" -#: git-stash.sh:627 +#: git-stash.sh:634 msgid "Index was not unstashed." msgstr "Indexet har inte tagits ur kön." -#: git-stash.sh:641 +#: git-stash.sh:648 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:650 +#: git-stash.sh:657 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Kastade ${REV} ($s)" -#: git-stash.sh:651 +#: git-stash.sh:658 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-stash.sh:659 +#: git-stash.sh:666 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: git-stash.sh:738 +#: git-stash.sh:745 msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" @@ -15112,38 +15290,33 @@ msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:840 +#: git-submodule.sh:828 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" -#: git-submodule.sh:892 +#: git-submodule.sh:880 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:912 +#: git-submodule.sh:900 #, 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:915 +#: git-submodule.sh:903 #, 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:918 +#: git-submodule.sh:906 #, 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: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:1136 +#: git-submodule.sh:1077 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" @@ -15374,15 +15547,15 @@ msgstr "Rätta det med \"git rebase --edit-todo\"." msgid "Successfully rebased and updated $head_name." msgstr "Lyckades ombasera och uppdatera $head_name." -#: git-rebase--interactive.sh:749 +#: git-rebase--interactive.sh:728 msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" -#: git-rebase--interactive.sh:784 +#: git-rebase--interactive.sh:763 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Kunde inte ta bort CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:789 +#: git-rebase--interactive.sh:768 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -15413,11 +15586,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:806 +#: git-rebase--interactive.sh:785 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:811 +#: git-rebase--interactive.sh:790 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -15425,11 +15598,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:816 git-rebase--interactive.sh:820 +#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799 msgid "Could not commit staged changes." msgstr "Kunde inte checka in köade ändringar." -#: git-rebase--interactive.sh:848 +#: git-rebase--interactive.sh:827 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -15443,40 +15616,44 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015 +#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995 msgid "Could not execute editor" msgstr "Kunde inte starta textredigerare" -#: git-rebase--interactive.sh:869 +#: git-rebase--interactive.sh:848 #, sh-format msgid "Could not checkout $switch_to" msgstr "Kunde inte checka ut $switch_to" -#: git-rebase--interactive.sh:874 +#: git-rebase--interactive.sh:853 msgid "No HEAD?" msgstr "Inget HEAD?" -#: git-rebase--interactive.sh:875 +#: git-rebase--interactive.sh:854 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Kunde inte skapa temporär $state_dir" -#: git-rebase--interactive.sh:877 +#: git-rebase--interactive.sh:856 msgid "Could not mark as interactive" msgstr "Kunde inte markera som interaktiv" -#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892 +#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871 msgid "Could not init rewritten commits" msgstr "Kunde inte initiera omskrivna incheckningar" -#: git-rebase--interactive.sh:993 +#: git-rebase--interactive.sh:897 +msgid "Could not generate todo list" +msgstr "Kunde inte skapa todo-lista" + +#: git-rebase--interactive.sh:973 #, 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:998 +#: git-rebase--interactive.sh:978 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -15486,7 +15663,7 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: git-rebase--interactive.sh:1005 +#: git-rebase--interactive.sh:985 msgid "Note that empty commits are commented out" msgstr "Observera att tomma incheckningar är utkommenterade" @@ -16246,7 +16423,7 @@ 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:927 git-send-email.perl:935 +#: git-send-email.perl:929 git-send-email.perl:937 #, 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" @@ -16254,16 +16431,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:939 +#: git-send-email.perl:941 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:1260 +#: git-send-email.perl:1262 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA-sökvägen \"%s\" finns inte" -#: git-send-email.perl:1335 +#: git-send-email.perl:1337 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -16290,124 +16467,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:1350 +#: git-send-email.perl:1352 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:1353 +#: git-send-email.perl:1355 msgid "Send this email reply required" msgstr "Svar krävs på frågan \"Sända brevet?\"" -#: git-send-email.perl:1379 +#: git-send-email.perl:1381 msgid "The required SMTP server is not properly defined." msgstr "Nödvändig SMTP-server har inte angivits korrekt." -#: git-send-email.perl:1426 +#: git-send-email.perl:1428 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Servern stöder inte SMARTTLS! %s" -#: git-send-email.perl:1431 git-send-email.perl:1435 +#: git-send-email.perl:1433 git-send-email.perl:1437 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS misslyckades! %s" -#: git-send-email.perl:1445 +#: git-send-email.perl:1447 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:1463 +#: git-send-email.perl:1465 #, perl-format msgid "Failed to send %s\n" msgstr "Misslyckades sända %s\n" -#: git-send-email.perl:1466 +#: git-send-email.perl:1468 #, perl-format msgid "Dry-Sent %s\n" msgstr "Test-Sände %s\n" -#: git-send-email.perl:1466 +#: git-send-email.perl:1468 #, perl-format msgid "Sent %s\n" msgstr "Sände %s\n" -#: git-send-email.perl:1468 +#: git-send-email.perl:1470 msgid "Dry-OK. Log says:\n" msgstr "Test-OK. Loggen säger:\n" -#: git-send-email.perl:1468 +#: git-send-email.perl:1470 msgid "OK. Log says:\n" msgstr "OK. Loggen säger:\n" -#: git-send-email.perl:1480 +#: git-send-email.perl:1482 msgid "Result: " msgstr "Resultat: " -#: git-send-email.perl:1483 +#: git-send-email.perl:1485 msgid "Result: OK\n" msgstr "Resultat: OK\n" -#: git-send-email.perl:1496 +#: git-send-email.perl:1498 #, perl-format msgid "can't open file %s" msgstr "kan inte öppna filen %s" -#: git-send-email.perl:1543 git-send-email.perl:1563 +#: git-send-email.perl:1545 git-send-email.perl:1565 #, 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:1549 +#: git-send-email.perl:1551 #, 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:1597 +#: git-send-email.perl:1599 #, 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:1622 +#: git-send-email.perl:1624 #, 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:1728 +#: git-send-email.perl:1730 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Kunde inte köra \"%s\"" -#: git-send-email.perl:1735 +#: git-send-email.perl:1737 #, 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:1739 +#: git-send-email.perl:1741 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) misslyckades stänga röret till \"%s\"" -#: git-send-email.perl:1766 +#: git-send-email.perl:1768 msgid "cannot send message as 7bit" msgstr "kan inte sända brev som sjubitars" -#: git-send-email.perl:1774 +#: git-send-email.perl:1776 msgid "invalid transfer encoding" msgstr "ogiltig överföringskondning" -#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873 +#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875 #, perl-format msgid "unable to open %s: %s\n" msgstr "kunde inte öppna %s: %s\n" -#: git-send-email.perl:1815 +#: git-send-email.perl:1817 #, 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:1831 +#: git-send-email.perl:1833 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" @@ -16415,11 +16592,64 @@ msgstr "" "säkerhetskopior.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1835 +#: git-send-email.perl:1837 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "" +#~ "empty strings as pathspecs will be made invalid in upcoming releases. " +#~ "please use . instead if you meant to match all paths" +#~ 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" + +#~ msgid "unable to open '%s' for writing" +#~ msgstr "kunde inte öppna \"%s\" för skrivning" + +#~ msgid "could not truncate '%s'" +#~ msgstr "kunde inte trunkera \"%s\"" + +#~ msgid "could not finish '%s'" +#~ msgstr "kunde inte avsluta \"%s\"" + +#~ msgid "could not write to %s" +#~ msgstr "kunde inte skriva till %s" + +#~ msgid "could not close %s" +#~ msgstr "kunde inte stänga %s" + +#~ msgid "Copied a misnamed branch '%s' away" +#~ msgstr "Kopierade bort en felaktigt namngiven gren \"%s\"" + +#~ msgid "it does not make sense to create 'HEAD' manually" +#~ msgstr "kan inte skapa \"HEAD\" manuellt" + +#~ msgid "Don't know how to clone %s" +#~ msgstr "Vet inte hur man klonar %s" + +#~ msgid "show ignored files" +#~ msgstr "visa ignorerade filer" + +#~ msgid "%s is not a valid '%s' object" +#~ msgstr "%s är inte ett giltigt \"%s\"-objekt" + +#~ msgid "Don't know how to fetch from %s" +#~ msgstr "Vet inte hur man hämtar från %s" + +#~ msgid "'$term' is not a valid term" +#~ msgstr "\"$term\" är inte en giltig term" + +#~ msgid "" +#~ "error: unknown option for 'stash save': $option\n" +#~ " To provide a message, use git stash save -- '$option'" +#~ msgstr "" +#~ "fel: felaktig flagga för \"stash save\": $option\n" +#~ " För att ange ett meddelande, använd git stash save -- \"$option\"" + +#~ msgid "Failed to recurse into submodule path '$sm_path'" +#~ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" + #~ msgid "%%(trailers) does not take arguments" #~ msgstr "%%(trailers) tar inte argument" @@ -16581,9 +16811,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "git merge [<options>] <msg> HEAD <commit>" #~ msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>" -#~ msgid "'%s' is not a commit" -#~ msgstr "\"%s\" är inte en incheckning" - #~ msgid "cannot open file '%s'" #~ msgstr "kan inte öppna filen \"%s\"" @@ -16632,9 +16859,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ "\n" #~ "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)" -#~ msgid "Could not write to %s" -#~ msgstr "Kunde inte skriva till %s" - #~ msgid "Error wrapping up %s." #~ msgstr "Fel vid ombrytning av %s." |