diff options
Diffstat (limited to 'po/sv.po')
| -rw-r--r-- | po/sv.po | 13289 |
1 files changed, 9145 insertions, 4144 deletions
@@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010-2018 Peter Krefting <peter@softwolves.pp.se> +# Copyright (C) 2010-2019 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, 2018. +# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019. # msgid "" msgstr "" -"Project-Id-Version: git 2.18.0\n" +"Project-Id-Version: git 2.22.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2018-06-08 09:03+0800\n" -"PO-Revision-Date: 2018-06-08 22:53+0100\n" +"POT-Creation-Date: 2019-05-14 17:09+0800\n" +"PO-Revision-Date: 2019-05-14 15:44+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:92 +#: advice.c:103 #, c-format msgid "%shint: %.*s%s\n" msgstr "%stips: %.*s%s\n" -#: advice.c:137 +#: advice.c:156 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:139 +#: advice.c:158 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:141 +#: advice.c:160 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:143 +#: advice.c:162 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:145 +#: advice.c:164 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:147 +#: advice.c:166 #, 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:155 +#: advice.c:174 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:163 +#: advice.c:182 msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:168 builtin/merge.c:1250 +#: advice.c:187 builtin/merge.c:1320 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: advice.c:170 +#: advice.c:189 msgid "Please, commit your changes before merging." msgstr "Checka in dina ändringar innan du utför sammanslagningen." -#: advice.c:171 +#: advice.c:190 msgid "Exiting because of unfinished merge." msgstr "Avslutar på grund av ofullbordad sammanslagning." -#: advice.c:177 +#: advice.c:196 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -111,92 +111,100 @@ msgstr "" " git checkout -b <namn-på-ny-gren>\n" "\n" -#: apply.c:58 +#: alias.c:50 +msgid "cmdline ends with \\" +msgstr "kommandorad avslutas med \\" + +#: alias.c:51 +msgid "unclosed quote" +msgstr "citat ej stängt" + +#: apply.c:63 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "okänt alternativ för whitespace: \"%s\"" -#: apply.c:74 +#: apply.c:79 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: apply.c:122 +#: apply.c:129 msgid "--reject and --3way cannot be used together." msgstr "--reject och --3way kan inte användas samtidigt." -#: apply.c:124 +#: apply.c:131 msgid "--cached and --3way cannot be used together." msgstr "--cached och --3way kan inte användas samtidigt." -#: apply.c:127 +#: apply.c:134 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: apply.c:138 +#: apply.c:145 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: apply.c:141 +#: apply.c:148 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: apply.c:821 +#: apply.c:829 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: apply.c:830 +#: apply.c:838 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: apply.c:904 +#: apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen på rad %d" -#: apply.c:942 +#: apply.c:950 #, 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:948 +#: apply.c:956 #, 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:949 +#: apply.c:957 #, 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:954 +#: apply.c:962 #, 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:983 +#: apply.c:991 #, c-format msgid "invalid mode on line %d: %s" msgstr "ogiltigt läge på rad %d: %s" -#: apply.c:1301 +#: apply.c:1310 #, c-format msgid "inconsistent header lines %d and %d" msgstr "huvudet är inkonsekvent mellan rad %d och %d" -#: apply.c:1473 +#: apply.c:1482 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: apply.c:1542 +#: apply.c:1551 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: apply.c:1562 +#: apply.c:1571 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -212,82 +220,82 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: apply.c:1575 +#: apply.c:1584 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)" -#: apply.c:1763 +#: apply.c:1772 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: apply.c:1765 +#: apply.c:1774 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: apply.c:1799 +#: apply.c:1808 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: apply.c:1836 +#: apply.c:1845 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: apply.c:1838 +#: apply.c:1847 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: apply.c:1841 +#: apply.c:1850 #, 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:1988 +#: apply.c:1997 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: apply.c:2025 +#: apply.c:2034 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: apply.c:2185 +#: apply.c:2196 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: apply.c:2271 +#: apply.c:2282 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: apply.c:2275 +#: apply.c:2286 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: apply.c:2934 +#: apply.c:2945 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: apply.c:3055 +#: apply.c:3066 #, 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:3067 +#: apply.c:3078 #, 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:3073 +#: apply.c:3084 #, c-format msgid "" "while searching for:\n" @@ -296,25 +304,25 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: apply.c:3095 +#: apply.c:3106 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: apply.c:3103 +#: apply.c:3114 #, 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:3149 +#: apply.c:3161 #, 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:3159 +#: apply.c:3171 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -322,545 +330,624 @@ msgstr "" "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande " "innehållet." -#: apply.c:3167 +#: apply.c:3179 #, 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:3185 +#: apply.c:3197 #, 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:3198 +#: apply.c:3210 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: apply.c:3204 +#: apply.c:3216 #, 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:3225 +#: apply.c:3237 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: apply.c:3347 +#: apply.c:3360 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278 +#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" -#: apply.c:3404 +#: apply.c:3420 #, 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:3433 apply.c:3673 +#: apply.c:3449 apply.c:3692 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: apply.c:3516 apply.c:3687 +#: apply.c:3535 apply.c:3707 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: apply.c:3525 apply.c:3695 +#: apply.c:3544 apply.c:3715 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: apply.c:3560 +#: apply.c:3579 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:3563 +#: apply.c:3582 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Faller tillbaka på trevägssammanslagning...\n" -#: apply.c:3579 apply.c:3583 +#: apply.c:3598 apply.c:3602 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kunde inte läsa aktuellt innehåll i \"%s\"" -#: apply.c:3595 +#: apply.c:3614 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n" -#: apply.c:3609 +#: apply.c:3628 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Applicerade patchen på \"%s\" med konflikter.\n" -#: apply.c:3614 +#: apply.c:3633 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Tillämpade patchen på \"%s\" rent.\n" -#: apply.c:3640 +#: apply.c:3659 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: apply.c:3712 +#: apply.c:3732 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: apply.c:3714 +#: apply.c:3734 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: apply.c:3864 apply.c:3866 +#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg ”%s”" -#: apply.c:3922 +#: apply.c:3943 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: apply.c:3925 +#: apply.c:3946 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: apply.c:3945 +#: apply.c:3966 #, 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:3950 +#: apply.c:3971 #, 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:3970 +#: apply.c:3991 #, 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:3974 +#: apply.c:3995 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: apply.c:3989 +#: apply.c:4010 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: apply.c:4080 +#: apply.c:4102 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s" -#: apply.c:4087 +#: apply.c:4109 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "nytt läge för %s, som inte finns i nuvarande HEAD" -#: apply.c:4090 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller är oanvändbar (%s)." -#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140 +#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: apply.c:4099 +#: apply.c:4121 #, c-format msgid "could not add %s to temporary index" msgstr "kunde inte lägga till %s till temporärt index" -#: apply.c:4109 +#: apply.c:4131 #, c-format msgid "could not write temporary index to %s" msgstr "kunde inte skriva temporärt index till %s" -#: apply.c:4247 +#: apply.c:4269 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: apply.c:4282 +#: apply.c:4303 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: apply.c:4288 +#: apply.c:4309 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: apply.c:4296 +#: apply.c:4317 #, 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:4302 apply.c:4446 +#: apply.c:4323 apply.c:4468 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: apply.c:4343 +#: apply.c:4366 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" -#: apply.c:4347 +#: apply.c:4370 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: apply.c:4417 +#: apply.c:4440 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: apply.c:4515 +#: apply.c:4538 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: apply.c:4523 +#: apply.c:4546 msgid "internal error" msgstr "internt fel" -#: apply.c:4526 +#: apply.c:4549 #, 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:4537 +#: apply.c:4560 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036 +#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" -#: apply.c:4559 +#: apply.c:4582 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: apply.c:4563 +#: apply.c:4586 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4673 +#: apply.c:4696 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4681 +#: apply.c:4704 msgid "unrecognized input" msgstr "indata känns inte igen" -#: apply.c:4700 +#: apply.c:4724 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4837 +#: apply.c:4879 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4864 +#: apply.c:4906 #, 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:4870 apply.c:4885 +#: apply.c:4912 apply.c:4927 #, 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:4878 +#: apply.c:4920 #, 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:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389 +#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257 -#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198 -#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210 -#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584 -#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807 -#: git-add--interactive.perl:197 +#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213 +#: builtin/clone.c:123 builtin/fetch.c:118 builtin/merge.c:271 +#: builtin/pull.c:207 builtin/submodule--helper.c:407 +#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369 +#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852 +#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197 msgid "path" msgstr "sökväg" -#: apply.c:4922 +#: apply.c:4964 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:4925 +#: apply.c:4967 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:4927 builtin/am.c:2263 +#: apply.c:4969 builtin/am.c:2219 msgid "num" msgstr "antal" -#: apply.c:4928 +#: apply.c:4970 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:4931 +#: apply.c:4973 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:4933 +#: apply.c:4975 msgid "instead of applying the patch, output diffstat for the input" msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata" -#: apply.c:4937 +#: apply.c:4979 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:4939 +#: apply.c:4981 msgid "instead of applying the patch, output a summary for the input" msgstr "istället för att tillämpa patchen, skriv ut en summering av indata" -#: apply.c:4941 +#: apply.c:4983 msgid "instead of applying the patch, see if the patch is applicable" msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas" -#: apply.c:4943 +#: apply.c:4985 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:4945 +#: apply.c:4987 +msgid "mark new files with `git add --intent-to-add`" +msgstr "markera nya filer med \"git add --intent-to-add\"" + +#: apply.c:4989 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:4947 +#: apply.c:4991 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:4950 +#: apply.c:4994 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:4952 +#: apply.c:4996 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:4954 +#: apply.c:4998 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515 +#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: apply.c:4959 +#: apply.c:5003 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95 -#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 -#: builtin/pack-objects.c:3177 +#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97 +#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101 +#: builtin/pack-objects.c:3317 builtin/rebase.c:1415 msgid "action" msgstr "åtgärd" -#: apply.c:4961 +#: apply.c:5005 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:4964 apply.c:4967 +#: apply.c:5008 apply.c:5011 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:4970 +#: apply.c:5014 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:4972 +#: apply.c:5016 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:4974 +#: apply.c:5018 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:4976 +#: apply.c:5020 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21 -#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666 -#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124 +#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22 +#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786 +#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "var pratsam" -#: apply.c:4979 +#: apply.c:5023 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:4982 +#: apply.c:5026 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:4984 builtin/am.c:2251 +#: apply.c:5028 builtin/am.c:2207 msgid "root" msgstr "rot" -#: apply.c:4985 +#: apply.c:5029 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" -#: archive.c:13 +#: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]" -#: archive.c:14 +#: archive.c:15 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:15 +#: archive.c:16 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" "git archive --remote <arkiv> [--exec <kmd>] [<flaggor>] <träd-igt> " "[<sökväg>...]" -#: archive.c:16 +#: archive.c:17 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" -#: archive.c:434 +#: archive.c:396 +#, c-format +msgid "no such ref: %.*s" +msgstr "ingen sådan referens: %.*s" + +#: archive.c:401 +#, c-format +msgid "not a valid object name: %s" +msgstr "objektnamnet är inte giltigt: %s" + +#: archive.c:414 +#, c-format +msgid "not a tree object: %s" +msgstr "inte ett trädobjekt: %s" + +#: archive.c:424 +msgid "current working directory is untracked" +msgstr "aktuell arbetskatalog är inte spårad" + +#: archive.c:455 msgid "fmt" msgstr "fmt" -#: archive.c:434 +#: archive.c:455 msgid "archive format" msgstr "arkivformat" -#: archive.c:435 builtin/log.c:1462 +#: archive.c:456 builtin/log.c:1557 msgid "prefix" msgstr "prefix" -#: archive.c:436 +#: archive.c:457 msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127 -#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869 -#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554 -#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119 -#: parse-options.h:165 +#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091 +#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105 +#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:176 msgid "file" msgstr "fil" -#: archive.c:438 builtin/archive.c:89 +#: archive.c:459 builtin/archive.c:90 msgid "write the archive to this file" msgstr "skriv arkivet till filen" -#: archive.c:440 +#: archive.c:461 msgid "read .gitattributes in working directory" msgstr "läs .gitattributes i arbetskatalogen" -#: archive.c:441 +#: archive.c:462 msgid "report archived files on stderr" msgstr "rapportera arkiverade filer på standard fel" -#: archive.c:442 +#: archive.c:463 msgid "store only" msgstr "endast spara" -#: archive.c:443 +#: archive.c:464 msgid "compress faster" msgstr "komprimera snabbare" -#: archive.c:451 +#: archive.c:472 msgid "compress better" msgstr "komprimera bättre" -#: archive.c:454 +#: archive.c:475 msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113 -#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593 +#: archive.c:477 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858 msgid "repo" msgstr "arkiv" -#: archive.c:457 builtin/archive.c:91 +#: archive.c:478 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489 +#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:713 +#: builtin/notes.c:498 msgid "command" msgstr "kommando" -#: archive.c:459 builtin/archive.c:93 +#: archive.c:480 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "sökväg till kommandot git-upload-archive på fjärren" -#: archive.c:466 +#: archive.c:487 msgid "Unexpected option --remote" msgstr "Oväntad flagga --remote" -#: archive.c:468 +#: archive.c:489 msgid "Option --exec can only be used together with --remote" msgstr "Flaggan --exec kan endast användas tillsammans med --remote" -#: archive.c:470 +#: archive.c:491 msgid "Unexpected option --output" msgstr "Oväntad flagga --output" -#: archive.c:492 +#: archive.c:513 #, c-format msgid "Unknown archive format '%s'" msgstr "Okänt arkivformat \"%s\"" -#: archive.c:499 +#: archive.c:520 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumentet stöd inte för formatet \"%s\": -%d" -#: attr.c:218 +#: archive-tar.c:125 archive-zip.c:345 +#, c-format +msgid "cannot stream blob %s" +msgstr "kan inte strömma blob:en %s" + +#: archive-tar.c:260 archive-zip.c:363 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "filens läge stöds ej: 0%o (SHA1: %s)" + +#: archive-tar.c:287 archive-zip.c:353 +#, c-format +msgid "cannot read %s" +msgstr "kan inte läsa %s" + +#: archive-tar.c:459 +#, c-format +msgid "unable to start '%s' filter" +msgstr "kunde inte starta filtret \"%s\"" + +#: archive-tar.c:462 +msgid "unable to redirect descriptor" +msgstr "kan inte omdirigera handtag" + +#: archive-tar.c:469 +#, c-format +msgid "'%s' filter reported error" +msgstr "filtret \"%s\" rapporterade fel" + +#: archive-zip.c:314 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "sökvägen är inte giltig UTF-8: %s" + +#: archive-zip.c:318 +#, c-format +msgid "path too long (%d chars, SHA1: %s): %s" +msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s" + +#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229 +#, c-format +msgid "deflate error (%d)" +msgstr "fel i deflate (%d)" + +#: archive-zip.c:609 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>" + +#: attr.c:211 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%-*s är inte ett giltigt namn på attribut" -#: attr.c:415 +#: attr.c:368 +#, c-format +msgid "%s not allowed: %s:%d" +msgstr "%s inte tillåtet: %s:%d" + +#: attr.c:408 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -868,22 +955,22 @@ msgstr "" "Negativa mönster ignoreras i git-attribut\n" "Använd '\\!' för att inleda med ett utropstecken." -#: bisect.c:461 +#: bisect.c:468 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Felaktigt citerat innehåll i filen \"%s\": %s" -#: bisect.c:669 +#: bisect.c:678 #, c-format msgid "We cannot bisect more!\n" msgstr "Det finns inte mer att göra \"bisect\" på!\n" -#: bisect.c:723 +#: bisect.c:733 #, c-format msgid "Not a valid commit name %s" msgstr "Namnet på incheckningen är inte giltigt: %s" -#: bisect.c:747 +#: bisect.c:758 #, c-format msgid "" "The merge base %s is bad.\n" @@ -892,7 +979,7 @@ msgstr "" "Sammanslagningsbasen %s är trasig.\n" "Det betyder att felet har rättats mellan %s och [%s].\n" -#: bisect.c:752 +#: bisect.c:763 #, c-format msgid "" "The merge base %s is new.\n" @@ -901,7 +988,7 @@ msgstr "" "Sammanslagningsbasen %s är ny.\n" "Egenskapen har ändrats mellan %s och [%s].\n" -#: bisect.c:757 +#: bisect.c:768 #, c-format msgid "" "The merge base %s is %s.\n" @@ -910,7 +997,7 @@ msgstr "" "Sammanslagningsbasen %s är %s.\n" "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n" -#: bisect.c:765 +#: bisect.c:776 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -921,7 +1008,7 @@ msgstr "" "git bisect kan inte fungera korrekt i detta fall.\n" "Kanske du skrev fel %s- och %s-revisioner?\n" -#: bisect.c:778 +#: bisect.c:789 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -933,36 +1020,36 @@ msgstr "" "%s.\n" "Vi fortsätter ändå." -#: bisect.c:811 +#: bisect.c:822 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisect: en sammanslagningsbas måste testas\n" -#: bisect.c:851 +#: bisect.c:865 #, c-format msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: bisect.c:921 +#: bisect.c:928 builtin/merge.c:146 #, c-format msgid "could not read file '%s'" msgstr "kunde inte läsa filen \"%s\"" -#: bisect.c:951 +#: bisect.c:958 msgid "reading bisect refs failed" msgstr "misslyckades läsa bisect-referenser" -#: bisect.c:970 +#: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "%s var både %s och %s\n" -#: bisect.c:978 +#: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" @@ -971,7 +1058,7 @@ msgstr "" "Ingen testbar incheckning hittades.\n" "Kanske du startade med felaktiga sökvägsparametrar?\n" -#: bisect.c:997 +#: bisect.c:1004 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -981,52 +1068,53 @@ msgstr[1] "(ungefär %d steg)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1003 +#: bisect.c:1010 #, 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" msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n" msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n" -#: blame.c:1756 +#: blame.c:1794 msgid "--contents and --reverse do not blend well." msgstr "--contents och --reverse fungerar inte så bra tillsammans." -#: blame.c:1767 +#: blame.c:1808 msgid "cannot use --contents with final commit object name" msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt" -#: blame.c:1787 +#: blame.c:1829 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861 -#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920 -#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372 +#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030 +#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940 +#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415 +#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" -#: blame.c:1814 +#: blame.c:1856 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent tillsammans kräver ett intervall på första-förälder-" "kedjan" -#: blame.c:1825 +#: blame.c:1867 #, c-format msgid "no such path %s in %s" msgstr "sökvägen %s i %s finns inte" -#: blame.c:1836 +#: blame.c:1878 #, c-format msgid "cannot read blob %s for path %s" msgstr "kan inte läsa objektet %s för sökvägen %s" -#: branch.c:54 +#: branch.c:53 #, c-format msgid "" "\n" @@ -1039,92 +1127,92 @@ msgstr "" "fjärrspårningsinformationen genom att utföra\n" "\"git branch --set-upstream-to=%s%s%s\"." -#: branch.c:68 +#: branch.c:67 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "Ställer inte in grenen %s som sin egen uppströmsgren." -#: branch.c:94 +#: branch.c:93 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "" "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\" genom " "ombasering." -#: branch.c:95 +#: branch.c:94 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\"." -#: branch.c:99 +#: branch.c:98 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "" "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\" genom " "ombasering." -#: branch.c:100 +#: branch.c:99 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"." -#: branch.c:105 +#: branch.c:104 #, c-format msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "" "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\" genom ombasering." -#: branch.c:106 +#: branch.c:105 #, c-format msgid "Branch '%s' set up to track remote ref '%s'." msgstr "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\"." -#: branch.c:110 +#: branch.c:109 #, c-format msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "" "Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\" genom " "ombasering." -#: branch.c:111 +#: branch.c:110 #, c-format msgid "Branch '%s' set up to track local ref '%s'." msgstr "Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\"." -#: branch.c:120 +#: branch.c:119 msgid "Unable to write upstream branch configuration" msgstr "Kan inte skriva inställningar för uppströmsgren" -#: branch.c:157 +#: branch.c:156 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "Spårar inte: tvetydig information för referensen %s" -#: branch.c:190 +#: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." msgstr "\"%s\" är inte ett giltigt grennamn." -#: branch.c:209 +#: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "Det finns redan en gren som heter ”%s”." -#: branch.c:214 +#: branch.c:213 msgid "Cannot force update the current branch." msgstr "Kan inte tvinga uppdatering av aktuell gren." -#: branch.c:234 +#: 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:236 +#: 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:238 +#: branch.c:237 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1159,85 +1247,90 @@ msgstr "Objektnamnet är tvetydigt: \"%s\"." msgid "Not a valid branch point: '%s'." msgstr "Avgreningspunkten är inte giltig: ”%s”." -#: branch.c:360 +#: branch.c:359 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "\"%s\" är redan utcheckad på \"%s\"" -#: branch.c:383 +#: branch.c:382 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD i arbetskatalogen %s har inte uppdaterats" -#: bundle.c:34 +#: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' ser inte ut som en v2-bundle-fil" -#: bundle.c:62 +#: bundle.c:64 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916 +#: builtin/commit.c:788 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" -#: bundle.c:139 +#: bundle.c:143 msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:190 +#: bundle.c:194 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Paketet (bundlen) innehåller denna referens:" msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:" -#: bundle.c:197 +#: bundle.c:201 msgid "The bundle records a complete history." msgstr "Paketet (bundlen) beskriver en komplett historik." -#: bundle.c:199 +#: bundle.c:203 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Paketet (bundlen) kräver denna referens:" msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:" -#: bundle.c:258 +#: bundle.c:269 +msgid "unable to dup bundle descriptor" +msgstr "kan inte duplicera pakethandtag" + +#: bundle.c:276 msgid "Could not spawn pack-objects" msgstr "Kunde inte starta pack-objects" -#: bundle.c:269 +#: bundle.c:287 msgid "pack-objects died" msgstr "pack-objects misslyckades" -#: bundle.c:311 +#: bundle.c:329 msgid "rev-list died" msgstr "rev-list dog" -#: bundle.c:360 +#: bundle.c:378 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303 +#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" -#: bundle.c:458 +#: bundle.c:465 msgid "Refusing to create empty bundle." msgstr "Vägrar skapa ett tomt paket (bundle)." -#: bundle.c:470 +#: bundle.c:475 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:498 +#: bundle.c:500 msgid "index-pack died" msgstr "index-pack dog" @@ -1246,19 +1339,18 @@ msgstr "index-pack dog" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465 -#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376 -#: builtin/replace.c:448 +#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399 +#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" -#: commit.c:45 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s är inte en incheckning!" -#: commit.c:182 +#: commit.c:193 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -1278,7 +1370,29 @@ msgstr "" "Slå av detta meddelande genom att skriva\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1537 +#: commit.c:1128 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "" +"Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s." + +#: commit.c:1131 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "" +"Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s." + +#: commit.c:1134 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "Incheckning %s har inte någon GPG-signatur." + +#: commit.c:1137 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n" + +#: commit.c:1391 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1288,190 +1402,526 @@ 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" -#: commit-graph.c:669 +#: commit-graph.c:105 +msgid "commit-graph file is too small" +msgstr "incheckningsgraffilen %s är för liten" + +#: commit-graph.c:170 +#, c-format +msgid "commit-graph signature %X does not match signature %X" +msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X" + +#: commit-graph.c:177 +#, c-format +msgid "commit-graph version %X does not match version %X" +msgstr "incheckningsgrafens version %X stämmer inte med versionen %X" + +#: commit-graph.c:184 +#, c-format +msgid "commit-graph hash version %X does not match version %X" +msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X" + +#: commit-graph.c:207 +msgid "commit-graph chunk lookup table entry missing; file may be incomplete" +msgstr "" +"incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara " +"ofullständig" + +#: commit-graph.c:218 +#, c-format +msgid "commit-graph improper chunk offset %08x%08x" +msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen" + +#: commit-graph.c:255 +#, c-format +msgid "commit-graph chunk id %08x appears multiple times" +msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger" + +#: commit-graph.c:388 +#, c-format +msgid "could not find commit %s" +msgstr "kunde inte hitta incheckningen %s" + +#: commit-graph.c:730 builtin/pack-objects.c:2649 +#, c-format +msgid "unable to get type of object %s" +msgstr "kunde inte hämta typ för objektet %s" + +#: commit-graph.c:763 +msgid "Loading known commits in commit graph" +msgstr "Läser in kända incheckningar i incheckningsgraf" + +#: commit-graph.c:779 +msgid "Expanding reachable commits in commit graph" +msgstr "Expanderar nåbara incheckningar i incheckningsgraf" + +#: commit-graph.c:791 +msgid "Clearing commit marks in commit graph" +msgstr "Rensar incheckningsmärken i incheckningsgraf" + +#: commit-graph.c:811 +msgid "Computing commit graph generation numbers" +msgstr "Beräknar generationsvärden för incheckningsgraf" + +#: commit-graph.c:928 +#, c-format +msgid "Finding commits for commit graph in %d pack" +msgid_plural "Finding commits for commit graph in %d packs" +msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket" +msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket" + +#: commit-graph.c:941 +#, c-format +msgid "error adding pack %s" +msgstr "fel vid tillägg av paketet %s" + +#: commit-graph.c:943 +#, c-format +msgid "error opening index for %s" +msgstr "fel vid öppning av indexet för %s" + +#: commit-graph.c:957 +#, c-format +msgid "Finding commits for commit graph from %d ref" +msgid_plural "Finding commits for commit graph from %d refs" +msgstr[0] "Söker incheckningar för incheckingsgraf från %d referens" +msgstr[1] "Söker incheckningar för incheckingsgraf från %d referenser" + +#: commit-graph.c:989 +msgid "Finding commits for commit graph among packed objects" +msgstr "Söker incheckningar för incheckingsgraf i packade objekt" + +#: commit-graph.c:1002 +msgid "Counting distinct commits in commit graph" +msgstr "Räknar olika incheckningar i incheckningsgraf" + +#: commit-graph.c:1015 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar" -#: commit-graph.c:696 +#: commit-graph.c:1024 +msgid "Finding extra edges in commit graph" +msgstr "Söker ytterligare kanter i incheckingsgraf" + +#: commit-graph.c:1048 msgid "too many commits to write graph" msgstr "för många incheckningar för att skriva graf" -#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521 +#: commit-graph.c:1055 midx.c:805 #, c-format -msgid "cannot mkdir %s" -msgstr "kan inte skapa katalogen (mkdir) %s" +msgid "unable to create leading directories of %s" +msgstr "kunde inte skapa inledande kataloger för %s" + +#: commit-graph.c:1095 +#, c-format +msgid "Writing out commit graph in %d pass" +msgid_plural "Writing out commit graph in %d passes" +msgstr[0] "Skriver ut incheckningsgraf i %d pass" +msgstr[1] "Skriver ut incheckningsgraf i %d pass" + +#: commit-graph.c:1160 +msgid "the commit-graph file has incorrect checksum and is likely corrupt" +msgstr "" +"filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig" + +#: commit-graph.c:1170 +#, c-format +msgid "commit-graph has incorrect OID order: %s then %s" +msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s" + +#: commit-graph.c:1180 commit-graph.c:1195 +#, c-format +msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" +msgstr "" +"incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u" + +#: commit-graph.c:1187 +#, c-format +msgid "failed to parse commit %s from commit-graph" +msgstr "kunde inte tolka incheckning %s från incheckningsgraf" + +#: commit-graph.c:1204 +msgid "Verifying commits in commit graph" +msgstr "Bekräftar incheckningar i incheckningsgrafen" + +#: commit-graph.c:1217 +#, c-format +msgid "failed to parse commit %s from object database for commit-graph" +msgstr "" +"misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf" + +#: commit-graph.c:1224 +#, c-format +msgid "root tree OID for commit %s in commit-graph is %s != %s" +msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s" + +#: commit-graph.c:1234 +#, c-format +msgid "commit-graph parent list for commit %s is too long" +msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång" + +#: commit-graph.c:1240 +#, c-format +msgid "commit-graph parent for %s is %s != %s" +msgstr "incheckningsgrafens förälder för %s är %s != %s" + +#: commit-graph.c:1253 +#, c-format +msgid "commit-graph parent list for commit %s terminates early" +msgstr "" +"incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt" + +#: commit-graph.c:1258 +#, c-format +msgid "" +"commit-graph has generation number zero for commit %s, but non-zero elsewhere" +msgstr "" +"incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-" +"noll på annan plats" + +#: commit-graph.c:1262 +#, c-format +msgid "" +"commit-graph has non-zero generation number for commit %s, but zero elsewhere" +msgstr "" +"incheckningsgrafen har generationsnummer skilt från noll för incheckningen " +"%s, men noll på annan plats" + +#: commit-graph.c:1277 +#, c-format +msgid "commit-graph generation for commit %s is %u != %u" +msgstr "incheckningsgrafens generation för incheckningen %s är %u != %u" -#: compat/obstack.c:405 compat/obstack.c:407 +#: commit-graph.c:1283 +#, c-format +msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" +msgstr "" +"incheckningsdatumet för incheckningen %s i incheckningsgrafen är %<PRIuMAX> !" +"= %<PRIuMAX>" + +#: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "minnet slut" -#: config.c:187 +#: config.c:123 +#, c-format +msgid "" +"exceeded maximum include depth (%d) while including\n" +"\t%s\n" +"from\n" +"\t%s\n" +"This might be due to circular includes." +msgstr "" +"överskred maximalt inkluderingsdjup (%d) när\n" +"\t%s\n" +"inkluderades från\n" +"\t%s\n" +"Det kan bero på cirkulära inkluderingar." + +#: config.c:139 +#, c-format +msgid "could not expand include path '%s'" +msgstr "kunde inte expandera inkluderingssökväg \"%s\"" + +#: config.c:150 +msgid "relative config includes must come from files" +msgstr "relativa konfigureringsinkluderingar måste komma från filer" + +#: config.c:190 msgid "relative config include conditionals must come from files" msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer" -#: config.c:788 +#: config.c:348 +#, c-format +msgid "key does not contain a section: %s" +msgstr "nyckeln innehåller inte ett stycke: %s" + +#: config.c:354 +#, c-format +msgid "key does not contain variable name: %s" +msgstr "nyckeln innehåller inte variabelnamn: %s" + +#: config.c:378 sequencer.c:2459 +#, c-format +msgid "invalid key: %s" +msgstr "felaktig nyckel: %s" + +#: config.c:384 +#, c-format +msgid "invalid key (newline): %s" +msgstr "ogiltig nyckel (nyradstecken): %s" + +#: config.c:420 config.c:432 +#, c-format +msgid "bogus config parameter: %s" +msgstr "falsk konfigureringsparameter: %s" + +#: config.c:467 +#, c-format +msgid "bogus format in %s" +msgstr "felaktigt format i %s" + +#: config.c:793 #, c-format msgid "bad config line %d in blob %s" msgstr "felaktig konfigurationsfil rad %d i blob:en %s" -#: config.c:792 +#: config.c:797 #, c-format msgid "bad config line %d in file %s" msgstr "felaktig konfigurationsfil rad %d i filen %s" -#: config.c:796 +#: config.c:801 #, c-format msgid "bad config line %d in standard input" msgstr "felaktig konfigurationsfil rad %d i standard in" -#: config.c:800 +#: config.c:805 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s" -#: config.c:804 +#: config.c:809 #, c-format msgid "bad config line %d in command line %s" msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s" -#: config.c:808 +#: config.c:813 #, c-format msgid "bad config line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:936 +#: config.c:952 msgid "out of range" msgstr "utanför intervallet" -#: config.c:936 +#: config.c:952 msgid "invalid unit" msgstr "ogiltig enhet" -#: config.c:942 +#: config.c:958 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:947 +#: config.c:963 #, 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:950 +#: config.c:966 #, 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:953 +#: config.c:969 #, 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:956 +#: config.c:972 #, 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:959 +#: config.c:975 #, 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:962 +#: config.c:978 #, 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:1057 +#: config.c:1073 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:1066 +#: config.c:1082 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" -#: config.c:1171 config.c:1182 +#: config.c:1173 +#, c-format +msgid "abbrev length out of range: %d" +msgstr "förkortningslängd utanför intervallet: %d" + +#: config.c:1187 config.c:1198 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:1307 +#: config.c:1290 +msgid "core.commentChar should only be one character" +msgstr "core.commentChar kan bara vara ett tecken" + +#: config.c:1323 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1473 +#: config.c:1395 +#, c-format +msgid "malformed value for %s" +msgstr "felformat värde för %s" + +#: config.c:1421 +#, c-format +msgid "malformed value for %s: %s" +msgstr "felformat värde för %s: %s" + +#: config.c:1422 +msgid "must be one of nothing, matching, simple, upstream or current" +msgstr "måste vara en av nothing, matching, simple, upstream eller current" + +#: config.c:1483 builtin/pack-objects.c:3397 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1681 +#: config.c:1604 +#, c-format +msgid "unable to load config blob object '%s'" +msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\"" + +#: config.c:1607 +#, c-format +msgid "reference '%s' does not point to a blob" +msgstr "referensen \"%s\" pekar inte på en blob" + +#: config.c:1624 +#, c-format +msgid "unable to resolve config blob '%s'" +msgstr "kan inte slå upp konfigurerings-bloben \"%s\"" + +#: config.c:1654 +#, c-format +msgid "failed to parse %s" +msgstr "kunde inte tolka %s" + +#: config.c:1710 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:2013 +#: config.c:2059 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2200 +#: config.c:2229 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:2243 +#: config.c:2272 #, 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:2269 +#: config.c:2298 #, 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:2294 +#: config.c:2344 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2296 +#: config.c:2346 #, 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:2402 +#: config.c:2427 +#, c-format +msgid "invalid section name '%s'" +msgstr "felaktigt sektionsnamn \"%s\"" + +#: config.c:2459 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2766 config.c:3019 +#: config.c:2488 +#, c-format +msgid "failed to write new configuration file %s" +msgstr "kan inte skriva nya konfigurationsfilen \"%s\"" + +#: config.c:2740 config.c:3064 +#, c-format +msgid "could not lock config file %s" +msgstr "kunde inte låsa konfigurationsfilen %s" + +#: config.c:2751 +#, c-format +msgid "opening %s" +msgstr "öppnar %s" + +#: config.c:2786 builtin/config.c:328 +#, c-format +msgid "invalid pattern: %s" +msgstr "ogiltigt mönster: %s" + +#: config.c:2811 +#, c-format +msgid "invalid config file %s" +msgstr "ogiltig konfigurationsfil: \"%s\"" + +#: config.c:2824 config.c:3077 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:2905 +#: config.c:2835 +#, c-format +msgid "unable to mmap '%s'" +msgstr "kunde inte utföra mmap på \"%s\"" + +#: config.c:2844 config.c:3082 +#, c-format +msgid "chmod on %s failed" +msgstr "chmod misslyckades på %s" + +#: config.c:2929 config.c:3179 +#, c-format +msgid "could not write config file %s" +msgstr "kunde inte skriva konfigurationsfilen %s" + +#: config.c:2963 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:2907 builtin/remote.c:779 +#: config.c:2965 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" +#: config.c:3055 +#, c-format +msgid "invalid section name: %s" +msgstr "felaktigt namn på stycke: %s" + +#: config.c:3222 +#, c-format +msgid "missing value for '%s'" +msgstr "värde saknas för \"%s\"" + #: connect.c:61 -msgid "The remote end hung up upon initial contact" -msgstr "Fjärren lade på vid inledande kontakt" +msgid "the remote end hung up upon initial contact" +msgstr "fjärren lade på vid inledande kontakt" #: connect.c:63 msgid "" @@ -1485,37 +1935,185 @@ msgstr "" "Se till att du har korrekt åtkomstbehörighet\n" "och att arkivet existerar." +#: connect.c:81 +#, c-format +msgid "server doesn't support '%s'" +msgstr "Servern stöder inte \"%s\"" + +#: connect.c:103 +#, c-format +msgid "server doesn't support feature '%s'" +msgstr "servern stöder inte funktionen \"%s\"" + +#: connect.c:114 +msgid "expected flush after capabilities" +msgstr "förväntade \"flush\" efter förmågor" + +#: connect.c:233 +#, c-format +msgid "ignoring capabilities after first line '%s'" +msgstr "ignorerar förmågor efter första raden \"%s\"" + +#: connect.c:252 +msgid "protocol error: unexpected capabilities^{}" +msgstr "protokollfel: förväntade inte capabilities^{}" + +#: connect.c:273 +#, c-format +msgid "protocol error: expected shallow sha-1, got '%s'" +msgstr "protokollfel: förväntade \"shallow sha-1\" fick \"%s\"" + +#: connect.c:275 +msgid "repository on the other end cannot be shallow" +msgstr "arkivet på andra sidan kan inte vara grunt" + +#: connect.c:313 +msgid "invalid packet" +msgstr "ogiltigt paket" + +#: connect.c:333 +#, c-format +msgid "protocol error: unexpected '%s'" +msgstr "protokollfel: förväntade inte \"%s\"" + +#: connect.c:441 +#, c-format +msgid "invalid ls-refs response: %s" +msgstr "ogiltigt svar på ls-refs: %s" + +#: connect.c:445 +msgid "expected flush after ref listing" +msgstr "oväntad \"flush\" efter ref-listan" + +#: connect.c:544 +#, c-format +msgid "protocol '%s' is not supported" +msgstr "protokollet \"%s\" stöds inte" + +#: connect.c:595 +msgid "unable to set SO_KEEPALIVE on socket" +msgstr "kunde inte sätta SO_KEEPALIVE på uttaget" + +#: connect.c:635 connect.c:698 +#, c-format +msgid "Looking up %s ... " +msgstr "Slår upp %s..." + +#: connect.c:639 +#, c-format +msgid "unable to look up %s (port %s) (%s)" +msgstr "kan inte slå upp %s (port %s) (%s)" + +#. TRANSLATORS: this is the end of "Looking up %s ... " +#: connect.c:643 connect.c:714 +#, c-format +msgid "" +"done.\n" +"Connecting to %s (port %s) ... " +msgstr "" +"klart.\n" +"Ansluter till %s (port %s)..." + +#: connect.c:665 connect.c:742 +#, c-format +msgid "" +"unable to connect to %s:\n" +"%s" +msgstr "" +"kunde inte ansluta till %s:\n" +"%s" + +#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " +#: connect.c:671 connect.c:748 +msgid "done." +msgstr "klart." + +#: connect.c:702 +#, c-format +msgid "unable to look up %s (%s)" +msgstr "kunde inte slå upp %s (%s)" + +#: connect.c:708 +#, c-format +msgid "unknown port %s" +msgstr "okänd port %s" + +#: connect.c:845 connect.c:1171 +#, c-format +msgid "strange hostname '%s' blocked" +msgstr "konstigt värdnamn \"%s\" blockerat" + +#: connect.c:847 +#, c-format +msgid "strange port '%s' blocked" +msgstr "konstig port \"%s\" blockerad" + +#: connect.c:857 +#, c-format +msgid "cannot start proxy %s" +msgstr "kan inte starta mellanserver (proxy) %s" + +#: connect.c:924 +msgid "no path specified; see 'git help pull' for valid url syntax" +msgstr "ingen sökväg angavs; se \"git help pull\" för giltig URL-syntax" + +#: connect.c:1119 +msgid "ssh variant 'simple' does not support -4" +msgstr "ssh-varianten \"simple\" stöder inte -4" + +#: connect.c:1131 +msgid "ssh variant 'simple' does not support -6" +msgstr "ssh-varianten \"simple\" stöder inte -6" + +#: connect.c:1148 +msgid "ssh variant 'simple' does not support setting port" +msgstr "ssh-varianten \"simple\" stöder inte val av port" + +#: connect.c:1260 +#, c-format +msgid "strange pathname '%s' blocked" +msgstr "konstigt sökvägsnamn \"%s\" blockerat" + +#: connect.c:1307 +msgid "unable to fork" +msgstr "kunde inte grena (fork)" + # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145 +#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" -#: connected.c:78 +#: connected.c:97 msgid "Could not run 'git rev-list'" msgstr "Kunde inte köra \"git rev-list\"" -#: connected.c:98 +#: connected.c:117 msgid "failed write to rev-list" msgstr "kunde inte skriva till rev-list" -#: connected.c:105 +#: connected.c:124 msgid "failed to close rev-list's stdin" msgstr "kunde inte stänga rev-list:s standard in" +#: convert.c:193 +#, c-format +msgid "illegal crlf_action %d" +msgstr "felaktig crlf_action %d" + #: convert.c:206 #, c-format -msgid "CRLF would be replaced by LF in %s." -msgstr "CRLF skulle ersättas av LF i %s." +msgid "CRLF would be replaced by LF in %s" +msgstr "CRLF skulle ersättas av LF i %s" #: convert.c:208 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" -"The file will have its original line endings in your working directory." +"The file will have its original line endings in your working directory" msgstr "" "CRLF kommer att ersättas av LF i %s.\n" -"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog." +"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog" #: convert.c:216 #, c-format @@ -1526,10 +2124,10 @@ msgstr "LF skulle ersättas av CRLF i %s" #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" -"The file will have its original line endings in your working directory." +"The file will have its original line endings in your working directory" msgstr "" "LF kommer att ersättas av CRLF i %s.\n" -"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog." +"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog" #: convert.c:279 #, c-format @@ -1559,7 +2157,7 @@ msgstr "" "Filen \"%s\" saknar byte order mark (BOM). Använd UTF-%sBE eller UTF-%sLE " "(beroende på byteordning) som teckenkodning i arbetskatalogen." -#: convert.c:424 +#: convert.c:424 convert.c:495 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "misslyckades omkoda \"%s\" från %s till %s" @@ -1570,57 +2168,109 @@ msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" "omkodning av \"%s\" från %s till %s och tillbaka ger inte samma resultat" -#: convert.c:1225 +#: convert.c:673 +#, c-format +msgid "cannot fork to run external filter '%s'" +msgstr "kan inte grena (fork) för att köra externt filter \"%s\"" + +#: convert.c:693 +#, c-format +msgid "cannot feed the input to external filter '%s'" +msgstr "kunde inte skicka indata till externt filter \"%s\"" + +#: convert.c:700 +#, c-format +msgid "external filter '%s' failed %d" +msgstr "externt filter \"%s\" misslyckades %d" + +#: convert.c:735 convert.c:738 +#, c-format +msgid "read from external filter '%s' failed" +msgstr "läsning från externt filter \"%s\" misslyckades" + +#: convert.c:741 convert.c:796 +#, c-format +msgid "external filter '%s' failed" +msgstr "externt filter \"%s\" misslyckades" + +#: convert.c:844 +msgid "unexpected filter type" +msgstr "oväntad filtertyp" + +#: convert.c:855 +msgid "path name too long for external filter" +msgstr "sökvägen för lång för externt filter" + +#: convert.c:929 +#, c-format +msgid "" +"external filter '%s' is not available anymore although not all paths have " +"been filtered" +msgstr "" +"externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar " +"inte har filtrerats" + +#: convert.c:1228 msgid "true/false are no valid working-tree-encodings" msgstr "true/false är inte giltig teckenkodning för arbetskatalogen" -#: date.c:116 +#: convert.c:1398 convert.c:1432 +#, c-format +msgid "%s: clean filter '%s' failed" +msgstr "%s: \"clean\"-filtret \"%s\" misslyckades" + +#: convert.c:1476 +#, c-format +msgid "%s: smudge filter %s failed" +msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades" + +#: date.c:137 msgid "in the future" msgstr "i framtiden" -#: date.c:122 +#: date.c:143 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "%<PRIuMAX> sekund sedan" msgstr[1] "%<PRIuMAX> sekunder sedan" -#: date.c:129 +#: date.c:150 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "%<PRIuMAX> minut sedan" msgstr[1] "%<PRIuMAX> minuter sedan" -#: date.c:136 +#: date.c:157 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "%<PRIuMAX> timme sedan" msgstr[1] "%<PRIuMAX> timmar sedan" -#: date.c:143 +#: date.c:164 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "%<PRIuMAX> dag sedan" msgstr[1] "%<PRIuMAX> dagar sedan" -#: date.c:149 +#: date.c:170 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "%<PRIuMAX> vecka sedan" msgstr[1] "%<PRIuMAX> veckor sedan" -#: date.c:156 +#: date.c:177 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "%<PRIuMAX> månad sedan" msgstr[1] "%<PRIuMAX> månader sedan" -#: date.c:167 +#: date.c:188 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -1628,58 +2278,107 @@ msgstr[0] "%<PRIuMAX> år" msgstr[1] "%<PRIuMAX> år" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:170 +#: date.c:191 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "%s, %<PRIuMAX> månad sedan" msgstr[1] "%s, %<PRIuMAX> månader sedan" -#: date.c:175 date.c:180 +#: date.c:196 date.c:201 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" msgstr[0] "%<PRIuMAX> år sedan" msgstr[1] "%<PRIuMAX> år sedan" +#: delta-islands.c:272 +msgid "Propagating island marks" +msgstr "Sprider ö-markeringar" + +#: delta-islands.c:290 +#, c-format +msgid "bad tree object %s" +msgstr "felaktigt trädobjektet %s" + +#: delta-islands.c:334 +#, c-format +msgid "failed to load island regex for '%s': %s" +msgstr "kunde inte hämta ö-regex för \"%s\": %s" + +#: delta-islands.c:390 +#, c-format +msgid "island regex from config has too many capture groups (max=%d)" +msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)" + +#: delta-islands.c:466 +#, c-format +msgid "Marked %d islands, done.\n" +msgstr "Markerade %d öar, klar.\n" + #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" msgstr "kunde inte läsa orderfilen \"%s\"" -#: diffcore-rename.c:535 +#: diffcore-rename.c:544 msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" -#: diff.c:74 -#, c-format -msgid "option '%s' requires a value" -msgstr "flaggan \"%s\" behöver ett värde" +#: diff-no-index.c:238 +msgid "git diff --no-index [<options>] <path> <path>" +msgstr "git diff --no-index [<flaggor>] <sökväg> <sökväg>" -#: diff.c:152 +#: diff-no-index.c:263 +msgid "" +"Not a git repository. Use --no-index to compare two paths outside a working " +"tree" +msgstr "" +"Inte ett git-arkiv. Använd --no-index för att jämföra två sökvägar utanför " +"en arbetskatalog." + +#: diff.c:155 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n" -#: diff.c:157 +#: diff.c:160 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Okänd dirstat-parameter \"%s\"\n" -#: diff.c:281 +#: diff.c:296 msgid "" -"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " -"'plain'" +"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " +"'dimmed-zebra', 'plain'" msgstr "" "färginställningen för flyttade block måste vara en av \"no\", \"default\", " -"\"zebra\", \"dimmed_zebra\", \"plain\"" +"\"blocks\", \"zebra\", \"dimmed_zebra\", \"plain\"" + +#: diff.c:324 +#, c-format +msgid "" +"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " +"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" +msgstr "" +"okänt läge \"%s\" för color-moved-ws, möjliga värden är \"ignore-space-change" +"\", \"ignore-space-at-eol\", \"ignore-all-space\", \"allow-indentation-change" +"\"" -#: diff.c:341 +#: diff.c:332 +msgid "" +"color-moved-ws: allow-indentation-change cannot be combined with other " +"whitespace modes" +msgstr "" +"color-moved-ws: allow-indentation-change kan inte kombineras med andra " +"blankstegslägen" + +#: diff.c:405 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:401 +#: diff.c:465 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1688,24 +2387,35 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:3823 +#: diff.c:4210 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:4153 +#: diff.c:4555 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" -#: diff.c:4156 +#: diff.c:4558 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S och --find-object är ömsesidigt uteslutande" -#: diff.c:4244 +#: diff.c:4636 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:4410 +#: diff.c:4684 +#, c-format +msgid "invalid --stat value: %s" +msgstr "ogiltigt värde för --stat: %s" + +#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5216 +#: parse-options.c:200 +#, c-format +msgid "%s expects a numerical value" +msgstr "%s förväntar ett numeriskt värde" + +#: diff.c:4721 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1714,267 +2424,839 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:4424 +#: diff.c:4806 +#, c-format +msgid "unknown change class '%c' in --diff-filter=%s" +msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s" + +#: diff.c:4830 +#, c-format +msgid "unknown value after ws-error-highlight=%.*s" +msgstr "okänt värde efter ws-error-highlight=%.*s" + +#: diff.c:4844 +#, c-format +msgid "unable to resolve '%s'" +msgstr "kunde inte slå upp \"%s\"" + +#: diff.c:4894 diff.c:4900 +#, c-format +msgid "%s expects <n>/<m> form" +msgstr "%s förväntar formen <n>/<m>" + +#: diff.c:4912 +#, c-format +msgid "%s expects a character, got '%s'" +msgstr "%s förväntar ett tecken, fick \"%s\"" + +#: diff.c:4933 +#, c-format +msgid "bad --color-moved argument: %s" +msgstr "felaktigt argument till --color-moved: %s" + +#: diff.c:4952 +#, c-format +msgid "invalid mode '%s' in --color-moved-ws" +msgstr "ogiltigt läge %s\" i --color-moved-ws" + +#: diff.c:4992 +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och " +"\"histogram\"" + +#: diff.c:5028 diff.c:5048 +#, c-format +msgid "invalid argument to %s" +msgstr "ogiltigt argument för %s" + +#: diff.c:5186 +#, c-format +msgid "failed to parse --submodule option parameter: '%s'" +msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\"" + +#: diff.c:5240 #, c-format -msgid "Failed to parse --submodule option parameter: '%s'" -msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" +msgid "bad --word-diff argument: %s" +msgstr "felaktigt argument --word-diff: %s" + +#: diff.c:5263 +msgid "Diff output format options" +msgstr "Formatflaggor för diff-utdata" + +#: diff.c:5265 diff.c:5271 +msgid "generate patch" +msgstr "skapar patch" + +#: diff.c:5268 builtin/log.c:167 +msgid "suppress diff output" +msgstr "undertryck diff-utdata" + +#: diff.c:5273 diff.c:5387 diff.c:5394 +msgid "<n>" +msgstr "<n>" + +#: diff.c:5274 diff.c:5277 +msgid "generate diffs with <n> lines context" +msgstr "skapa diffar med <n> rader sammanhang" + +#: diff.c:5279 +msgid "generate the diff in raw format" +msgstr "generera diff i råformat" + +#: diff.c:5282 +msgid "synonym for '-p --raw'" +msgstr "synonym till \"-p --raw\"" + +#: diff.c:5286 +msgid "synonym for '-p --stat'" +msgstr "synonym till \"-p --stat\"" + +#: diff.c:5290 +msgid "machine friendly --stat" +msgstr "maskinläsbar --stat" + +#: diff.c:5293 +msgid "output only the last line of --stat" +msgstr "skriv bara ut den sista raden för --stat" + +#: diff.c:5295 diff.c:5303 +msgid "<param1,param2>..." +msgstr "<param1,param2>..." + +#: diff.c:5296 +msgid "" +"output the distribution of relative amount of changes for each sub-directory" +msgstr "" +"skriv ut distributionen av relativa mängder ändringar för varje underkatalog" + +#: diff.c:5300 +msgid "synonym for --dirstat=cumulative" +msgstr "synonym för --dirstat=cumulative" + +#: diff.c:5304 +msgid "synonym for --dirstat=files,param1,param2..." +msgstr "synonym för --dirstat=filer,param1,param2..." + +#: diff.c:5308 +msgid "warn if changes introduce conflict markers or whitespace errors" +msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel" + +#: diff.c:5311 +msgid "condensed summary such as creations, renames and mode changes" +msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen" + +#: diff.c:5314 +msgid "show only names of changed files" +msgstr "visa endast namnen på ändrade filer" + +#: diff.c:5317 +msgid "show only names and status of changed files" +msgstr "visa endast namn och status för ändrade filer" + +#: diff.c:5319 +msgid "<width>[,<name-width>[,<count>]]" +msgstr "<bredd>[,<namn-bredd>[,<antal>]]" + +#: diff.c:5320 +msgid "generate diffstat" +msgstr "skapa diffstat" + +#: diff.c:5322 diff.c:5325 diff.c:5328 +msgid "<width>" +msgstr "<bredd>" + +#: diff.c:5323 +msgid "generate diffstat with a given width" +msgstr "generera en diffstat med given bredd" + +#: diff.c:5326 +msgid "generate diffstat with a given name width" +msgstr "generera en diffstat med given namnbredd" + +#: diff.c:5329 +msgid "generate diffstat with a given graph width" +msgstr "generera en diffstat med given grafbredd" + +#: diff.c:5331 +msgid "<count>" +msgstr "<antal>" + +#: diff.c:5332 +msgid "generate diffstat with limited lines" +msgstr "generera diffstat med begränsade rader" + +#: diff.c:5335 +msgid "generate compact summary in diffstat" +msgstr "skapa kompakt översikt i diffstat" + +#: diff.c:5338 +msgid "output a binary diff that can be applied" +msgstr "skapa en binärdiff som kan appliceras" + +#: diff.c:5341 +msgid "show full pre- and post-image object names on the \"index\" lines" +msgstr "" +"visa fullständiga objektnamn i \"index\"-rader för läget både före och efter" + +#: diff.c:5343 +msgid "show colored diff" +msgstr "visa färgad diff" + +#: diff.c:5344 +msgid "<kind>" +msgstr "<typ>" + +#: diff.c:5345 +msgid "" +"highlight whitespace errors in the 'context', 'old' or 'new' lines in the " +"diff" +msgstr "" +"ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller " +"\"new\" (nya) rader i diffen" + +#: diff.c:5348 +msgid "" +"do not munge pathnames and use NULs as output field terminators in --raw or " +"--numstat" +msgstr "" +"skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw " +"eller --numstat" + +#: diff.c:5351 diff.c:5354 diff.c:5357 diff.c:5463 +msgid "<prefix>" +msgstr "<prefix>" + +#: diff.c:5352 +msgid "show the given source prefix instead of \"a/\"" +msgstr "visa givet källprefix istället för \"a/\"" + +#: diff.c:5355 +msgid "show the given source prefix instead of \"b/\"" +msgstr "visa givet källprefix istället för \"b/\"" + +#: diff.c:5358 +msgid "prepend an additional prefix to every line of output" +msgstr "lägg till ytterligare prefix på alla rader i utdata" + +#: diff.c:5361 +msgid "do not show any source or destination prefix" +msgstr "visa inte käll- eller målprefix" + +#: diff.c:5364 +msgid "show context between diff hunks up to the specified number of lines" +msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader" + +#: diff.c:5368 diff.c:5373 diff.c:5378 +msgid "<char>" +msgstr "<tecken>" + +#: diff.c:5369 +msgid "specify the character to indicate a new line instead of '+'" +msgstr "ange tecken för att ange ny rad istället för \"+\"" + +#: diff.c:5374 +msgid "specify the character to indicate an old line instead of '-'" +msgstr "ange tecken för att ange gammal rad istället för \"-\"" + +#: diff.c:5379 +msgid "specify the character to indicate a context instead of ' '" +msgstr "ange tecken för att ange sammanhang istället för \" \"" + +#: diff.c:5382 +msgid "Diff rename options" +msgstr "Diff-namnbytesflaggor" + +#: diff.c:5383 +msgid "<n>[/<m>]" +msgstr "<n>[/<m>]" + +#: diff.c:5384 +msgid "break complete rewrite changes into pairs of delete and create" +msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par" + +#: diff.c:5388 +msgid "detect renames" +msgstr "detektera namnändringar" + +#: diff.c:5392 +msgid "omit the preimage for deletes" +msgstr "ta bort för-version för borttagningar" + +#: diff.c:5395 +msgid "detect copies" +msgstr "detektera kopior" + +#: diff.c:5399 +msgid "use unmodified files as source to find copies" +msgstr "använd oförändrade som källa för att hitta kopior" + +#: diff.c:5401 +msgid "disable rename detection" +msgstr "inaktivera detektering av namnbyten" + +#: diff.c:5404 +msgid "use empty blobs as rename source" +msgstr "använd tomma blob:ar som namnändringskälla" + +#: diff.c:5406 +msgid "continue listing the history of a file beyond renames" +msgstr "fortsätt lista historiken för en fil bortom namnändringar" + +#: diff.c:5409 +msgid "" +"prevent rename/copy detection if the number of rename/copy targets exceeds " +"given limit" +msgstr "" +"förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver " +"given gräns" + +#: diff.c:5411 +msgid "Diff algorithm options" +msgstr "Alternativ för diff-algoritm" + +#: diff.c:5413 +msgid "produce the smallest possible diff" +msgstr "skapa minsta möjliga diff" + +#: diff.c:5416 +msgid "ignore whitespace when comparing lines" +msgstr "ignorera blanktecken vid radjämförelse" + +#: diff.c:5419 +msgid "ignore changes in amount of whitespace" +msgstr "ignorera ändringar i antal blanktecken vid radjämförelse" + +#: diff.c:5422 +msgid "ignore changes in whitespace at EOL" +msgstr "ignorera blanktecken vid radslut" + +#: diff.c:5425 +msgid "ignore carrier-return at the end of line" +msgstr "ignorera CR-tecken vid radslut" + +#: diff.c:5428 +msgid "ignore changes whose lines are all blank" +msgstr "ignorera ändringar i rader som är helt blanka" + +#: diff.c:5431 +msgid "heuristic to shift diff hunk boundaries for easy reading" +msgstr "heuristik för att flytta diff-gränser för lättare läsning" + +#: diff.c:5434 +msgid "generate diff using the \"patience diff\" algorithm" +msgstr "skapa diffar med algoritmen \"patience diff\"" + +#: diff.c:5438 +msgid "generate diff using the \"histogram diff\" algorithm" +msgstr "skapa diffar med algoritmen \"histogram diff\"" + +#: diff.c:5440 +msgid "<algorithm>" +msgstr "<algoritm>" + +#: diff.c:5441 +msgid "choose a diff algorithm" +msgstr "välj en diff-algoritm" + +#: diff.c:5443 +msgid "<text>" +msgstr "<text>" + +#: diff.c:5444 +msgid "generate diff using the \"anchored diff\" algorithm" +msgstr "skapa diffar med algoritmen \"anchored diff\"" + +#: diff.c:5446 diff.c:5455 diff.c:5458 +msgid "<mode>" +msgstr "<läge>" + +#: diff.c:5447 +msgid "show word diff, using <mode> to delimit changed words" +msgstr "visa orddiff, där <läge> avgränsar ändrade ord" + +#: diff.c:5449 diff.c:5452 diff.c:5497 +msgid "<regex>" +msgstr "<reguttr>" + +#: diff.c:5450 +msgid "use <regex> to decide what a word is" +msgstr "använd <reguttr> för att bestämma vad som är ett ord" + +#: diff.c:5453 +msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" +msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>" + +#: diff.c:5456 +msgid "move lines of code are colored differently" +msgstr "flyttade kodrader färgas på annat sätt" + +#: diff.c:5459 +msgid "how white spaces are ignored in --color-moved" +msgstr "hur blanktecken ignoreras i --color-moved" + +#: diff.c:5462 +msgid "Diff other options" +msgstr "Andra diff-flaggor" + +#: diff.c:5464 +msgid "when run from subdir, exclude changes outside and show relative paths" +msgstr "" +"vid start från underkatalog, uteslut ändringar utanför och visa relativa " +"sökvägar" + +#: diff.c:5468 +msgid "treat all files as text" +msgstr "hantera alla filer som text" + +#: diff.c:5470 +msgid "swap two inputs, reverse the diff" +msgstr "växla två indatafiler, vänd diffen" + +#: diff.c:5472 +msgid "exit with 1 if there were differences, 0 otherwise" +msgstr "avsluta med 1 vid ändringar, annars 0" + +#: diff.c:5474 +msgid "disable all output of the program" +msgstr "slå av alla utdata från programmet" + +#: diff.c:5476 +msgid "allow an external diff helper to be executed" +msgstr "tillåt köra en extern diff-hjälpare" + +#: diff.c:5478 +msgid "run external text conversion filters when comparing binary files" +msgstr "kör externt textkonverteringsfiler när binärfiler jämförs" + +#: diff.c:5480 +msgid "<when>" +msgstr "<när>" + +#: diff.c:5481 +msgid "ignore changes to submodules in the diff generation" +msgstr "ignorera ändringar i undermoduler när diffen skapas" + +#: diff.c:5484 +msgid "<format>" +msgstr "<format>" + +#: diff.c:5485 +msgid "specify how differences in submodules are shown" +msgstr "ange hur ändringar i undermoduler visas" + +#: diff.c:5489 +msgid "hide 'git add -N' entries from the index" +msgstr "dölj \"git add -N\"-poster från indexet" + +#: diff.c:5492 +msgid "treat 'git add -N' entries as real in the index" +msgstr "tolka \"git add -N\"-poster som äkta i indexet" + +#: diff.c:5494 +msgid "<string>" +msgstr "<sträng>" + +#: diff.c:5495 +msgid "" +"look for differences that change the number of occurrences of the specified " +"string" +msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng" + +#: diff.c:5498 +msgid "" +"look for differences that change the number of occurrences of the specified " +"regex" +msgstr "" +"se efter ändringar som ändrar antalet förekomster av angivet reguljärt " +"uttryck" + +#: diff.c:5501 +msgid "show all changes in the changeset with -S or -G" +msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G" + +#: diff.c:5504 +msgid "treat <string> in -S as extended POSIX regular expression" +msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck" -#: diff.c:5500 +#: diff.c:5507 +msgid "control the order in which files appear in the output" +msgstr "styr ordningen i vilken filer visas i utdata" + +#: diff.c:5508 +msgid "<object-id>" +msgstr "<objekt-id>" + +#: diff.c:5509 +msgid "" +"look for differences that change the number of occurrences of the specified " +"object" +msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt" + +#: diff.c:5511 +msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" +msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" + +#: diff.c:5512 +msgid "select files by diff type" +msgstr "välj filter efter diff-typ" + +#: diff.c:5514 +msgid "<file>" +msgstr "<fil>" + +#: diff.c:5515 +msgid "Output to a specific file" +msgstr "Skriv utdata till en specifik fil" + +#: diff.c:6148 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:5503 +#: diff.c:6151 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:5506 +#: diff.c:6154 #, 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:1867 +#: dir.c:537 +#, c-format +msgid "pathspec '%s' did not match any file(s) known to git" +msgstr "sökvägsangivelsen \"%s\" motsvarade inte några av git kända filer" + +#: dir.c:926 +#, c-format +msgid "cannot use %s as an exclude file" +msgstr "kan inte använda %s som exkluderingsfil" + +#: dir.c:1843 #, c-format msgid "could not open directory '%s'" msgstr "kunde inte öppna katalogen \"%s\"" -#: dir.c:2109 +#: dir.c:2085 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:2233 -msgid "Untracked cache is disabled on this system or location." -msgstr "Ospårad cache är inaktiverad på systemet eller platsen." +#: dir.c:2209 +msgid "untracked cache is disabled on this system or location" +msgstr "ospårad cache är inaktiverad på systemet eller platsen" + +#: dir.c:3013 +#, c-format +msgid "index file corrupt in repo %s" +msgstr "indexfilen trasig i arkivet %s" -#: dir.c:3075 dir.c:3080 +#: dir.c:3058 dir.c:3063 #, c-format msgid "could not create directories for %s" msgstr "kunde inte skapa kataloger för %s" -#: dir.c:3109 +#: dir.c:3092 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" -#: editor.c:61 +#: editor.c:73 #, 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 +#: entry.c:178 msgid "Filtering content" msgstr "Filtrerar innehåll" -#: entry.c:435 +#: entry.c:476 #, c-format msgid "could not stat file '%s'" msgstr "kunde inte ta status på filen \"%s\"" +#: environment.c:150 +#, c-format +msgid "bad git namespace path \"%s\"" +msgstr "felaktig git-namnrymdssökväg \"%s\"" + +#: environment.c:332 +#, c-format +msgid "could not set GIT_DIR to '%s'" +msgstr "kunde inte ställa in GIT_DIR till \"%s\"" + +#: exec-cmd.c:363 +#, c-format +msgid "too many args to run %s" +msgstr "för många flaggor för att köra %s" + #: fetch-object.c:17 msgid "Remote with no URL" msgstr "Fjärr utan URL" -#: fetch-pack.c:254 +#: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: förväntade grund lista" -#: fetch-pack.c:266 +#: fetch-pack.c:154 +msgid "git fetch-pack: expected a flush packet after shallow list" +msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista" + +#: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket" -#: fetch-pack.c:285 builtin/archive.c:63 -#, c-format -msgid "remote error: %s" -msgstr "fjärrfel: %s" - -#: fetch-pack.c:286 +#: fetch-pack.c:185 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\"" -#: fetch-pack.c:338 +#: fetch-pack.c:196 +msgid "unable to write to remote" +msgstr "kunde inte skriva till fjärren" + +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc kräver ”multi_ack_detailed”" -#: fetch-pack.c:429 fetch-pack.c:1310 +#: fetch-pack.c:360 fetch-pack.c:1271 #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" -#: fetch-pack.c:435 fetch-pack.c:1316 +#: fetch-pack.c:366 fetch-pack.c:1277 #, c-format msgid "invalid unshallow line: %s" msgstr "ogiltig \"unshallow\"-rad: %s" -#: fetch-pack.c:437 fetch-pack.c:1318 +#: fetch-pack.c:368 fetch-pack.c:1279 #, c-format msgid "object not found: %s" msgstr "objektet hittades inte: %s" -#: fetch-pack.c:440 fetch-pack.c:1321 +#: fetch-pack.c:371 fetch-pack.c:1282 #, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" -#: fetch-pack.c:442 fetch-pack.c:1323 +#: fetch-pack.c:373 fetch-pack.c:1284 #, c-format msgid "no shallow found: %s" msgstr "ingen \"shallow\" hittades: %s" -#: fetch-pack.c:445 fetch-pack.c:1326 +#: fetch-pack.c:376 fetch-pack.c:1288 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "förväntade shallow/unshallow, fick %s" -#: fetch-pack.c:486 +#: fetch-pack.c:417 #, c-format msgid "got %s %d %s" msgstr "fick %s %d %s" -#: fetch-pack.c:500 +#: fetch-pack.c:434 #, c-format msgid "invalid commit %s" msgstr "ogiltig incheckning %s" -#: fetch-pack.c:533 +#: fetch-pack.c:465 msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:543 progress.c:229 +#: fetch-pack.c:477 progress.c:284 msgid "done" msgstr "klart" -#: fetch-pack.c:555 +#: fetch-pack.c:489 #, c-format msgid "got %s (%d) %s" msgstr "fick %s (%d) %s" -#: fetch-pack.c:601 +#: fetch-pack.c:535 #, c-format msgid "Marking %s as complete" msgstr "Markerar %s som komplett" -#: fetch-pack.c:828 +#: fetch-pack.c:744 #, c-format msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:869 +#: fetch-pack.c:783 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:877 +#: fetch-pack.c:791 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:944 +#: fetch-pack.c:859 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-patch: kunde inte grena av %s" -#: fetch-pack.c:960 +#: fetch-pack.c:875 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:962 +#: fetch-pack.c:877 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:989 +#: fetch-pack.c:906 msgid "Server does not support shallow clients" msgstr "Servern stöder inte klienter med grunda arkiv" -#: fetch-pack.c:993 +#: fetch-pack.c:910 msgid "Server supports multi_ack_detailed" msgstr "Servern stöder \"multi_ack_detailed\"" -#: fetch-pack.c:996 +#: fetch-pack.c:913 msgid "Server supports no-done" msgstr "Servern stöder \"no-done\"" -#: fetch-pack.c:1002 +#: fetch-pack.c:919 msgid "Server supports multi_ack" msgstr "Servern stöder \"multi_ack\"" -#: fetch-pack.c:1006 +#: fetch-pack.c:923 msgid "Server supports side-band-64k" msgstr "Servern stöder \"side-band-64k\"" -#: fetch-pack.c:1010 +#: fetch-pack.c:927 msgid "Server supports side-band" msgstr "Servern stöder \"side-band\"" -#: fetch-pack.c:1014 +#: fetch-pack.c:931 msgid "Server supports allow-tip-sha1-in-want" msgstr "Servern stöder \"allow-tip-sha1-in-want\"" -#: fetch-pack.c:1018 +#: fetch-pack.c:935 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Servern stöder \"allow-reachable-sha1-in-want\"" -#: fetch-pack.c:1028 +#: fetch-pack.c:945 msgid "Server supports ofs-delta" msgstr "Servern stöder \"ofs-delta\"" -#: fetch-pack.c:1034 fetch-pack.c:1204 +#: fetch-pack.c:951 fetch-pack.c:1144 msgid "Server supports filter" msgstr "Servern stöder filter" -#: fetch-pack.c:1042 +#: fetch-pack.c:959 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:1048 +#: fetch-pack.c:965 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:1052 +#: fetch-pack.c:969 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:1054 +#: fetch-pack.c:971 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:1065 +#: fetch-pack.c:988 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:1077 fetch-pack.c:1414 +#: fetch-pack.c:1000 fetch-pack.c:1449 msgid "git fetch-pack: fetch failed." msgstr "git fetch-patch: hämtning misslyckades." -#: fetch-pack.c:1199 +#: fetch-pack.c:1138 msgid "Server does not support shallow requests" msgstr "Servern stöder inte grunda förfrågningar" -#: fetch-pack.c:1584 +#: fetch-pack.c:1171 +msgid "unable to write request to remote" +msgstr "kunde inte skriva anrop till fjärren" + +#: fetch-pack.c:1189 +#, c-format +msgid "error reading section header '%s'" +msgstr "fel vid läsning av styckehuvudet \"%s\"" + +#: fetch-pack.c:1195 +#, c-format +msgid "expected '%s', received '%s'" +msgstr "förväntade \"%s\", tog emot \"%s\"" + +#: fetch-pack.c:1234 +#, c-format +msgid "unexpected acknowledgment line: '%s'" +msgstr "förväntade bekräftelserad: \"%s\"" + +#: fetch-pack.c:1239 +#, c-format +msgid "error processing acks: %d" +msgstr "fel vid hantering av bekräftelser: %d" + +#: fetch-pack.c:1249 +msgid "expected packfile to be sent after 'ready'" +msgstr "väntade att paketfil skulle sändas efter \"ready\"" + +#: fetch-pack.c:1251 +msgid "expected no other sections to be sent after no 'ready'" +msgstr "" +"väntade inte att några ytterligare sektioner skulle sändas efter \"ready\"" + +#: fetch-pack.c:1293 +#, c-format +msgid "error processing shallow info: %d" +msgstr "fel vid hantering av grund (\"shallow\") info: %d" + +#: fetch-pack.c:1340 +#, c-format +msgid "expected wanted-ref, got '%s'" +msgstr "förväntade wanted-ref, fick %s" + +#: fetch-pack.c:1345 +#, c-format +msgid "unexpected wanted-ref: '%s'" +msgstr "oväntad wanted-ref: \"%s\"" + +#: fetch-pack.c:1350 +#, c-format +msgid "error processing wanted refs: %d" +msgstr "fel vid hantering av önskade referenser: %d" + +#: fetch-pack.c:1676 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1610 +#: fetch-pack.c:1699 builtin/clone.c:676 +msgid "remote did not send all necessary objects" +msgstr "fjärren sände inte alla nödvändiga objekt" + +#: fetch-pack.c:1726 #, c-format msgid "no such remote ref %s" msgstr "ingen sådan fjärreferens: %s" -#: fetch-pack.c:1613 +#: fetch-pack.c:1729 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s" -#: gpg-interface.c:185 +#: gpg-interface.c:318 msgid "gpg failed to sign the data" msgstr "gpg misslyckades signera data" -#: gpg-interface.c:210 +#: gpg-interface.c:344 msgid "could not create temporary file" msgstr "kunde inte skapa temporära fil" -#: gpg-interface.c:213 +#: gpg-interface.c:347 #, c-format msgid "failed writing detached signature to '%s'" msgstr "misslyckades skriva fristående signatur till \"%s\"" @@ -1984,18 +3266,18 @@ 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:2020 +#: grep.c:2113 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81 -#: builtin/rm.c:134 +#: grep.c:2130 setup.c:164 builtin/clone.c:414 builtin/diff.c:82 +#: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:2048 +#: grep.c:2141 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" @@ -2052,29 +3334,41 @@ msgstr "Lågnivåkommandon / synka arkiv" msgid "Low-level Commands / Internal Helpers" msgstr "Lågnivåkommandon / interna hjälpare" -#: help.c:293 +#: help.c:298 #, c-format msgid "available git commands in '%s'" msgstr "git-kommandon tillgängliga i \"%s\"" -#: help.c:300 +#: help.c:305 msgid "git commands available from elsewhere on your $PATH" msgstr "git-kommandon från andra platser i din $PATH" -#: help.c:309 +#: help.c:314 msgid "These are common Git commands used in various situations:" msgstr "Dessa vanliga Git-kommandon används i olika situationer:" -#: help.c:358 git.c:90 +#: help.c:363 git.c:97 #, c-format msgid "unsupported command listing type '%s'" msgstr "okänd kommandolisttyp \"%s\"" -#: help.c:405 +#: help.c:403 msgid "The common Git guides are:" msgstr "De vanliga Git-vägledningarna är:" -#: help.c:467 +#: help.c:512 +msgid "See 'git help <command>' to read about a specific subcommand" +msgstr "Se \"git help <kommando>\" för att läsa om ett specifikt underkommando" + +#: help.c:517 +msgid "External commands" +msgstr "Externa kommandon" + +#: help.c:532 +msgid "Command aliases" +msgstr "Kommadoalias" + +#: help.c:596 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -2083,32 +3377,32 @@ msgstr "" "\"%s\" verkar vara ett git-kommando, men vi kan inte\n" "köra det. Kanske git-%s är trasigt?" -#: help.c:526 +#: help.c:655 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls." -#: help.c:548 +#: help.c:677 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns." -#: help.c:553 +#: help.c:682 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Fortsätter under förutsättningen att du menade ”%s”." -#: help.c:558 +#: help.c:687 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" "Fortsätter om %0.1f sekunder, under förutsättningen att du menade ”%s”." -#: help.c:566 +#: help.c:695 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"." -#: help.c:570 +#: help.c:699 msgid "" "\n" "The most similar command is" @@ -2122,16 +3416,16 @@ msgstr[1] "" "\n" "Mest lika kommandon är" -#: help.c:585 +#: help.c:714 msgid "git version [<options>]" msgstr "git version [<flaggor>]" -#: help.c:652 +#: help.c:782 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:656 +#: help.c:786 msgid "" "\n" "Did you mean this?" @@ -2145,7 +3439,7 @@ msgstr[1] "" "\n" "Menade du ett av dessa?" -#: ident.c:342 +#: ident.c:349 msgid "" "\n" "*** Please tell me who you are.\n" @@ -2171,44 +3465,63 @@ msgstr "" "Kör utan --global för att endast ändra i aktuellt arkiv.\n" "\n" -#: ident.c:366 +#: ident.c:379 msgid "no email was given and auto-detection is disabled" msgstr "ingen e-post angavs och autodetektering är inaktiverad" -#: ident.c:371 +#: ident.c:384 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "kunde inte autodetektera e-postadress (fick \"%s\")" -#: ident.c:381 +#: ident.c:401 msgid "no name was given and auto-detection is disabled" msgstr "inget namn angavs och autodetektering är inaktiverad" -#: ident.c:387 +#: ident.c:407 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "kunde inte autodetektera namn (fick \"%s\")" -#: ident.c:395 +#: ident.c:415 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "tomt ident-namn (för <%s>) ej tillåtet" -#: ident.c:401 +#: ident.c:421 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "namnet består enbart av ej tillåtna tecken: %s" -#: ident.c:416 builtin/commit.c:587 +#: ident.c:436 builtin/commit.c:608 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" +#: list-objects.c:129 +#, c-format +msgid "entry '%s' in tree %s has tree mode, but is not a tree" +msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd" + +#: list-objects.c:142 +#, c-format +msgid "entry '%s' in tree %s has blob mode, but is not a blob" +msgstr "posten \"%s\" i trädet %s har blob-läge, men är inte en blob" + +#: list-objects.c:378 +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "kunde inte läsa in rot-trädet för incheckningen %s" + #: list-objects-filter-options.c:36 msgid "multiple filter-specs cannot be combined" msgstr "flera filterspecifikationer kan inte kombineras" -#: list-objects-filter-options.c:126 +#: list-objects-filter-options.c:58 +msgid "expected 'tree:<depth>'" +msgstr "förväntade \"tree:<djup>\"" + +#: list-objects-filter-options.c:156 msgid "cannot change partial clone promisor remote" msgstr "kan inte ändra kontraktsfjärr för delvis kloning" @@ -2237,124 +3550,125 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "Kunde inte skapa \"%s.lock\": %s" -#: merge.c:71 +#: merge.c:41 msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378 -#: builtin/checkout.c:606 builtin/clone.c:761 +#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921 +#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:776 +#: builtin/stash.c:264 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: merge-recursive.c:298 +#: merge-recursive.c:322 msgid "(bad commit)\n" msgstr "(felaktig incheckning)\n" -#: merge-recursive.c:320 +#: merge-recursive.c:345 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" "add_cahceinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen." -#: merge-recursive.c:328 +#: merge-recursive.c:354 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar " "sammanslagningen." -#: merge-recursive.c:410 +#: merge-recursive.c:437 msgid "error building trees" msgstr "fel vid byggande av träd" -#: merge-recursive.c:881 +#: merge-recursive.c:861 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:892 +#: merge-recursive.c:872 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Tar bort %s för att göra plats för underkatalog\n" -#: merge-recursive.c:906 merge-recursive.c:925 +#: merge-recursive.c:886 merge-recursive.c:905 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:915 +#: merge-recursive.c:895 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:957 builtin/cat-file.c:37 +#: merge-recursive.c:936 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:959 +#: merge-recursive.c:939 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:983 +#: merge-recursive.c:963 #, c-format msgid "failed to open '%s': %s" msgstr "misslyckades öppna \"%s\": %s" -#: merge-recursive.c:994 +#: merge-recursive.c:974 #, c-format msgid "failed to symlink '%s': %s" msgstr "misslyckades skapa symboliska länken \"%s\": %s" -#: merge-recursive.c:999 +#: merge-recursive.c:979 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "vet inte hur %06o %s \"%s\" skall hanteras" -#: merge-recursive.c:1186 +#: merge-recursive.c:1175 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)" -#: merge-recursive.c:1193 +#: merge-recursive.c:1182 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)" -#: merge-recursive.c:1200 +#: merge-recursive.c:1189 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Misslyckades slå ihop undermodulen %s (incheckningar följer inte " "sammanslagningsbasen)" -#: merge-recursive.c:1208 merge-recursive.c:1220 +#: merge-recursive.c:1197 merge-recursive.c:1209 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Snabbspolar undermodulen %s till följande incheckning:" -#: merge-recursive.c:1211 merge-recursive.c:1223 +#: merge-recursive.c:1200 merge-recursive.c:1212 #, c-format -msgid "Fast-forwarding submodule %s to %s" -msgstr "Snabbspolar undermodulen %s till %s" +msgid "Fast-forwarding submodule %s" +msgstr "Snabbspolar undermodulen %s" -#: merge-recursive.c:1245 +#: merge-recursive.c:1235 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar " "hittades inte)" -#: merge-recursive.c:1249 +#: merge-recursive.c:1239 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)" -#: merge-recursive.c:1250 +#: merge-recursive.c:1240 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n" -#: merge-recursive.c:1253 +#: merge-recursive.c:1243 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -2371,32 +3685,32 @@ msgstr "" "\n" "vilket godtar lösningen.\n" -#: merge-recursive.c:1262 +#: merge-recursive.c:1252 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)" -#: merge-recursive.c:1321 +#: merge-recursive.c:1325 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:1326 +#: merge-recursive.c:1330 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:1358 +#: merge-recursive.c:1362 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1423 +#: merge-recursive.c:1385 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället." -#: merge-recursive.c:1475 +#: merge-recursive.c:1457 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2405,7 +3719,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet." -#: merge-recursive.c:1480 +#: merge-recursive.c:1462 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2414,7 +3728,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av " "%s lämnad i trädet." -#: merge-recursive.c:1487 +#: merge-recursive.c:1469 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2423,7 +3737,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet vid %s." -#: merge-recursive.c:1492 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2432,31 +3746,40 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av " "%s lämnad i trädet vid %s." -#: merge-recursive.c:1526 +#: merge-recursive.c:1509 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1526 +#: merge-recursive.c:1509 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368 -#: merge-recursive.c:3086 +#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Vägrar förlora lortig fil vid \"%s\"" -#: merge-recursive.c:1594 +#: merge-recursive.c:1599 +#, c-format +msgid "Refusing to lose untracked file at %s, even though it's in the way." +msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen." + +#: merge-recursive.c:1657 +#, c-format +msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" +msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s" + +#: merge-recursive.c:1687 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s är en katalog i %s lägger till som %s istället" -#: merge-recursive.c:1599 +#: merge-recursive.c:1692 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället" -#: merge-recursive.c:1625 +#: merge-recursive.c:1711 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2465,27 +3788,17 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1630 +#: merge-recursive.c:1716 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1694 +#: merge-recursive.c:1825 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s" -#: merge-recursive.c:1733 -#, c-format -msgid "Renaming %s to %s and %s to %s instead" -msgstr "Byter namn på %s till %s och %s till %s istället" - -#: merge-recursive.c:1745 -#, c-format -msgid "Refusing to lose untracked file at %s, even though it's in the way." -msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen." - -#: merge-recursive.c:1951 +#: merge-recursive.c:2030 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -2496,7 +3809,7 @@ msgstr "" "katalogen %s bytte namn till flera andra kataloger, utan att någon " "destination fick en majoritet av filerna." -#: merge-recursive.c:1983 +#: merge-recursive.c:2062 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -2505,7 +3818,7 @@ msgstr "" "KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för " "implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s." -#: merge-recursive.c:1993 +#: merge-recursive.c:2072 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -2514,7 +3827,7 @@ msgstr "" "KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till " "%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s" -#: merge-recursive.c:2085 +#: merge-recursive.c:2164 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -2523,7 +3836,7 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog " "%s->%s i %s" -#: merge-recursive.c:2330 +#: merge-recursive.c:2408 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -2532,124 +3845,300 @@ msgstr "" "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har " "bytt namn." -#: merge-recursive.c:2736 -#, c-format -msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" -msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s" - -#: merge-recursive.c:2751 -#, c-format -msgid "Adding merged %s" -msgstr "Lägger till sammanslagen %s" - -#: merge-recursive.c:2758 merge-recursive.c:3089 -#, c-format -msgid "Adding as %s instead" -msgstr "Lägger till som %s istället" - -#: merge-recursive.c:2914 +#: merge-recursive.c:2929 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:2917 +#: merge-recursive.c:2932 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:2986 +#: merge-recursive.c:2996 msgid "modify" msgstr "ändra" -#: merge-recursive.c:2986 +#: merge-recursive.c:2996 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:2997 +#: merge-recursive.c:3008 msgid "content" msgstr "innehåll" -#: merge-recursive.c:3004 +#: merge-recursive.c:3012 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:3046 +#: merge-recursive.c:3035 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:3055 git-submodule.sh:895 +#: merge-recursive.c:3057 git-submodule.sh:937 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:3056 +#: merge-recursive.c:3058 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3178 +#: merge-recursive.c:3088 +#, c-format +msgid "Adding as %s instead" +msgstr "Lägger till som %s istället" + +#: merge-recursive.c:3170 +#, c-format +msgid "" +"Path updated: %s added in %s inside a directory that was renamed in %s; " +"moving it to %s." +msgstr "" +"Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; " +"flyttar den till %s." + +#: merge-recursive.c:3173 +#, c-format +msgid "" +"CONFLICT (file location): %s added in %s inside a directory that was renamed " +"in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i " +"%s, föreslår att den bör flyttas till%s." + +#: merge-recursive.c:3177 +#, c-format +msgid "" +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " +"%s; moving it to %s." +msgstr "" +"Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte " +"namn i %s; flyttar den till %s." + +#: merge-recursive.c:3180 +#, c-format +msgid "" +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " +"was renamed in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som " +"bytte namn i %s; flyttar den till %s." + +#: merge-recursive.c:3294 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:3204 +#: merge-recursive.c:3317 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:3210 +#: merge-recursive.c:3322 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:3217 +#: merge-recursive.c:3329 #, 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:3226 +#: merge-recursive.c:3338 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:3267 +#: merge-recursive.c:3347 #, c-format -msgid "Dirty index: cannot merge (dirty: %s)" -msgstr "Smutsigt index: kan inte slå ihop (smutsiga: %s)" +msgid "CONFLICT (add/add): Merge conflict in %s" +msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s" + +#: merge-recursive.c:3385 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Dina lokala ändringar av följande filer skulle skrivas över av " +"sammanslagning:\n" +" %s" -#: merge-recursive.c:3271 +#: merge-recursive.c:3396 msgid "Already up to date!" msgstr "Redan à jour!" -#: merge-recursive.c:3280 +#: merge-recursive.c:3405 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:3379 +#: merge-recursive.c:3504 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:3392 +#: merge-recursive.c:3517 #, 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:3431 +#: merge-recursive.c:3556 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:3495 +#: merge-recursive.c:3622 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816 +#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." -#: notes-merge.c:272 +#: midx.c:66 +#, c-format +msgid "multi-pack-index file %s is too small" +msgstr "multi-pack-indexfilen %s är för liten" + +#: midx.c:82 +#, c-format +msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" +msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x" + +#: midx.c:87 +#, c-format +msgid "multi-pack-index version %d not recognized" +msgstr "multi-pack-indexversionen %d stöds inte" + +#: midx.c:92 +#, c-format +msgid "hash version %u does not match" +msgstr "hash-versionen %u stämmer inte" + +#: midx.c:106 +msgid "invalid chunk offset (too large)" +msgstr "felaktigt offset för stycke (för stort)" + +#: midx.c:130 +msgid "terminating multi-pack-index chunk id appears earlier than expected" +msgstr "avslutande multi-pack-index-stycke-ID förekommer tidigare än förväntat" + +#: midx.c:143 +msgid "multi-pack-index missing required pack-name chunk" +msgstr "multi-pack-index saknar krävd paketnamn-stycke" + +#: midx.c:145 +msgid "multi-pack-index missing required OID fanout chunk" +msgstr "multi-pack-index saknar krävt OID-utbredningsstycke" + +#: midx.c:147 +msgid "multi-pack-index missing required OID lookup chunk" +msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke" + +#: midx.c:149 +msgid "multi-pack-index missing required object offsets chunk" +msgstr "multi-pack-index saknar krävt objekt-offsetstycke" + +#: midx.c:163 +#, c-format +msgid "multi-pack-index pack names out of order: '%s' before '%s'" +msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\"" + +#: midx.c:209 +#, c-format +msgid "bad pack-int-id: %u (%u total packs)" +msgstr "bad pack-int-id: %u (%u paket totalt)" + +#: midx.c:250 +msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" +msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten" + +#: midx.c:275 +msgid "error preparing packfile from multi-pack-index" +msgstr "fel när paketfiler från multi-pack-index skulle förberedas" + +#: midx.c:443 +#, c-format +msgid "failed to add packfile '%s'" +msgstr "misslyckades läsa paketfilen \"%s\"" + +#: midx.c:449 +#, c-format +msgid "failed to open pack-index '%s'" +msgstr "misslyckades öppna paketindexet \"%s\"" + +#: midx.c:543 +#, c-format +msgid "failed to locate object %d in packfile" +msgstr "misslyckades hitta objekt %d i paketfilen" + +#: midx.c:979 +#, c-format +msgid "failed to clear multi-pack-index at %s" +msgstr "misslyckades städa multi-pack-index på %s" + +#: midx.c:1034 +msgid "Looking for referenced packfiles" +msgstr "Ser efter refererade packfiler" + +#: midx.c:1049 +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" +msgstr "" +"oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" + +#: midx.c:1053 +msgid "Verifying OID order in MIDX" +msgstr "Bekräftar OID-ordning i MIDX" + +#: midx.c:1062 +#, c-format +msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" +msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]" + +#: midx.c:1081 +msgid "Sorting objects by packfile" +msgstr "Sorterar objekt efter packfil" + +#: midx.c:1087 +msgid "Verifying object offsets" +msgstr "Bekräftar offset för objekt" + +#: midx.c:1103 +#, c-format +msgid "failed to load pack entry for oid[%d] = %s" +msgstr "misslyckades läsa paketpost för oid[%d] = %s" + +#: midx.c:1109 +#, c-format +msgid "failed to load pack-index for packfile %s" +msgstr "misslyckades läsa paketindex för paketfil %s" + +#: midx.c:1118 +#, c-format +msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" +msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>" + +#: name-hash.c:531 +#, c-format +msgid "unable to create lazy_dir thread: %s" +msgstr "misslyckades skapa lazy_dir-tråd: %s" + +#: name-hash.c:553 +#, c-format +msgid "unable to create lazy_name thread: %s" +msgstr "misslyckades skapa lazy_name-tråd: %s" + +#: name-hash.c:559 +#, c-format +msgid "unable to join lazy_name thread: %s" +msgstr "misslyckades utföra join på lazy_name-tråd: %s" + +#: notes-merge.c:277 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -2661,21 +4150,21 @@ msgstr "" "att checka in eller avbryta föregående sammanslagning innan du påbörjar en " "ny antecknings-sammanslagning." -#: notes-merge.c:279 +#: notes-merge.c:284 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)." -#: notes-utils.c:43 +#: notes-utils.c:46 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd" -#: notes-utils.c:102 +#: notes-utils.c:105 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Felaktigt värde för notes.rewriteMode: '%s'" -#: notes-utils.c:112 +#: notes-utils.c:115 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" @@ -2684,35 +4173,110 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" #. the environment variable, the second %s is #. its value. #. -#: notes-utils.c:142 +#: notes-utils.c:145 #, c-format msgid "Bad %s value: '%s'" msgstr "Felaktigt värde på %s: \"%s\"" -#: object.c:242 +#: object.c:54 +#, c-format +msgid "invalid object type \"%s\"" +msgstr "ogiltig objekttyp \"%s\"" + +#: object.c:174 +#, c-format +msgid "object %s is a %s, not a %s" +msgstr "objektet %s är en %s, inte en %s" + +#: object.c:234 +#, c-format +msgid "object %s has unknown type id %d" +msgstr "objektet %s har okänd typ-id %d" + +#: object.c:247 #, c-format msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" -#: packfile.c:563 +#: object.c:267 object.c:278 +#, c-format +msgid "hash mismatch %s" +msgstr "hashvärde stämmer inte överens %s" + +#: packfile.c:617 msgid "offset before end of packfile (broken .idx?)" msgstr "offset före slutet av packfilen (trasig .idx?)" -#: packfile.c:1742 +#: packfile.c:1880 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset före slutet av packindex för %s (trasigt index?)" -#: packfile.c:1746 +#: packfile.c:1884 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex för %s (trunkerat index?)" -#: parse-options.c:621 +#: parse-options.c:38 +#, c-format +msgid "%s requires a value" +msgstr "%s behöver ett värde" + +#: parse-options.c:73 +#, c-format +msgid "%s is incompatible with %s" +msgstr "%s är inkompatibel med %s" + +#: parse-options.c:78 +#, c-format +msgid "%s : incompatible with something else" +msgstr "%s: inkompatibelt med något annat" + +#: parse-options.c:92 parse-options.c:96 parse-options.c:287 +#, c-format +msgid "%s takes no value" +msgstr "%s tar inget värde" + +#: parse-options.c:94 +#, c-format +msgid "%s isn't available" +msgstr "%s är inte tillgängligt" + +#: parse-options.c:216 +#, c-format +msgid "%s expects a non-negative integer value with an optional k/m/g suffix" +msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffix" + +#: parse-options.c:356 +#, c-format +msgid "ambiguous option: %s (could be --%s%s or --%s%s)" +msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)" + +#: parse-options.c:390 parse-options.c:398 +#, c-format +msgid "did you mean `--%s` (with two dashes ?)" +msgstr "menade du \"--%s\" (med två bindestreck?)" + +#: parse-options.c:733 +#, c-format +msgid "unknown option `%s'" +msgstr "okänd flagga \"%s\"" + +#: parse-options.c:735 +#, c-format +msgid "unknown switch `%c'" +msgstr "okänd flagga \"%c\"" + +#: parse-options.c:737 +#, c-format +msgid "unknown non-ascii option in string: `%s'" +msgstr "okänd icke-ascii-flagga i strängen: \"%s\"" + +#: parse-options.c:759 msgid "..." msgstr "..." -#: parse-options.c:640 +#: parse-options.c:778 #, c-format msgid "usage: %s" msgstr "användning: %s" @@ -2720,58 +4284,69 @@ msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:646 +#: parse-options.c:784 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:649 +#: parse-options.c:787 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:688 +#: parse-options.c:826 msgid "-NUM" msgstr "-TAL" -#: parse-options-cb.c:44 +#: parse-options-cb.c:21 +#, c-format +msgid "option `%s' expects a numerical value" +msgstr "flaggan \"%s\" antar ett numeriskt värde" + +#: parse-options-cb.c:38 #, c-format msgid "malformed expiration date '%s'" msgstr "trasigt utlöpsdatum: ”%s”" -#: parse-options-cb.c:112 +#: parse-options-cb.c:51 +#, c-format +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "" +"flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)" + +#: parse-options-cb.c:127 parse-options-cb.c:144 #, c-format msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: path.c:892 +#: path.c:897 #, c-format msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för gruppen" -#: pathspec.c:129 +#: pathspec.c:128 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "Specialtecknet \"\\\" tillåts inte som sista tecken i attributvärde" -#: pathspec.c:147 +#: pathspec.c:146 msgid "Only one 'attr:' specification is allowed." msgstr "Endast en \"attr:\"-angivelse tillåten." -#: pathspec.c:150 +#: pathspec.c:149 msgid "attr spec must not be empty" msgstr "attr-angivelse kan inte vara tom" -#: pathspec.c:193 +#: pathspec.c:192 #, c-format msgid "invalid attribute name %s" msgstr "ogiltigt attributnamn %s" -#: pathspec.c:258 +#: pathspec.c:257 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla" -#: pathspec.c:265 +#: pathspec.c:264 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -2779,55 +4354,181 @@ msgstr "" "den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra " "globala sökvägsinställningar" -#: pathspec.c:305 +#: pathspec.c:304 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\"" -#: pathspec.c:326 +#: pathspec.c:325 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Felaktigt sökvägsuttryck \"%.*s\" i \"%s\"" -#: pathspec.c:331 +#: pathspec.c:330 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\"" -#: pathspec.c:369 +#: pathspec.c:368 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Ej implementerat sökvägsuttryckmagi ”%c” i ”%s”" -#: pathspec.c:428 +#: pathspec.c:427 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: \"literal\" och \"glob\" är inkompatibla" -#: pathspec.c:441 +#: pathspec.c:440 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: \"%s\" är utanför arkivet" -#: pathspec.c:515 +#: pathspec.c:514 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "\"%s\" (minnesstöd: \"%c\")" -#: pathspec.c:525 +#: pathspec.c:524 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s" -#: pathspec.c:592 +#: pathspec.c:591 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" -#: pretty.c:962 +#: pkt-line.c:92 +msgid "unable to write flush packet" +msgstr "kan inte skriva flush-paket" + +#: pkt-line.c:99 +msgid "unable to write delim packet" +msgstr "kan inte skriva delim-paket" + +#: pkt-line.c:106 +msgid "flush packet write failed" +msgstr "fel vid skrivning av \"flush\"-paket" + +#: pkt-line.c:146 pkt-line.c:232 +msgid "protocol error: impossibly long line" +msgstr "protokollfel: omöjligt lång rad" + +#: pkt-line.c:162 pkt-line.c:164 +msgid "packet write with format failed" +msgstr "paketskrivning med format misslyckades" + +#: pkt-line.c:196 +msgid "packet write failed - data exceeds max packet size" +msgstr "paketskrivning misslyckades - data överskrider maximal paketstorlek" + +#: pkt-line.c:203 pkt-line.c:210 +msgid "packet write failed" +msgstr "paketskrivning misslyckades" + +#: pkt-line.c:295 +msgid "read error" +msgstr "läsfel" + +#: pkt-line.c:303 +msgid "the remote end hung up unexpectedly" +msgstr "fjärren lade på oväntat" + +#: pkt-line.c:331 +#, c-format +msgid "protocol error: bad line length character: %.4s" +msgstr "protokollfel: felaktig radlängdstecken: %.4s" + +#: pkt-line.c:341 pkt-line.c:346 +#, c-format +msgid "protocol error: bad line length %d" +msgstr "protokollfel: felaktig radlängd: %d" + +#: pkt-line.c:362 +#, c-format +msgid "remote error: %s" +msgstr "fjärrfel: %s" + +#: preload-index.c:119 +msgid "Refreshing index" +msgstr "Uppdaterar indexet" + +#: preload-index.c:138 +#, c-format +msgid "unable to create threaded lstat: %s" +msgstr "kunde inte skapa trådad lstat: %s" + +#: pretty.c:966 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" -#: read-cache.c:1500 +#: range-diff.c:56 +msgid "could not start `log`" +msgstr "kunde inte starta \"log\"" + +#: range-diff.c:59 +msgid "could not read `log` output" +msgstr "kunde inte läsa utdata från \"log\"" + +#: range-diff.c:74 sequencer.c:4897 +#, c-format +msgid "could not parse commit '%s'" +msgstr "kunde inte tolka incheckningen \"%s\"" + +#: range-diff.c:224 +msgid "failed to generate diff" +msgstr "misslyckades skapa diff" + +#: range-diff.c:455 range-diff.c:457 +#, c-format +msgid "could not parse log for '%s'" +msgstr "kunde inte tolka loggen för \"%s\"" + +#: read-cache.c:680 +#, c-format +msgid "will not add file alias '%s' ('%s' already exists in index)" +msgstr "lägger inte till filalias \"%s\" (\"%s\" finns redan i indexet)" + +#: read-cache.c:696 +msgid "cannot create an empty blob in the object database" +msgstr "kan inte skapa tom blob i objektdatabasen" + +#: read-cache.c:718 +#, c-format +msgid "%s: can only add regular files, symbolic links or git-directories" +msgstr "" +"%s: kan bara lägga till vanliga filer, symboliska länkar och git-kataloger" + +#: read-cache.c:723 +#, c-format +msgid "'%s' does not have a commit checked out" +msgstr "\"%s\" har inte någon utcheckad incheckning" + +#: read-cache.c:775 +#, c-format +msgid "unable to index file '%s'" +msgstr "kan inte indexera filen \"%s\"" + +#: read-cache.c:794 +#, c-format +msgid "unable to add '%s' to index" +msgstr "kan inte lägga till \"%s\" till indexet" + +#: read-cache.c:805 +#, c-format +msgid "unable to stat '%s'" +msgstr "kan inte ta status på \"%s\"" + +#: read-cache.c:1314 +#, c-format +msgid "'%s' appears as both a file and as a directory" +msgstr "\"%s\" finns både som en fil och en katalog" + +#: read-cache.c:1499 +msgid "Refresh index" +msgstr "Uppdatera indexet" + +#: read-cache.c:1613 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2836,7 +4537,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1510 +#: read-cache.c:1623 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2845,227 +4546,599 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048 +#: read-cache.c:1679 +#, c-format +msgid "bad signature 0x%08x" +msgstr "felaktig signatur 0x%08x" + +#: read-cache.c:1682 +#, c-format +msgid "bad index version %d" +msgstr "felaktig indexversion %d" + +#: read-cache.c:1691 +msgid "bad index file sha1 signature" +msgstr "felaktig sha1-signatur för indexfil" + +#: read-cache.c:1721 +#, c-format +msgid "index uses %.4s extension, which we do not understand" +msgstr "index använder filtillägget %.4s, vilket vi inte förstår" + +#: read-cache.c:1723 +#, c-format +msgid "ignoring %.4s extension" +msgstr "ignorerar filtillägget %.4s" + +#: read-cache.c:1760 +#, c-format +msgid "unknown index entry format 0x%08x" +msgstr "okänt format 0x%08x på indexpost" + +#: read-cache.c:1776 +#, c-format +msgid "malformed name field in the index, near path '%s'" +msgstr "felformat namnfält i indexet, nära sökvägen \"%s\"" + +#: read-cache.c:1833 +msgid "unordered stage entries in index" +msgstr "osorterade köposter i index" + +#: read-cache.c:1836 +#, c-format +msgid "multiple stage entries for merged file '%s'" +msgstr "flera köposter för den sammanslagna filen \"%s\"" + +#: read-cache.c:1839 +#, c-format +msgid "unordered stage entries for '%s'" +msgstr "osorterade köposter för \"%s\"" + +#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358 +#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955 +#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498 +#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271 +#: builtin/submodule--helper.c:330 +msgid "index file corrupt" +msgstr "indexfilen trasig" + +#: read-cache.c:2087 +#, c-format +msgid "unable to create load_cache_entries thread: %s" +msgstr "kunde inte läsa in cache_entries-tråden: %s" + +#: read-cache.c:2100 +#, c-format +msgid "unable to join load_cache_entries thread: %s" +msgstr "kunde inte utföra join på cache_entries-tråden: %s" + +#: read-cache.c:2133 +#, c-format +msgid "%s: index file open failed" +msgstr "%s: öppning av indexfilen misslyckades" + +#: read-cache.c:2137 +#, c-format +msgid "%s: cannot stat the open index" +msgstr "%s: kan inte ta startus på det öppna indexet" + +#: read-cache.c:2141 +#, c-format +msgid "%s: index file smaller than expected" +msgstr "%s: indexfilen mindre än förväntat" + +#: read-cache.c:2145 +#, c-format +msgid "%s: unable to map index file" +msgstr "%s: kan inte koppla indexfilen" + +#: read-cache.c:2187 +#, c-format +msgid "unable to create load_index_extensions thread: %s" +msgstr "kunde inte skapa load_index_extensions-tråden: %s" + +#: read-cache.c:2214 +#, c-format +msgid "unable to join load_index_extensions thread: %s" +msgstr "kunde inte utföra join på load_index_extensions-tråden: %s" + +#: read-cache.c:2246 +#, c-format +msgid "could not freshen shared index '%s'" +msgstr "kunde inte uppdatera delat index \"%s\"" + +#: read-cache.c:2293 +#, c-format +msgid "broken index, expect %s in %s, got %s" +msgstr "trasigt index, förväntade %s i %s, fick %s" + +#: read-cache.c:2988 wrapper.c:658 builtin/merge.c:1117 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234 +#: read-cache.c:3091 sequencer.c:2354 sequencer.c:3807 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" -#: read-cache.c:2490 +#: read-cache.c:3104 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte öppna git-katalog: %s" -#: read-cache.c:2502 +#: read-cache.c:3116 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort länken: %s" -#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:779 +#: read-cache.c:3141 +#, c-format +msgid "cannot fix permission bits on '%s'" +msgstr "kan inte rätta behörighetsbitar på \"%s\"" + +#: read-cache.c:3290 +#, c-format +msgid "%s: cannot drop to stage #0" +msgstr "%s: kan inte återgå till kö 0" + +#: rebase-interactive.c:26 +#, c-format +msgid "" +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." +msgstr "" +"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar." + +#: rebase-interactive.c:35 +msgid "" +"\n" +"Commands:\n" +"p, pick <commit> = use commit\n" +"r, reword <commit> = use commit, but edit the commit message\n" +"e, edit <commit> = use commit, but stop for amending\n" +"s, squash <commit> = use commit, but meld into previous commit\n" +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"x, exec <command> = run command (the rest of the line) using shell\n" +"b, break = stop here (continue rebase later with 'git rebase --continue')\n" +"d, drop <commit> = remove commit\n" +"l, label <label> = label current HEAD with a name\n" +"t, reset <label> = reset HEAD to a label\n" +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +". create a merge commit using the original merge commit's\n" +". message (or the oneline, if no original merge commit was\n" +". specified). Use -c <commit> to reword the commit message.\n" +"\n" +"These lines can be re-ordered; they are executed from top to bottom.\n" +msgstr "" +"\n" +"Kommandon:\n" +"p, pick <incheckning> = använd incheckning\n" +"r, reword <incheckning> = använd incheckning, men redigera " +"incheckningsmeddelandet\n" +"e, edit <incheckning> = använd incheckning, men stanna för tillägg\n" +"s, squash <incheckning> = använd incheckning, men infoga i föregående " +"incheckning\n" +"f, fixup <incheckning> = som \"squash\", men förkasta " +"incheckningsmeddelandet\n" +"x, exec <kommando> = kör kommando (resten av raden) i skalet\n" +"b, break = stoppa här (fortsätt ombaseringen senare med \"git rebase --" +"continue\")\n" +"d, drop <incheckning> = ta bort incheckning\n" +"l, label <etikett> = ge aktuellt HEAD ett namn\n" +"t, reset <etikett> = återställ HEAD till en etikett\n" +"m, merge [-C <incheckning> | -c <incheckning>] <etikett> [# <enrads>]\n" +". skapa en sammanslagning med ursprungligt meddelande (eller\n" +". enrads, om inget incheckningsmeddelande angavs). Använd\n" +". -v <incheckning> för att skriva om meddelandet.\n" +"\n" +"Du kan byta ordning på raderna; de utförs uppifrån och ned.\n" + +#: rebase-interactive.c:56 +#, c-format +msgid "Rebase %s onto %s (%d command)" +msgid_plural "Rebase %s onto %s (%d commands)" +msgstr[0] "Ombasera %s på %s (%d kommando)" +msgstr[1] "Ombasera %s på %s (%d kommandon)" + +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173 +msgid "" +"\n" +"Do not remove any line. Use 'drop' explicitly to remove a commit.\n" +msgstr "" +"\n" +"Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en " +"incheckning.\n" + +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177 +msgid "" +"\n" +"If you remove a line here THAT COMMIT WILL BE LOST.\n" +msgstr "" +"\n" +"Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n" + +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816 +msgid "" +"\n" +"You are editing the todo file of an ongoing interactive rebase.\n" +"To continue rebase after editing, run:\n" +" git rebase --continue\n" +"\n" +msgstr "" +"\n" +"Du redigerar \"todo\"-filen för en pågående interaktiv ombasering.\n" +"För att forsätta ombasera efter redigeringen, kör:\n" +" git rebase --continue\n" +"\n" + +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893 +msgid "" +"\n" +"However, if you remove everything, the rebase will be aborted.\n" +"\n" +msgstr "" +"\n" +"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" +"\n" + +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900 +msgid "Note that empty commits are commented out" +msgstr "Observera att tomma incheckningar är utkommenterade" + +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339 +#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235 +#, c-format +msgid "could not write '%s'" +msgstr "kunde inte skriva \"%s\"" + +#: rebase-interactive.c:108 +#, c-format +msgid "could not copy '%s' to '%s'." +msgstr "kunde inte kopiera \"%s\" till \"%s\"." + +#: rebase-interactive.c:173 +#, c-format +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):\n" +msgstr "" +"Varning: vissa incheckningar kan av misstag ha tappats.\n" +"Tappade incheckningar (nyaste först):\n" + +#: rebase-interactive.c:180 +#, c-format +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error.\n" +"\n" +msgstr "" +"För att undvika det här meddelandet kan du använda \"drop\" för att " +"explicit\n" +"kasta en incheckning.\n" +"\n" +"Använd \"git config rebase.missingCommitsCheck\" för att ändra " +"varningsnivån.\n" +"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error" +"\" (fel).\n" +"\n" + +#: refs.c:192 +#, c-format +msgid "%s does not point to a valid object!" +msgstr "\"%s\" pekar inte på ett giltigt objekt!" + +#: refs.c:597 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "ignorerar dinglande symbolisk referens %s" + +#: refs.c:599 ref-filter.c:1982 +#, c-format +msgid "ignoring broken ref %s" +msgstr "ignorerar trasig referens %s" + +#: refs.c:734 +#, c-format +msgid "could not open '%s' for writing: %s" +msgstr "kunde inte öppna \"%s\" för skrivning: %s" + +#: refs.c:744 refs.c:795 +#, c-format +msgid "could not read ref '%s'" +msgstr "Kunde inte läsa referensen \"%s\"" + +#: refs.c:750 +#, c-format +msgid "ref '%s' already exists" +msgstr "referensen \"%s\" finns redan" + +#: refs.c:755 +#, c-format +msgid "unexpected object ID when writing '%s'" +msgstr "oväntat objekt-id vid skrivning \"%s\"" + +#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805 +#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656 +#, c-format +msgid "could not write to '%s'" +msgstr "kunde inte skriva till \"%s\"" + +#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993 #, c-format msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" -#: refs.c:1880 +#: refs.c:797 +#, c-format +msgid "unexpected object ID when deleting '%s'" +msgstr "oväntat objekt-id vid borttagning \"%s\"" + +#: refs.c:928 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "loggen för referensen %s har lucka efter %s" + +#: refs.c:934 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "loggen för referensen %s slutade oväntat på %s" + +#: refs.c:993 +#, c-format +msgid "log for %s is empty" +msgstr "loggen för %s är tom" + +#: refs.c:1085 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "vägrar uppdatera referens med trasigt namn \"%s\"" + +#: refs.c:1161 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "update_ref misslyckades för referensen \"%s\": %s" + +#: refs.c:1942 +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "flera uppdateringar för referensen \"%s\" tillåts inte" + +#: refs.c:1974 msgid "ref updates forbidden inside quarantine environment" msgstr "referensuppdateringar förbjudna i karantänmiljö" -#: refs/files-backend.c:1191 +#: refs.c:2070 refs.c:2100 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "\"%s\" finns; kan inte skapa \"%s\"" + +#: refs.c:2076 refs.c:2111 +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt" + +#: refs/files-backend.c:1234 #, c-format msgid "could not remove reference %s" msgstr "kunde inte ta bort referensen %s" -#: refs/files-backend.c:1205 refs/packed-backend.c:1531 -#: refs/packed-backend.c:1541 +#: refs/files-backend.c:1248 refs/packed-backend.c:1532 +#: refs/packed-backend.c:1542 #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" -#: refs/files-backend.c:1208 refs/packed-backend.c:1544 +#: refs/files-backend.c:1251 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" -#: ref-filter.c:35 wt-status.c:1850 +#: refspec.c:137 +#, c-format +msgid "invalid refspec '%s'" +msgstr "felaktig referensspecifikation: \"%s\"" + +#: ref-filter.c:39 wt-status.c:1907 msgid "gone" msgstr "försvunnen" -#: ref-filter.c:36 +#: ref-filter.c:40 #, c-format msgid "ahead %d" msgstr "före %d" -#: ref-filter.c:37 +#: ref-filter.c:41 #, c-format msgid "behind %d" msgstr "bakom %d" -#: ref-filter.c:38 +#: ref-filter.c:42 #, c-format msgid "ahead %d, behind %d" msgstr "före %d, bakom %d" -#: ref-filter.c:121 +#: ref-filter.c:138 #, c-format msgid "expected format: %%(color:<color>)" msgstr "förväntat format: %%(color:<color>)" -#: ref-filter.c:123 +#: ref-filter.c:140 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "okänd färg: %%(color:%s)" -#: ref-filter.c:145 +#: ref-filter.c:162 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Heltalsvärde förväntades refname:lstrip=%s" -#: ref-filter.c:149 +#: ref-filter.c:166 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Heltalsvärde förväntades refname:rstrip=%s" -#: ref-filter.c:151 +#: ref-filter.c:168 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "okänt %%(%s)-argument: %s" -#: ref-filter.c:206 +#: ref-filter.c:223 +#, c-format +msgid "%%(objecttype) does not take arguments" +msgstr "%%(objecttype) tar inte argument" + +#: ref-filter.c:245 +#, c-format +msgid "unrecognized %%(objectsize) argument: %s" +msgstr "okänt %%(objectsize)-argument: %s" + +#: ref-filter.c:253 +#, c-format +msgid "%%(deltabase) does not take arguments" +msgstr "%%(deltabase) tar inte argument" + +#: ref-filter.c:265 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) tar inte argument" -#: ref-filter.c:215 +#: ref-filter.c:274 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) tar inte argument" -#: ref-filter.c:235 +#: ref-filter.c:296 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "okänt %%(trailers)-argument: %s" -#: ref-filter.c:264 +#: ref-filter.c:325 #, c-format msgid "positive value expected contents:lines=%s" msgstr "positivt värde förväntat contents:lines=%s" -#: ref-filter.c:266 +#: ref-filter.c:327 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "okänt %%(contents)-argument: %s" -#: ref-filter.c:281 +#: ref-filter.c:342 #, c-format msgid "positive value expected objectname:short=%s" msgstr "positivt värde förväntat objectname:short=%s" -#: ref-filter.c:285 +#: ref-filter.c:346 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "okänt %%(objectname)-argument: %s" -#: ref-filter.c:315 +#: ref-filter.c:376 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "förväntat format: %%(align:<bredd>,<position>)" -#: ref-filter.c:327 +#: ref-filter.c:388 #, c-format msgid "unrecognized position:%s" msgstr "okänd position:%s" -#: ref-filter.c:334 +#: ref-filter.c:395 #, c-format msgid "unrecognized width:%s" msgstr "okänd bredd:%s" -#: ref-filter.c:343 +#: ref-filter.c:404 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "okänt %%(align)-argument: %s" -#: ref-filter.c:351 +#: ref-filter.c:412 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "positiv bredd förväntad med atomen %%(align)" -#: ref-filter.c:369 +#: ref-filter.c:430 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "okänt %%(if)-argument: %s" -#: ref-filter.c:464 +#: ref-filter.c:531 #, c-format msgid "malformed field name: %.*s" msgstr "felformat fältnamn: %.*s" -#: ref-filter.c:491 +#: ref-filter.c:558 #, c-format msgid "unknown field name: %.*s" msgstr "okänt fältnamn: %.*s" -#: ref-filter.c:608 +#: ref-filter.c:562 +#, c-format +msgid "" +"not a git repository, but the field '%.*s' requires access to object data" +msgstr "" +"inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata" + +#: ref-filter.c:686 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: atomen %%(if) använd utan en %%(then)-atom" -#: ref-filter.c:671 +#: ref-filter.c:749 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: atomen %%(then) använd utan en %%(if)-atom" -#: ref-filter.c:673 +#: ref-filter.c:751 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: atomen %%(then) använd mer än en gång" -#: ref-filter.c:675 +#: ref-filter.c:753 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atomen %%(then) använd efter %%(else)" -#: ref-filter.c:703 +#: ref-filter.c:781 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: atomen %%(else) använd utan en %%(if)-atom" -#: ref-filter.c:705 +#: ref-filter.c:783 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format: atomen %%(else) använd utan en %%(then)-atom" -#: ref-filter.c:707 +#: ref-filter.c:785 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format: atomen %%(else) använd mer än en gång" -#: ref-filter.c:722 +#: ref-filter.c:800 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: atomen %%(end) använd utan motsvarande atom" -#: ref-filter.c:779 +#: ref-filter.c:857 #, c-format msgid "malformed format string %s" msgstr "felformad formatsträng %s" -#: ref-filter.c:1387 +#: ref-filter.c:1453 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: ref-filter.c:1390 +#: ref-filter.c:1456 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)" -#: ref-filter.c:1393 +#: ref-filter.c:1459 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" @@ -3073,7 +5146,7 @@ msgstr "(ingen gren, \"bisect\" startad på %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1401 +#: ref-filter.c:1467 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD frånkopplat vid %s)" @@ -3081,147 +5154,287 @@ msgstr "(HEAD frånkopplat vid %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1408 +#: ref-filter.c:1474 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD frånkopplat från %s)" -#: ref-filter.c:1412 +#: ref-filter.c:1478 msgid "(no branch)" msgstr "(ingen gren)" -#: ref-filter.c:1442 +#: ref-filter.c:1512 ref-filter.c:1669 #, c-format msgid "missing object %s for %s" msgstr "objektet %s saknas för %s" -#: ref-filter.c:1445 +#: 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:1902 +#: ref-filter.c:1888 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:1984 +#: ref-filter.c:1977 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:1989 -#, c-format -msgid "ignoring broken ref %s" -msgstr "ignorerar trasig referens %s" - -#: ref-filter.c:2261 +#: ref-filter.c:2263 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:2365 +#: ref-filter.c:2363 +#, c-format +msgid "option `%s' is incompatible with --merged" +msgstr "flaggan \"%s\" är inkompatibel med --merged" + +#: ref-filter.c:2366 +#, c-format +msgid "option `%s' is incompatible with --no-merged" +msgstr "flaggan \"%s\" är inkompatibel med --no-merged" + +#: ref-filter.c:2376 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: remote.c:605 +#: ref-filter.c:2381 +#, c-format +msgid "option `%s' must point to a commit" +msgstr "flaggan \"%s\" måste peka på en incheckning" + +#: remote.c:363 +#, c-format +msgid "config remote shorthand cannot begin with '/': %s" +msgstr "konfigurerad kortform för fjärr kan inte börja med \"/\": %s" + +#: remote.c:410 +msgid "more than one receivepack given, using the first" +msgstr "mer än en receivepack angavs, använder den första" + +#: remote.c:418 +msgid "more than one uploadpack given, using the first" +msgstr "mer än en uploadpack angavs, använder den första" + +#: remote.c:608 #, 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:609 +#: remote.c:612 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spårar vanligtvis %s, inte %s" -#: remote.c:613 +#: remote.c:616 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#: remote.c:621 -msgid "Internal error" -msgstr "Internt fel" +#: remote.c:684 +#, c-format +msgid "key '%s' of pattern had no '*'" +msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\"" + +#: remote.c:694 +#, c-format +msgid "value '%s' of pattern has no '*'" +msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\"" + +#: remote.c:1000 +#, c-format +msgid "src refspec %s does not match any" +msgstr "käll-referensspecifikationen %s motsvarar ingen" + +#: remote.c:1005 +#, c-format +msgid "src refspec %s matches more than one" +msgstr "käll-referensspecifikationen %s motsvarar mer än en" + +#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push +#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is +#. the <src>. +#. +#: remote.c:1020 +#, c-format +msgid "" +"The destination you provided is not a full refname (i.e.,\n" +"starting with \"refs/\"). We tried to guess what you meant by:\n" +"\n" +"- Looking for a ref that matches '%s' on the remote side.\n" +"- Checking if the <src> being pushed ('%s')\n" +" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n" +" refs/{heads,tags}/ prefix on the remote side.\n" +"\n" +"Neither worked, so we gave up. You must fully qualify the ref." +msgstr "" +"Målet du angav är inte ett komplett referensamn (dvs.,\n" +"startar med \"refs/\"). Vi försökte gissa vad du menade genom att:\n" +"\n" +"- Se efter en referens som motsvarar \"%s\" på fjärrsidan.\n" +"- Se om <källan> som sänds (\"%s\")\n" +" är en referens i \"refs/{heads,tags}/\". Om så lägger vi till\n" +" motsvarande refs/{heads,tags}/-prefix på fjärrsidan.\n" +"\n" +"Inget av dem fungerade, så vi gav upp. Ange fullständig referens." + +#: remote.c:1040 +#, c-format +msgid "" +"The <src> part of the refspec is a commit object.\n" +"Did you mean to create a new branch by pushing to\n" +"'%s:refs/heads/%s'?" +msgstr "" +"<Källa>-delen av ref.spec-en är ett incheckningsobjekt.\n" +"Var det meningen att skapa en ny gren genom att sända\n" +"till \"%s:refs/heads/%s\"?" + +#: remote.c:1045 +#, c-format +msgid "" +"The <src> part of the refspec is a tag object.\n" +"Did you mean to create a new tag by pushing to\n" +"'%s:refs/tags/%s'?" +msgstr "" +"<Källa>-delen av ref.spec-en är ett taggobjekt.\n" +"Var det meningen att skapa en ny tagg genom att sända\n" +"till \"%s:refs/tags/%s\"?" + +#: remote.c:1050 +#, c-format +msgid "" +"The <src> part of the refspec is a tree object.\n" +"Did you mean to tag a new tree by pushing to\n" +"'%s:refs/tags/%s'?" +msgstr "" +"<Källa>-delen av ref.spec-en är ett trädobjekt.\n" +"Var det meningen att tagga ett nytt träd genom att sända\n" +"till \"%s:refs/tags/%s\"?" + +#: remote.c:1055 +#, c-format +msgid "" +"The <src> part of the refspec is a blob object.\n" +"Did you mean to tag a new blob by pushing to\n" +"'%s:refs/tags/%s'?" +msgstr "" +"<Källa>-delen av ref.spec-en är ett blobobjekt.\n" +"Var det meningen att tagga en ny blob genom att sända\n" +"till \"%s:refs/tags/%s\"?" + +#: remote.c:1091 +#, c-format +msgid "%s cannot be resolved to branch" +msgstr "%s kan inte slås upp till en gren" + +#: remote.c:1102 +#, c-format +msgid "unable to delete '%s': remote ref does not exist" +msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte" + +#: remote.c:1114 +#, c-format +msgid "dst refspec %s matches more than one" +msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en" + +#: remote.c:1121 +#, c-format +msgid "dst ref %s receives from more than one src" +msgstr "fjärr-referensen \"%s\" hämtar från mer än en källa" -#: remote.c:1534 remote.c:1635 +#: remote.c:1624 remote.c:1725 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: remote.c:1543 +#: remote.c:1633 #, c-format msgid "no such branch: '%s'" msgstr "okänd gren: \"%s\"" -#: remote.c:1546 +#: remote.c:1636 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppström angiven för grenen \"%s\"" -#: remote.c:1552 +#: remote.c:1642 #, 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:1567 +#: remote.c:1657 #, 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:1579 +#: remote.c:1669 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "grenen \"%s\" har ingen fjärr för \"push\"" -#: remote.c:1589 +#: remote.c:1679 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\"" -#: remote.c:1602 +#: remote.c:1692 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mål (push.default är \"ingenting\")" -#: remote.c:1624 +#: remote.c:1714 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mål" -#: remote.c:1939 +#: remote.c:1840 +#, c-format +msgid "couldn't find remote ref %s" +msgstr "Kunde inte hitta fjärr-referensen %s" + +#: remote.c:1853 +#, c-format +msgid "* Ignoring funny ref '%s' locally" +msgstr "* Ignorerar märklig referens \"%s\" lokalt" + +#: remote.c:2016 #, 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:1943 +#: remote.c:2020 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:1946 +#: remote.c:2023 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:1950 +#: remote.c:2027 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n" -#: remote.c:1953 +#: remote.c:2030 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (använd \"%s\" för detaljer)\n" -#: remote.c:1957 +#: remote.c:2034 #, 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:1963 +#: remote.c:2040 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:1966 +#: remote.c:2043 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -3231,11 +5444,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:1974 +#: remote.c:2051 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:1977 +#: remote.c:2054 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -3250,28 +5463,150 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:1987 +#: remote.c:2064 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:2289 +#: remote.c:2247 +#, c-format +msgid "cannot parse expected object name '%s'" +msgstr "kan inte tolka förväntat objektnamn \"%s\"" + +#: replace-object.c:21 +#, c-format +msgid "bad replace ref name: %s" +msgstr "felaktig ersättningsreferensnamn: %s" + +#: replace-object.c:30 +#, c-format +msgid "duplicate replace ref: %s" +msgstr "duplicerat ersättningsreferensnamn: %s" + +#: replace-object.c:73 +#, c-format +msgid "replace depth too high for object %s" +msgstr "ersättningsdjupet för högt för objektet %s" + +#: rerere.c:217 rerere.c:226 rerere.c:229 +msgid "corrupt MERGE_RR" +msgstr "trasig MERGE_RR" + +#: rerere.c:264 rerere.c:269 +msgid "unable to write rerere record" +msgstr "kunde inte skriva rerere-post" + +#: rerere.c:495 +#, c-format +msgid "there were errors while writing '%s' (%s)" +msgstr "fel vid skrivning av \"%s\" (%s)" + +#: rerere.c:498 +#, c-format +msgid "failed to flush '%s'" +msgstr "misslyckades spola \"%s\"" + +#: rerere.c:503 rerere.c:1039 +#, c-format +msgid "could not parse conflict hunks in '%s'" +msgstr "kunde inte tolka konflikt-stycket i \"%s\"" + +#: rerere.c:684 +#, c-format +msgid "failed utime() on '%s'" +msgstr "\"utime()\" misslyckades på \"%s\"" + +#: rerere.c:694 +#, c-format +msgid "writing '%s' failed" +msgstr "misslyckades skriva \"%s\"" + +#: rerere.c:714 +#, c-format +msgid "Staged '%s' using previous resolution." +msgstr "Köade \"%s\" med sparad lösning." + +#: rerere.c:753 +#, c-format +msgid "Recorded resolution for '%s'." +msgstr "Sparade lösning för \"%s\"." + +#: rerere.c:788 +#, c-format +msgid "Resolved '%s' using previous resolution." +msgstr "Löste \"%s\" med tidigare lösning." + +#: rerere.c:803 +#, c-format +msgid "cannot unlink stray '%s'" +msgstr "kan inte ta bort lös länk \"%s\"" + +#: rerere.c:807 +#, c-format +msgid "Recorded preimage for '%s'" +msgstr "Sparade förhandsbild för \"%s\"" + +#: rerere.c:881 submodule.c:2024 builtin/log.c:1750 +#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427 +#, c-format +msgid "could not create directory '%s'" +msgstr "kunde inte skapa katalogen \"%s\"" + +#: rerere.c:1057 +#, c-format +msgid "failed to update conflicted state in '%s'" +msgstr "misslyckades uppdatera tillstånd för sammanslagningsproblem i \"%s\"" + +#: rerere.c:1068 rerere.c:1075 +#, c-format +msgid "no remembered resolution for '%s'" +msgstr "inget sparat sammanslagningsresultat för \"%s\"" + +#: rerere.c:1077 +#, c-format +msgid "cannot unlink '%s'" +msgstr "kan inte ta bort länken \"%s\"" + +#: rerere.c:1087 +#, c-format +msgid "Updated preimage for '%s'" +msgstr "Uppdaterade förhandsbild för \"%s\"" + +#: rerere.c:1096 +#, c-format +msgid "Forgot resolution for '%s'\n" +msgstr "Glömde lösning för \"%s\"\n" + +#: rerere.c:1199 +msgid "unable to open rr-cache directory" +msgstr "kan inte uppdatera katalogen rr-cache" + +#: revision.c:2476 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2292 +#: revision.c:2479 #, 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:2489 +#: revision.c:2679 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" -#: run-command.c:728 +#: revision.c:2683 +msgid "-L does not yet support diff formats besides -p and -s" +msgstr "-L stöder ännu inte andra diff-format än -p och -s" + +#: run-command.c:763 msgid "open /dev/null failed" msgstr "misslyckades öppna /dev/null" -#: run-command.c:1271 +#: run-command.c:1269 +#, c-format +msgid "cannot create async thread: %s" +msgstr "kan inte skapa asynkron tråd: %s" + +#: run-command.c:1333 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -3294,15 +5629,15 @@ msgstr "kunde inte tolka fjärruppackningsstatus: %s" msgid "remote unpack failed: %s" msgstr "fjärruppackning misslyckades: %s" -#: send-pack.c:308 +#: send-pack.c:306 msgid "failed to sign the push certificate" msgstr "misslyckades underteckna push-certifikatet" -#: send-pack.c:421 +#: send-pack.c:420 msgid "the receiving end does not support --signed push" msgstr "mottagarsidan stöder inte push med --signed" -#: send-pack.c:423 +#: send-pack.c:422 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -3310,42 +5645,42 @@ msgstr "" "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --" "signed" -#: send-pack.c:435 +#: send-pack.c:434 msgid "the receiving end does not support --atomic push" msgstr "mottagarsidan stöder inte push med --atomic" -#: send-pack.c:440 +#: send-pack.c:439 msgid "the receiving end does not support push options" msgstr "mottagarsidan stöder inte push-flaggor" -#: sequencer.c:175 +#: sequencer.c:187 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\"" -#: sequencer.c:275 +#: sequencer.c:292 #, c-format msgid "could not delete '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:301 +#: sequencer.c:318 msgid "revert" msgstr "revert" -#: sequencer.c:303 +#: sequencer.c:320 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:305 +#: sequencer.c:322 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:307 +#: sequencer.c:324 #, c-format -msgid "Unknown action: %d" -msgstr "Okänd funktion: %d" +msgid "unknown action: %d" +msgstr "okänd funktion: %d" -#: sequencer.c:364 +#: sequencer.c:382 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -3353,7 +5688,7 @@ msgstr "" "efter att ha löst konflikterna, markera de rättade sökvägarna\n" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"" -#: sequencer.c:367 +#: sequencer.c:385 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -3363,66 +5698,115 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:380 sequencer.c:2468 +#: sequencer.c:398 sequencer.c:2801 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486 -#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656 -#, c-format -msgid "could not write to '%s'" -msgstr "kunde inte skriva till \"%s\"" - -#: sequencer.c:387 +#: sequencer.c:405 #, c-format msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488 -#: sequencer.c:2702 +#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821 +#: sequencer.c:3084 #, c-format msgid "failed to finalize '%s'" msgstr "misslyckades färdigställa \"%s\"" -#: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371 -#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727 -#: builtin/merge.c:1046 +#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704 +#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760 +#: builtin/merge.c:1115 builtin/rebase.c:567 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: sequencer.c:441 +#: sequencer.c:459 #, c-format msgid "your local changes would be overwritten by %s." msgstr "dina lokala ändringar skulle skrivas över av %s." -#: sequencer.c:445 +#: sequencer.c:463 msgid "commit your changes or stash them to proceed." msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta." -#: sequencer.c:474 +#: sequencer.c:495 #, c-format msgid "%s: fast-forward" msgstr "%s: snabbspola" +#: sequencer.c:534 builtin/tag.c:555 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "Felaktigt städningsläge %s" + #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:563 +#: sequencer.c:629 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:579 +#: sequencer.c:646 msgid "unable to update cache tree" msgstr "kan inte uppdatera cacheträd" -#: sequencer.c:592 +#: sequencer.c:660 msgid "could not resolve HEAD commit" msgstr "kunde inte bestämma HEAD:s incheckning" -#: sequencer.c:749 +#: sequencer.c:740 +#, c-format +msgid "no key present in '%.*s'" +msgstr "ingen nyckel i \"%.*s\"" + +#: sequencer.c:751 +#, c-format +msgid "unable to dequote value of '%s'" +msgstr "kan inte ta bort citering av värdet \"%s\"" + +#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706 +#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035 +#, c-format +msgid "could not open '%s' for reading" +msgstr "kunde inte öppna \"%s\" för läsning" + +#: sequencer.c:798 +msgid "'GIT_AUTHOR_NAME' already given" +msgstr "\"GIT_AUTHOR_NAME\" har redan angivits" + +#: sequencer.c:803 +msgid "'GIT_AUTHOR_EMAIL' already given" +msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits" + +#: sequencer.c:808 +msgid "'GIT_AUTHOR_DATE' already given" +msgstr "\"GIT_AUTHOR_DATE\" har redan angivits" + +#: sequencer.c:812 +#, c-format +msgid "unknown variable '%s'" +msgstr "okänd variabel \"%s\"" + +#: sequencer.c:817 +msgid "missing 'GIT_AUTHOR_NAME'" +msgstr "\"GIT_AUTHOR_NAME\" saknas" + +#: sequencer.c:819 +msgid "missing 'GIT_AUTHOR_EMAIL'" +msgstr "\"GIT_AUTHOR_EMAIL\" saknas" + +#: sequencer.c:821 +msgid "missing 'GIT_AUTHOR_DATE'" +msgstr "\"GIT_AUTHOR_DATE\" saknas" + +#: sequencer.c:881 +#, c-format +msgid "invalid date format '%s' in '%s'" +msgstr "ogiltigt datumformat \"%s\" i \"%s\"" + +#: sequencer.c:898 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3451,15 +5835,15 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:818 +#: sequencer.c:992 msgid "writing root commit" msgstr "skriver rotincheckning" -#: sequencer.c:1043 +#: sequencer.c:1213 msgid "'prepare-commit-msg' hook failed" msgstr "kroken \"prepare-commit-msg\" misslyckades" -#: sequencer.c:1050 +#: sequencer.c:1220 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3486,7 +5870,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1063 +#: sequencer.c:1233 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3511,315 +5895,346 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1103 +#: sequencer.c:1275 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: sequencer.c:1105 +#: sequencer.c:1277 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: sequencer.c:1151 +#: sequencer.c:1323 msgid "unable to resolve HEAD after creating commit" msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning" -#: sequencer.c:1153 +#: sequencer.c:1325 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: sequencer.c:1157 +#: sequencer.c:1329 msgid " (root-commit)" msgstr " (rotincheckning)" -#: sequencer.c:1178 +#: sequencer.c:1350 msgid "could not parse HEAD" msgstr "kunde inte tolka HEAD" -#: sequencer.c:1180 +#: sequencer.c:1352 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s är inte en incheckning!" -#: sequencer.c:1184 builtin/commit.c:1528 +#: sequencer.c:1356 builtin/commit.c:1551 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: sequencer.c:1235 sequencer.c:1832 +#: sequencer.c:1408 sequencer.c:2001 msgid "unable to parse commit author" msgstr "kunde inte tolka incheckningens författare" -#: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645 +#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: sequencer.c:1262 sequencer.c:1317 +#: sequencer.c:1435 sequencer.c:1496 #, c-format msgid "unable to read commit message from '%s'" msgstr "kunde inte läsa incheckningsmeddelande från \"%s\"" -#: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825 -#: builtin/merge.c:850 +#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882 +#: builtin/merge.c:906 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: sequencer.c:1344 +#: sequencer.c:1523 #, c-format msgid "could not parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: sequencer.c:1349 +#: sequencer.c:1528 #, c-format msgid "could not parse parent commit %s" msgstr "kunde inte tolka föräldraincheckningen %s" -#: sequencer.c:1500 sequencer.c:1525 +#: sequencer.c:1602 sequencer.c:1712 +#, c-format +msgid "unknown command: %d" +msgstr "okänt kommando: %d" + +#: sequencer.c:1659 sequencer.c:1684 #, c-format msgid "This is a combination of %d commits." msgstr "Det här är en kombination av %d incheckningar." -#: sequencer.c:1510 sequencer.c:4355 +#: sequencer.c:1669 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:1512 sequencer.c:2729 +#: sequencer.c:1671 sequencer.c:3111 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:1514 +#: sequencer.c:1673 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:1520 +#: sequencer.c:1679 #, c-format msgid "cannot write '%s'" msgstr "kan inte skriva \"%s\"" -#: sequencer.c:1527 git-rebase--interactive.sh:457 +#: sequencer.c:1686 git-rebase--preserve-merges.sh:441 msgid "This is the 1st commit message:" msgstr "Det här är 1:a incheckningsmeddelandet:" -#: sequencer.c:1535 +#: sequencer.c:1694 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:1542 +#: sequencer.c:1701 #, c-format msgid "This is the commit message #%d:" msgstr "Det här är incheckningsmeddelande %d:" -#: sequencer.c:1548 +#: sequencer.c:1707 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Incheckningsmeddelande %d kommer hoppas över:" -#: sequencer.c:1553 -#, c-format -msgid "unknown command: %d" -msgstr "okänt kommando: %d" - -#: sequencer.c:1631 +#: sequencer.c:1795 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:1638 +#: sequencer.c:1802 msgid "cannot fixup root commit" msgstr "kan inte göra \"fixup\" på rotincheckning" -#: sequencer.c:1657 +#: sequencer.c:1821 #, 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:1665 +#: sequencer.c:1829 sequencer.c:1837 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:1669 -#, 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:1675 +#: sequencer.c:1843 #, 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:1694 +#: sequencer.c:1862 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:1759 +#: sequencer.c:1927 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:1813 +#: sequencer.c:1982 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:1814 +#: sequencer.c:1983 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:1864 -msgid "empty commit set passed" -msgstr "den angivna uppsättningen incheckningar är tom" - -#: sequencer.c:1874 +#: sequencer.c:2042 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:1881 +#: sequencer.c:2049 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:1961 +#: sequencer.c:2118 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s tar inte argument: \"%s\"" -#: sequencer.c:1970 +#: sequencer.c:2127 #, c-format msgid "missing arguments for %s" msgstr "argument saknas för %s" -#: sequencer.c:2029 +#: sequencer.c:2164 +#, c-format +msgid "could not parse '%.*s'" +msgstr "kunde inte tolka \"%.*s\"" + +#: sequencer.c:2226 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:2037 +#: sequencer.c:2237 #, c-format msgid "cannot '%s' without a previous commit" msgstr "kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173 +#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178 +#: builtin/rebase.c:204 builtin/rebase.c:229 #, c-format msgid "could not read '%s'." msgstr "kunde inte läsa \"%s\"." -#: sequencer.c:2108 +#: sequencer.c:2360 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:2110 +#: sequencer.c:2362 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: ”%s”" -#: sequencer.c:2115 +#: sequencer.c:2367 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:2126 +#: sequencer.c:2378 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:2128 +#: sequencer.c:2380 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:2195 -#, c-format -msgid "invalid key: %s" -msgstr "felaktig nyckel: %s" - -#: sequencer.c:2198 +#: sequencer.c:2462 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:2269 +#: sequencer.c:2549 msgid "unusable squash-onto" msgstr "oanvändbar squash-onto" -#: sequencer.c:2285 +#: sequencer.c:2565 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: ”%s”" -#: sequencer.c:2323 +#: sequencer.c:2648 sequencer.c:4227 +msgid "empty commit set passed" +msgstr "den angivna uppsättningen incheckningar är tom" + +#: sequencer.c:2656 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:2324 +#: sequencer.c:2657 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:2327 +#: sequencer.c:2660 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:2341 +#: sequencer.c:2674 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:2396 sequencer.c:3403 +#: sequencer.c:2729 sequencer.c:3979 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:2398 +#: sequencer.c:2731 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:2400 sequencer.c:2435 +#: sequencer.c:2733 sequencer.c:2768 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:2421 builtin/grep.c:720 +#: sequencer.c:2754 builtin/grep.c:732 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:2423 +#: sequencer.c:2756 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:2424 +#: sequencer.c:2757 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:2430 +#: sequencer.c:2763 #, 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:2441 +#: sequencer.c:2774 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:2545 sequencer.c:3321 +#: sequencer.c:2903 sequencer.c:3894 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:2583 sequencer.c:3301 +#: sequencer.c:2941 sequencer.c:3874 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639 +#: sequencer.c:2958 +#, c-format +msgid "unable to copy '%s' to '%s'" +msgstr "kan inte kopiera in \"%s\" till \"%s\"" + +#: sequencer.c:2966 +#, c-format +msgid "" +"You can amend the commit now, with\n" +"\n" +" git commit --amend %s\n" +"\n" +"Once you are satisfied with your changes, run\n" +"\n" +" git rebase --continue\n" +msgstr "" +"Du kan utöka incheckningen nu, med\n" +"\n" +"\tgit commit --amend %s\n" +"\n" +"När du är nöjd med dina ändringar kör du\n" +"\n" +"\tgit rebase --continue\n" + +#: sequencer.c:2976 +#, c-format +msgid "Could not apply %s... %.*s" +msgstr "Kunde inte tillämpa %s... %.*s" + +#: sequencer.c:2983 +#, c-format +msgid "Could not merge %.*s" +msgstr "Kunde inte slå ihop %.*s" + +#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:2641 +#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580 +#: builtin/rebase.c:1940 builtin/rebase.c:1995 msgid "could not read index" msgstr "kunde inte läsa indexet" -#: sequencer.c:2646 +#: sequencer.c:3028 #, c-format msgid "" "execution failed: %s\n" @@ -3834,11 +6249,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:2652 +#: sequencer.c:3034 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:2658 +#: sequencer.c:3040 #, c-format msgid "" "execution succeeded: %s\n" @@ -3855,62 +6270,76 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:2771 +#: sequencer.c:3101 +#, c-format +msgid "illegal label name: '%.*s'" +msgstr "ogiltigt etikettnamn: \"%.*s\"" + +#: sequencer.c:3155 msgid "writing fake root commit" msgstr "skriver fejkad rotincheckning" -#: sequencer.c:2776 +#: sequencer.c:3160 msgid "writing squash-onto" msgstr "skriver squash-onto" -#: sequencer.c:2811 +#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850 #, c-format msgid "failed to find tree of %s" msgstr "kunde inte hitta trädet för %s." -#: sequencer.c:2829 +#: sequencer.c:3216 builtin/rebase.c:863 msgid "could not write index" msgstr "kunde inte skriva indexet" -#: sequencer.c:2861 +#: sequencer.c:3243 +#, c-format +msgid "could not resolve '%s'" +msgstr "kunde inte upplösa \"%s\"" + +#: sequencer.c:3271 msgid "cannot merge without a current revision" msgstr "kan inte slå ihop utan en aktuell incheckning" -#: sequencer.c:2884 +#: sequencer.c:3293 #, c-format -msgid "could not resolve '%s'" -msgstr "kunde inte upplösa \"%s\"" +msgid "unable to parse '%.*s'" +msgstr "kan inte tolka \"%.*s\"" -#: sequencer.c:2906 +#: sequencer.c:3302 #, c-format -msgid "could not get commit message of '%s'" -msgstr "kunde inte läsa incheckningsmeddelande för \"%s\"" +msgid "nothing to merge: '%.*s'" +msgstr "inget att slå samman: \"%.*s\"" -#: sequencer.c:2916 sequencer.c:2941 +#: sequencer.c:3314 +msgid "octopus merge cannot be executed on top of a [new root]" +msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]" + +#: sequencer.c:3329 #, c-format -msgid "could not write '%s'" -msgstr "kunde inte skriva \"%s\"" +msgid "could not get commit message of '%s'" +msgstr "kunde inte läsa incheckningsmeddelande för \"%s\"" -#: sequencer.c:3005 +#: sequencer.c:3478 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "kunde inte ens försöka slå ihop \"%.*s\"" -#: sequencer.c:3021 +#: sequencer.c:3494 msgid "merge: Unable to write new index file" msgstr "sammanslagning: Kunde inte skriva ny indexfil" -#: sequencer.c:3088 +#: sequencer.c:3562 builtin/rebase.c:711 #, c-format msgid "Applied autostash.\n" msgstr "Tillämpade autostash.\n" -#: sequencer.c:3100 +#: sequencer.c:3574 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:3103 git-rebase.sh:188 +#: sequencer.c:3577 builtin/rebase.c:727 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3921,7 +6350,31 @@ msgstr "" "Dina ändringar är säkra i stashen.\n" "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" -#: sequencer.c:3134 +#: sequencer.c:3638 +#, c-format +msgid "could not checkout %s" +msgstr "kunde inte checka ut %s" + +#: sequencer.c:3652 +#, c-format +msgid "%s: not a valid OID" +msgstr "%s: inte ett giltigt OID" + +#: sequencer.c:3657 git-rebase--preserve-merges.sh:724 +msgid "could not detach HEAD" +msgstr "kunde inte koppla från HEAD" + +#: sequencer.c:3672 +#, c-format +msgid "Stopped at HEAD\n" +msgstr "Stoppade på HEAD\n" + +#: sequencer.c:3674 +#, c-format +msgid "Stopped at %s\n" +msgstr "Stoppade på %s\n" + +#: sequencer.c:3682 #, c-format msgid "" "Could not execute the todo command\n" @@ -3942,48 +6395,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3202 +#: sequencer.c:3759 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:3264 +#: sequencer.c:3837 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:3309 +#: sequencer.c:3882 msgid "could not read orig-head" msgstr "kunde inte läsa orig-head" -#: sequencer.c:3314 sequencer.c:4352 +#: sequencer.c:3887 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:3328 +#: sequencer.c:3901 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:3414 +#: sequencer.c:3991 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:3423 +#: sequencer.c:4000 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:3425 +#: sequencer.c:4002 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:3427 +#: sequencer.c:4004 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:3430 +#: sequencer.c:4007 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3991,86 +6444,44 @@ msgid "" msgstr "" "\n" "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" -"först och kör sedan \"git rebase --continute\" igen." +"först och kör sedan \"git rebase --continue\" igen." -#: sequencer.c:3455 sequencer.c:3493 +#: sequencer.c:4043 sequencer.c:4081 #, c-format msgid "could not write file: '%s'" msgstr "kunde inte skriva fil: \"%s\"" -#: sequencer.c:3508 +#: sequencer.c:4096 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:3515 +#: sequencer.c:4103 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:3612 +#: sequencer.c:4204 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen ”%s”" -#: sequencer.c:3616 +#: sequencer.c:4208 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:3649 +#: sequencer.c:4243 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" -#: sequencer.c:4098 +#: sequencer.c:4686 msgid "make_script: unhandled options" msgstr "make_script: flaggor som inte stöds" -#: sequencer.c:4101 +#: sequencer.c:4689 msgid "make_script: error preparing revisions" msgstr "make_script: fel när revisioner skulle förberedas" -#: sequencer.c:4142 sequencer.c:4177 -#, c-format -msgid "unusable todo list: '%s'" -msgstr "oanvändbar todo-lista: %s" - -#: sequencer.c:4236 -#, 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:4302 -#, c-format -msgid "" -"Warning: some commits may have been dropped accidentally.\n" -"Dropped commits (newer to older):\n" -msgstr "" -"Varning: vissa incheckningar kan av misstag ha tappats.\n" -"Tappade incheckningar (nyaste först):\n" - -#: sequencer.c:4309 -#, c-format -msgid "" -"To avoid this message, use \"drop\" to explicitly remove a commit.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of " -"warnings.\n" -"The possible behaviours are: ignore, warn, error.\n" -"\n" -msgstr "" -"För att undvika det här meddelandet kan du använda \"drop\" för att " -"explicit\n" -"kasta en incheckning.\n" -"\n" -"Använd \"git config rebase.missingCommitsCheck\" för att ändra " -"varningsnivån.\n" -"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error" -"\" (fel).\n" -"\n" - -#: sequencer.c:4321 -#, c-format +#: sequencer.c:4847 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -4080,12 +6491,15 @@ msgstr "" "continue\".\n" "Avbryt ombaseringen med \"git rebase --abort\".\n" -#: sequencer.c:4375 -#, c-format -msgid "could not parse commit '%s'" -msgstr "kunde inte tolka incheckningen\" %s\"" +#: sequencer.c:4959 sequencer.c:4976 +msgid "nothing to do" +msgstr "inget att göra" -#: sequencer.c:4490 +#: sequencer.c:4990 +msgid "could not skip unnecessary pick commands" +msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon" + +#: sequencer.c:5073 msgid "the script was already rearranged." msgstr "skriptet har redan omordnats." @@ -4094,7 +6508,7 @@ msgstr "skriptet har redan omordnats." msgid "'%s' is outside repository" msgstr "\"%s\" är utanför arkivet" -#: setup.c:172 +#: setup.c:173 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -4104,7 +6518,7 @@ msgstr "" "Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns " "lokalt." -#: setup.c:185 +#: setup.c:186 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -4116,12 +6530,12 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:234 +#: setup.c:235 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "flaggan \"%s\" måste anges före argument som inte är flaggor" -#: setup.c:253 +#: setup.c:254 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -4132,92 +6546,92 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:389 +#: setup.c:390 msgid "unable to set up work tree using invalid config" msgstr "kan inte skapa arbetskatalog med felaktig konfiguration" -#: setup.c:393 +#: setup.c:394 msgid "this operation must be run in a work tree" msgstr "funktionen måste köras i en arbetskatalog" -#: setup.c:503 +#: setup.c:540 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Förväntade git-arkivversion <= %d, hittade %d" -#: setup.c:511 +#: setup.c:548 msgid "unknown repository extensions found:" msgstr "okända arkivutökningar hittades:" -#: setup.c:530 +#: setup.c:567 #, c-format msgid "error opening '%s'" msgstr "fel vid öppning av \"%s\"" -#: setup.c:532 +#: setup.c:569 #, c-format msgid "too large to be a .git file: '%s'" msgstr "för stor för att vara en .git-fil: \"%s\"" -#: setup.c:534 +#: setup.c:571 #, c-format msgid "error reading %s" msgstr "fel vid läsning av %s" -#: setup.c:536 +#: setup.c:573 #, c-format msgid "invalid gitfile format: %s" msgstr "ogiltigt gitfilformat: %s" -#: setup.c:538 +#: setup.c:575 #, c-format msgid "no path in gitfile: %s" msgstr "ingen sökväg i gitfil: %s" -#: setup.c:540 +#: setup.c:577 #, c-format msgid "not a git repository: %s" msgstr "inte ett git-arkiv: %s" -#: setup.c:639 +#: setup.c:676 #, c-format msgid "'$%s' too big" msgstr "\"$%s\" för stor" -#: setup.c:653 +#: setup.c:690 #, c-format msgid "not a git repository: '%s'" msgstr "inte ett git-arkiv: \"%s\"" -#: setup.c:682 setup.c:684 setup.c:715 +#: setup.c:719 setup.c:721 setup.c:752 #, c-format msgid "cannot chdir to '%s'" msgstr "kan inte byta katalog (chdir) till \"%s\"" -#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815 +#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 msgid "cannot come back to cwd" msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)" -#: setup.c:813 -#, 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:824 +#: setup.c:851 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "misslyckades ta status på \"%*ss%s%s\"" -#: setup.c:1054 +#: setup.c:1083 msgid "Unable to read current working directory" msgstr "Kan inte läsa aktuell arbetskatalog" -#: setup.c:1066 setup.c:1072 +#: setup.c:1092 setup.c:1098 #, c-format msgid "cannot change to '%s'" msgstr "kan inte byta till \"%s\"" -#: setup.c:1085 +#: setup.c:1103 +#, c-format +msgid "not a git repository (or any of the parent directories): %s" +msgstr "inte ett git-arkiv (eller någon av föräldrakatalogerna): %s" + +#: setup.c:1109 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -4227,7 +6641,7 @@ msgstr "" "monteringspunkten %s)\n" "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." -#: setup.c:1168 +#: setup.c:1220 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -4236,53 +6650,278 @@ msgstr "" "problem med filläges-värdet i core.sharedRepository (0%.3o).\n" "Ägaren av filerna måste alltid ha läs- och skrivbehörighet." -#: setup.c:1211 +#: setup.c:1264 msgid "open /dev/null or dup failed" msgstr "misslyckades öppna /dev/null eller \"dup\"" -#: setup.c:1226 +#: setup.c:1279 msgid "fork failed" msgstr "\"fork\" misslyckades" -#: setup.c:1231 +#: setup.c:1284 msgid "setsid failed" msgstr "\"setsid\" misslyckades" -#: sha1-file.c:625 +#: sha1-file.c:453 +#, c-format +msgid "object directory %s does not exist; check .git/objects/info/alternates" +msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates" + +#: sha1-file.c:504 +#, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "kunde inte normalisera alternativ objektsökväg: %s" + +#: sha1-file.c:576 +#, c-format +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "%s: ignorerar alternativa objektlagringar, för djup nästling" + +#: sha1-file.c:583 +#, c-format +msgid "unable to normalize object directory: %s" +msgstr "kan inte normalisera objektkatalogen: %s" + +#: sha1-file.c:626 +msgid "unable to fdopen alternates lockfile" +msgstr "kan inte utföra \"fdopen\" på låsfil för \"alternates\"" + +#: sha1-file.c:644 +msgid "unable to read alternates file" +msgstr "kan inte läsa \"alternates\"-filen" + +#: sha1-file.c:651 +msgid "unable to move new alternates file into place" +msgstr "kan inte flytta ny \"alternates\"-fil på plats" + +#: sha1-file.c:686 #, c-format msgid "path '%s' does not exist" msgstr "sökvägen \"%s\" finns inte" -#: sha1-file.c:651 +#: sha1-file.c:712 #, 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:657 +#: sha1-file.c:718 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: sha1-file.c:663 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: sha1-file.c:671 +#: sha1-file.c:732 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: sha1-name.c:442 +#: sha1-file.c:846 +#, c-format +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" +msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>" + +#: sha1-file.c:871 +msgid "mmap failed" +msgstr "mmap misslyckades" + +#: sha1-file.c:1035 +#, c-format +msgid "object file %s is empty" +msgstr "objektfilen %s är tom" + +#: sha1-file.c:1159 sha1-file.c:2297 +#, c-format +msgid "corrupt loose object '%s'" +msgstr "trasigt löst objekt \"%s\"" + +#: sha1-file.c:1161 sha1-file.c:2301 +#, c-format +msgid "garbage at end of loose object '%s'" +msgstr "skräp i slutet av löst objekt \"%s\"" + +#: sha1-file.c:1203 +msgid "invalid object type" +msgstr "felaktig objekttyp" + +#: sha1-file.c:1287 +#, c-format +msgid "unable to unpack %s header with --allow-unknown-type" +msgstr "kan inte packa upp %s-huvud med --allow-unknown-type" + +#: sha1-file.c:1290 +#, c-format +msgid "unable to unpack %s header" +msgstr "kan inte packa upp %s-huvudet" + +#: sha1-file.c:1296 +#, c-format +msgid "unable to parse %s header with --allow-unknown-type" +msgstr "kan inte tolka %s-huvud med --allow-unknown-type" + +#: sha1-file.c:1299 +#, c-format +msgid "unable to parse %s header" +msgstr "kan inte tolka %s-huvud" + +#: sha1-file.c:1490 +#, c-format +msgid "failed to read object %s" +msgstr "misslyckades läsa objektet %s" + +#: sha1-file.c:1494 +#, c-format +msgid "replacement %s not found for %s" +msgstr "ersättningen %s hittades inte för %s" + +#: sha1-file.c:1498 +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "löst objekt %s (lagrat i %s) är trasigt" + +#: sha1-file.c:1502 +#, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "packat objekt %s (lagrat i %s) är trasigt" + +#: sha1-file.c:1604 +#, c-format +msgid "unable to write file %s" +msgstr "kunde inte skriva filen %s" + +#: sha1-file.c:1611 +#, c-format +msgid "unable to set permission to '%s'" +msgstr "kan inte sätta behörigheten till \"%s\"" + +#: sha1-file.c:1618 +msgid "file write error" +msgstr "fel vid skrivning av fil" + +#: sha1-file.c:1637 +msgid "error when closing loose object file" +msgstr "fel vid stängning av fil för löst objekt" + +#: sha1-file.c:1702 +#, c-format +msgid "insufficient permission for adding an object to repository database %s" +msgstr "" +"otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s" + +#: sha1-file.c:1704 +msgid "unable to create temporary file" +msgstr "kan inte skapa temporär fil" + +#: sha1-file.c:1728 +msgid "unable to write loose object file" +msgstr "kunde inte skriva fil för löst objekt" + +#: sha1-file.c:1734 +#, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)" + +#: sha1-file.c:1738 +#, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "\"deflateend\" på objektet %s misslyckades (%d)" + +#: sha1-file.c:1742 +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "förvirrad av instabil objektkälldata för %s" + +#: sha1-file.c:1752 builtin/pack-objects.c:920 +#, c-format +msgid "failed utime() on %s" +msgstr "\"utime()\" misslyckades på %s" + +#: sha1-file.c:1827 +#, c-format +msgid "cannot read object for %s" +msgstr "kan inte läsa objekt för %s" + +#: sha1-file.c:1867 +msgid "corrupt commit" +msgstr "trasik incheckning" + +#: sha1-file.c:1875 +msgid "corrupt tag" +msgstr "trasig tagg" + +#: sha1-file.c:1974 +#, c-format +msgid "read error while indexing %s" +msgstr "läsfel vid indexering av %s" + +#: sha1-file.c:1977 +#, c-format +msgid "short read while indexing %s" +msgstr "för lite lästes vid indexering av %s" + +#: sha1-file.c:2050 sha1-file.c:2059 +#, c-format +msgid "%s: failed to insert into database" +msgstr "%s: misslyckades lägga in i databasen" + +#: sha1-file.c:2065 +#, c-format +msgid "%s: unsupported file type" +msgstr "%s: filtypen stöds ej" + +#: sha1-file.c:2089 +#, c-format +msgid "%s is not a valid object" +msgstr "%s är inte ett giltigt objekt" + +#: sha1-file.c:2091 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s är inte ett giltigt \"%s\"-objekt" + +#: sha1-file.c:2118 builtin/index-pack.c:154 +#, c-format +msgid "unable to open %s" +msgstr "kan inte öppna %s" + +#: sha1-file.c:2308 sha1-file.c:2360 +#, c-format +msgid "hash mismatch for %s (expected %s)" +msgstr "hash stämmer inte för %s (förväntade %s)" + +#: sha1-file.c:2332 +#, c-format +msgid "unable to mmap %s" +msgstr "kan inte utföra \"mmap\" för %s" + +#: sha1-file.c:2337 +#, c-format +msgid "unable to unpack header of %s" +msgstr "kan inte packa upp huvud för %s" + +#: sha1-file.c:2343 +#, c-format +msgid "unable to parse header of %s" +msgstr "kan inte tolka huvud för %s" + +#: sha1-file.c:2354 +#, c-format +msgid "unable to unpack contents of %s" +msgstr "kan inte tolka innehåll i %s" + +#: sha1-name.c:487 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "kort SHA1 %s är tvetydig" -#: sha1-name.c:453 +#: sha1-name.c:498 msgid "The candidates are:" msgstr "Kandidaterna är:" -#: sha1-name.c:695 +#: sha1-name.c:794 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" @@ -4304,71 +6943,81 @@ 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:97 submodule.c:131 +#: submodule.c:114 submodule.c:143 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:101 submodule.c:135 +#: submodule.c:118 submodule.c:147 #, 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:109 -#, c-format -msgid "Could not update .gitmodules entry %s" -msgstr "Kunde inte uppdatera .gitmodules-posten %s" - -#: submodule.c:142 +#: submodule.c:154 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Kunde inte ta bort .gitmodules-posten för %s" -#: submodule.c:153 +#: submodule.c:165 msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:315 +#: submodule.c:327 #, c-format msgid "in unpopulated submodule '%s'" msgstr "i ej utcheckad undermodul \"%s\"" -#: submodule.c:346 +#: submodule.c:358 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" -#: submodule.c:837 +#: submodule.c:910 #, 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:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743 +#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens." -#: submodule.c:1375 +#: submodule.c:1481 +#, c-format +msgid "Could not access submodule '%s'" +msgstr "kunde inte komma åt undermodulen \"%s\"" + +#: submodule.c:1651 #, c-format msgid "'%s' not recognized as a git repository" msgstr "\"%s\" känns inte igen som ett git-arkiv" -#: submodule.c:1513 +#: submodule.c:1789 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "kunde inte starta \"git status\" i undermodulen \"%s\"" -#: submodule.c:1526 +#: submodule.c:1802 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "kunde inte köra \"git status\" i undermodulen \"%s\"" -#: submodule.c:1619 +#: submodule.c:1817 +#, c-format +msgid "Could not unset core.worktree setting in submodule '%s'" +msgstr "Kunde inte ta bort inställningen core.worktree i undermodulen \"%s\"" + +#: submodule.c:1907 #, c-format msgid "submodule '%s' has dirty index" msgstr "undermodulen \"%s\" har ett smutsigt index" -#: submodule.c:1718 +#: submodule.c:1959 +#, c-format +msgid "Submodule '%s' could not be updated." +msgstr "Undermoduler \"%s\" kunde inte uppdateras." + +#: submodule.c:2008 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -4376,18 +7025,12 @@ msgstr "" "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " "stöds ej" -#: submodule.c:1730 submodule.c:1786 +#: submodule.c:2020 submodule.c:2076 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" -#: submodule.c:1734 builtin/submodule--helper.c:1261 -#: builtin/submodule--helper.c:1271 -#, c-format -msgid "could not create directory '%s'" -msgstr "kunde inte skapa katalogen \"%s\"" - -#: submodule.c:1737 +#: submodule.c:2027 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -4398,34 +7041,44 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:1821 +#: submodule.c:2111 #, c-format msgid "could not recurse into submodule '%s'" msgstr "kunde inte rekursera in i undermodulen \"%s\"" -#: submodule.c:1865 +#: submodule.c:2155 msgid "could not start ls-files in .." msgstr "kunde inte starta ls-files i .." -#: submodule.c:1904 +#: submodule.c:2194 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en oväntad returkod %d" -#: submodule-config.c:230 +#: submodule-config.c:232 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "ignorerar misstänkt undermodulnamn: %s" -#: submodule-config.c:294 +#: submodule-config.c:299 msgid "negative values not allowed for submodule.fetchjobs" msgstr "negativa värden är inte tillåtna för submodule.fetchjobs" -#: submodule-config.c:467 +#: submodule-config.c:397 +#, c-format +msgid "ignoring '%s' which may be interpreted as a command-line option: %s" +msgstr "ignorerar \"%s\" som kan tolkas som en kommandoradsflagga: %s" + +#: submodule-config.c:486 #, c-format msgid "invalid value for %s" msgstr "ogiltigt värde för %s" +#: submodule-config.c:755 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "Kunde inte uppdatera .gitmodules-posten %s" + #: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" @@ -4437,7 +7090,7 @@ msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\"" msgid "unknown value '%s' for key '%s'" msgstr "okänt värde \"%s\" för nyckeln \"%s\"" -#: trailer.c:539 trailer.c:544 builtin/remote.c:293 +#: trailer.c:539 trailer.c:544 builtin/remote.c:295 #, c-format msgid "more than one %s" msgstr "mer än en %s" @@ -4456,26 +7109,26 @@ msgstr "kunde inte läsa indatafilen \"%s\"" msgid "could not read from stdin" msgstr "kunde inte läsa från standard in" -#: trailer.c:1008 builtin/am.c:46 +#: trailer.c:1011 wrapper.c:701 #, c-format msgid "could not stat %s" msgstr "kunde inte ta status på %s" -#: trailer.c:1010 +#: trailer.c:1013 #, c-format msgid "file %s is not a regular file" msgstr "filen %s är inte en normal fil" -#: trailer.c:1012 +#: trailer.c:1015 #, c-format msgid "file %s is not writable by user" msgstr "filen %s är inte skrivbar av användaren" -#: trailer.c:1024 +#: trailer.c:1027 msgid "could not open temporary file" msgstr "kunde inte öppna temporär fil" -#: trailer.c:1064 +#: trailer.c:1067 #, c-format msgid "could not rename temporary file to %s" msgstr "kunde inte byta namn på temporär fil till %s" @@ -4485,16 +7138,47 @@ msgstr "kunde inte byta namn på temporär fil till %s" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n" +#: transport.c:142 +#, c-format +msgid "could not read bundle '%s'" +msgstr "kunde inte läsa paketet (bundlen) \"%s\"" + #: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: ogiltig flagga för depth: ”%s”" -#: transport.c:584 +#: transport.c:259 +msgid "see protocol.version in 'git help config' for more details" +msgstr "se protocol.version i \"git help config\" för mer information" + +#: transport.c:260 +msgid "server options require protocol version 2 or later" +msgstr "serverflaggor kräver protokollversion 2 eller senare" + +#: transport.c:625 msgid "could not parse transport.color.* config" msgstr "kunde inte tolka inställningen för transport.color.*" -#: transport.c:996 +#: transport.c:698 +msgid "support for protocol v2 not implemented yet" +msgstr "stöd för protokoll v2 ännu ej implementerat" + +#: transport.c:825 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "okänt värde för inställningen \"%s\": %s" + +#: transport.c:891 +#, c-format +msgid "transport '%s' not allowed" +msgstr "transporten \"%s\" tillåts inte" + +#: transport.c:945 +msgid "git-over-rsync is no longer supported" +msgstr "git-over-rsync stöds inte längre" + +#: transport.c:1040 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -4503,7 +7187,7 @@ msgstr "" "Följande undermodulsökvägar innehåller ändringar som\n" "inte kan hittas av fjärrarna:\n" -#: transport.c:1000 +#: transport.c:1044 #, c-format msgid "" "\n" @@ -4530,28 +7214,205 @@ msgstr "" "för att sända dem till fjärren.\n" "\n" -#: transport.c:1008 +#: transport.c:1052 msgid "Aborting." msgstr "Avbryter." -#: transport-helper.c:1087 +#: transport.c:1193 +msgid "failed to push all needed submodules" +msgstr "kunde inte sända alla nödvändiga undermoduler" + +#: transport.c:1326 transport-helper.c:645 +msgid "operation not supported by protocol" +msgstr "funktionen stöds inte av protokollet" + +#: transport.c:1430 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "felaktig rad vid tolkning av alternativa referenser: %s" + +#: transport-helper.c:51 transport-helper.c:80 +msgid "full write to remote helper failed" +msgstr "komplett skrivning till fjärrhjälpare misslyckades" + +#: transport-helper.c:134 +#, c-format +msgid "unable to find remote helper for '%s'" +msgstr "kan inte hitta fjärrhjälpare för \"%s\"" + +#: transport-helper.c:150 transport-helper.c:559 +msgid "can't dup helper output fd" +msgstr "kunde inte duplicera utdata-filhandtag" + +#: transport-helper.c:201 +#, c-format +msgid "" +"unknown mandatory capability %s; this remote helper probably needs newer " +"version of Git" +msgstr "" +"okänd krävd förmåga (capability) %s; fjärrhjälparen behöver antagligen en " +"nyare version av Git" + +#: transport-helper.c:207 +msgid "this remote helper should implement refspec capability" +msgstr "" +"fjärrhjälparen behöver implementera förmåga för referensspecifikationer " +"(refspec)" + +#: transport-helper.c:274 transport-helper.c:414 +#, c-format +msgid "%s unexpectedly said: '%s'" +msgstr "%s sade oväntat: \"%s\"" + +#: transport-helper.c:403 +#, c-format +msgid "%s also locked %s" +msgstr "%s låste också %s" + +#: transport-helper.c:481 +msgid "couldn't run fast-import" +msgstr "kunde inte köra fast-import" + +#: transport-helper.c:504 +msgid "error while running fast-import" +msgstr "fel när fast-import kördes" + +#: transport-helper.c:533 transport-helper.c:1099 +#, c-format +msgid "could not read ref %s" +msgstr "kunde inte läsa referensen %s" + +#: transport-helper.c:578 +#, c-format +msgid "unknown response to connect: %s" +msgstr "okänt svar på ansluntning: %s" + +#: transport-helper.c:600 +msgid "setting remote service path not supported by protocol" +msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst" + +#: transport-helper.c:602 +msgid "invalid remote service path" +msgstr "felaktig sökväg till fjärrtjänst" + +#: transport-helper.c:648 +#, c-format +msgid "can't connect to subservice %s" +msgstr "kan inte ansluta till undertjänsten %s" + +#: transport-helper.c:720 +#, c-format +msgid "expected ok/error, helper said '%s'" +msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\"" + +#: transport-helper.c:773 +#, c-format +msgid "helper reported unexpected status of %s" +msgstr "hjälparen returnerade oväntad status %s" + +#: transport-helper.c:834 +#, c-format +msgid "helper %s does not support dry-run" +msgstr "hjälparen %s stöder inte dry-run" + +#: transport-helper.c:837 +#, c-format +msgid "helper %s does not support --signed" +msgstr "hjälparen %s stöder inte --signed" + +#: transport-helper.c:840 +#, c-format +msgid "helper %s does not support --signed=if-asked" +msgstr "hjälparen %s stöder inte --signed=if-asked" + +#: transport-helper.c:847 +#, c-format +msgid "helper %s does not support 'push-option'" +msgstr "hjälparen %s stöder inte \"push-option\"" + +#: transport-helper.c:939 +msgid "remote-helper doesn't support push; refspec needed" +msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs" + +#: transport-helper.c:944 +#, c-format +msgid "helper %s does not support 'force'" +msgstr "hjälparen %s stöder inte \"force\"" + +#: transport-helper.c:991 +msgid "couldn't run fast-export" +msgstr "kunde inte köra fast-export" + +#: transport-helper.c:996 +msgid "error while running fast-export" +msgstr "fel vid körning av fast-export" + +#: transport-helper.c:1021 +#, c-format +msgid "" +"No refs in common and none specified; doing nothing.\n" +"Perhaps you should specify a branch such as 'master'.\n" +msgstr "" +"Inga gemensamma referenser och inga angavs; gör inget.\n" +"Du kanske borde ange en gren såsom \"master\".\n" + +#: transport-helper.c:1085 +#, c-format +msgid "malformed response in ref list: %s" +msgstr "felformat svar i referenslistan: %s" + +#: transport-helper.c:1238 +#, c-format +msgid "read(%s) failed" +msgstr "läs(%s) misslyckades" + +#: transport-helper.c:1265 +#, c-format +msgid "write(%s) failed" +msgstr "skriv(%s) misslyckades" + +#: transport-helper.c:1314 +#, c-format +msgid "%s thread failed" +msgstr "%s-tråden misslyckades" + +#: transport-helper.c:1318 +#, c-format +msgid "%s thread failed to join: %s" +msgstr "%s-tråden misslyckades ansluta: %s" + +#: transport-helper.c:1337 transport-helper.c:1341 #, c-format -msgid "Could not read ref %s" -msgstr "Kunde inte läsa referensen %s" +msgid "can't start thread for copying data: %s" +msgstr "kan inte starta tråd för kopiering av data: %s" -#: tree-walk.c:31 +#: transport-helper.c:1378 +#, c-format +msgid "%s process failed to wait" +msgstr "processen %s misslyckades vänta" + +#: transport-helper.c:1382 +#, c-format +msgid "%s process failed" +msgstr "processen %s misslyckades" + +#: transport-helper.c:1400 transport-helper.c:1409 +msgid "can't start thread for copying data" +msgstr "kan inte skapa tråd för kopiering av data" + +#: tree-walk.c:33 msgid "too-short tree object" msgstr "trädobjekt för kort" -#: tree-walk.c:37 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "felformat läge i trädpost" -#: tree-walk.c:41 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "tomt filnamn i trädpost" -#: tree-walk.c:113 +#: tree-walk.c:116 msgid "too-short tree file" msgstr "trädfil för kort" @@ -4782,15 +7643,25 @@ msgstr "" "Kan inte uppdatera undermodul:\n" "%s" -#: unpack-trees.c:262 +#: unpack-trees.c:256 #, c-format msgid "Aborting\n" msgstr "Avbryter\n" -#: unpack-trees.c:344 +#: unpack-trees.c:318 msgid "Checking out files" msgstr "Checkar ut filer" +#: unpack-trees.c:350 +msgid "" +"the following paths have collided (e.g. case-sensitive paths\n" +"on a case-insensitive filesystem) and only one from the same\n" +"colliding group is in the working tree:\n" +msgstr "" +"följande sökvägar har kolliderat (t.ex. skiftlägeskänsliga\n" +"sökvägar på ett okänsligt filsystem) och endast en från samma\n" +"kollisionsgrupp finns i arbetskatalogen:\n" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "ogiltig URL-schemanamn eller saknat \"://\"-suffix" @@ -4820,32 +7691,32 @@ msgstr "felaktigt portnummer" msgid "invalid '..' path segment" msgstr "felaktigt \"..\"-sökvägssegment" -#: worktree.c:245 builtin/am.c:2147 +#: worktree.c:255 builtin/am.c:2097 #, c-format msgid "failed to read '%s'" msgstr "misslyckades läsa \"%s\"" -#: worktree.c:291 +#: worktree.c:301 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen" -#: worktree.c:302 +#: worktree.c:312 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen" -#: worktree.c:314 +#: worktree.c:324 #, c-format msgid "'%s' does not exist" msgstr "\"%s\" finns inte" -#: worktree.c:320 +#: worktree.c:330 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "\"%s\" är inte en .git-fil, felkod %d" -#: worktree.c:328 +#: worktree.c:338 #, c-format msgid "'%s' does not point back to '%s'" msgstr "\"%s\" pekar inte tillbaka till \"%s\"" @@ -4855,12 +7726,6 @@ msgstr "\"%s\" pekar inte tillbaka till \"%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: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" - #: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" @@ -4870,155 +7735,155 @@ msgstr "kan inte komma åt \"%s\"" msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" -#: wt-status.c:154 +#: wt-status.c:156 msgid "Unmerged paths:" msgstr "Ej sammanslagna sökvägar:" -#: wt-status.c:181 wt-status.c:208 +#: wt-status.c:183 wt-status.c:210 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)" -#: wt-status.c:183 wt-status.c:210 +#: wt-status.c:185 wt-status.c:212 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)" -#: wt-status.c:187 +#: wt-status.c:189 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (använd \"git add <fil>...\" för att ange lösning)" -#: wt-status.c:189 wt-status.c:193 +#: wt-status.c:191 wt-status.c:195 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)" -#: wt-status.c:191 +#: wt-status.c:193 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:202 wt-status.c:1015 +#: wt-status.c:204 wt-status.c:1064 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:220 wt-status.c:1024 +#: wt-status.c:222 wt-status.c:1073 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" -#: wt-status.c:224 +#: wt-status.c:226 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)" -#: wt-status.c:226 +#: wt-status.c:228 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)" -#: wt-status.c:227 +#: wt-status.c:229 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (använd \"git checkout -- <fil>...\" för att förkasta ändringar i " "arbetskatalogen)" -#: wt-status.c:229 +#: wt-status.c:231 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)" -#: wt-status.c:241 +#: wt-status.c:243 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)" -#: wt-status.c:256 +#: wt-status.c:258 msgid "both deleted:" msgstr "borttaget av bägge:" -#: wt-status.c:258 +#: wt-status.c:260 msgid "added by us:" msgstr "tillagt av oss:" -#: wt-status.c:260 +#: wt-status.c:262 msgid "deleted by them:" msgstr "borttaget av dem:" -#: wt-status.c:262 +#: wt-status.c:264 msgid "added by them:" msgstr "tillagt av dem:" -#: wt-status.c:264 +#: wt-status.c:266 msgid "deleted by us:" msgstr "borttaget av oss:" -#: wt-status.c:266 +#: wt-status.c:268 msgid "both added:" msgstr "tillagt av bägge:" -#: wt-status.c:268 +#: wt-status.c:270 msgid "both modified:" msgstr "ändrat av bägge:" -#: wt-status.c:278 +#: wt-status.c:280 msgid "new file:" msgstr "ny fil:" -#: wt-status.c:280 +#: wt-status.c:282 msgid "copied:" msgstr "kopierad:" -#: wt-status.c:282 +#: wt-status.c:284 msgid "deleted:" msgstr "borttagen:" -#: wt-status.c:284 +#: wt-status.c:286 msgid "modified:" msgstr "ändrad:" -#: wt-status.c:286 +#: wt-status.c:288 msgid "renamed:" msgstr "namnbytt:" -#: wt-status.c:288 +#: wt-status.c:290 msgid "typechange:" msgstr "typbyte:" -#: wt-status.c:290 +#: wt-status.c:292 msgid "unknown:" msgstr "okänd:" -#: wt-status.c:292 +#: wt-status.c:294 msgid "unmerged:" msgstr "osammanslagen:" -#: wt-status.c:372 +#: wt-status.c:374 msgid "new commits, " msgstr "nya incheckningar, " -#: wt-status.c:374 +#: wt-status.c:376 msgid "modified content, " msgstr "ändrat innehåll, " -#: wt-status.c:376 +#: wt-status.c:378 msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:853 +#: wt-status.c:896 #, 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:885 +#: wt-status.c:928 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:887 +#: wt-status.c:930 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:969 +#: wt-status.c:1012 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -5026,107 +7891,107 @@ msgstr "" "Raden ovan får inte ändras eller tas bort.\n" "Allt under den kommer tas bort." -#: wt-status.c:1084 +#: wt-status.c:1119 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:1087 +#: wt-status.c:1122 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:1089 +#: wt-status.c:1124 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)" -#: wt-status.c:1094 +#: wt-status.c:1128 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:1097 +#: wt-status.c:1131 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:1107 +#: wt-status.c:1140 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:1110 +#: wt-status.c:1143 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:1114 +#: wt-status.c:1147 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:1116 +#: wt-status.c:1149 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:1118 +#: wt-status.c:1151 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:1250 +#: wt-status.c:1282 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo saknas." -#: wt-status.c:1252 +#: wt-status.c:1284 msgid "No commands done." msgstr "Inga kommandon utförda." -#: wt-status.c:1255 +#: wt-status.c:1287 #, 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:1266 +#: wt-status.c:1298 #, c-format msgid " (see more in file %s)" msgstr " (se fler i filen %s)" -#: wt-status.c:1271 +#: wt-status.c:1303 msgid "No commands remaining." msgstr "Inga kommandon återstår." -#: wt-status.c:1274 +#: wt-status.c:1306 #, 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:1282 +#: wt-status.c:1314 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:1295 +#: wt-status.c:1326 #, 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:1300 +#: wt-status.c:1331 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1314 +#: wt-status.c:1344 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1316 +#: wt-status.c:1346 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1318 +#: wt-status.c:1348 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:1324 +#: wt-status.c:1355 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1328 +#: wt-status.c:1359 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -5134,126 +7999,142 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1333 +#: wt-status.c:1364 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:1336 +#: wt-status.c:1367 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:1340 +#: wt-status.c:1371 #, 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:1345 +#: wt-status.c:1376 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:1348 +#: wt-status.c:1379 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:1350 +#: wt-status.c:1381 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:1360 +#: wt-status.c:1392 +msgid "Cherry-pick currently in progress." +msgstr "Cherry-pick pågår." + +#: wt-status.c:1395 #, 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:1365 +#: wt-status.c:1402 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1368 +#: wt-status.c:1405 +msgid " (run \"git cherry-pick --continue\" to continue)" +msgstr " (kör \"git cherry-pick --continue\" för att fortsätta)" + +#: wt-status.c:1408 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1370 +#: wt-status.c:1410 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:1379 +#: wt-status.c:1420 +msgid "Revert currently in progress." +msgstr "Ångring pågår." + +#: wt-status.c:1423 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1384 +#: wt-status.c:1429 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1387 +#: wt-status.c:1432 +msgid " (run \"git revert --continue\" to continue)" +msgstr " (kör \"git revert --continue\" för att fortsätta)" + +#: wt-status.c:1435 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1389 +#: wt-status.c:1437 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1400 +#: wt-status.c:1447 #, 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:1404 +#: wt-status.c:1451 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1407 +#: wt-status.c:1454 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:1604 +#: wt-status.c:1663 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1610 +#: wt-status.c:1670 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå " -#: wt-status.c:1612 +#: wt-status.c:1672 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå " -#: wt-status.c:1617 +#: wt-status.c:1677 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1619 +#: wt-status.c:1679 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1622 +#: wt-status.c:1682 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1642 +#: wt-status.c:1699 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1643 +#: wt-status.c:1700 msgid "No commits yet" msgstr "Inga incheckningar ännu" -#: wt-status.c:1657 +#: wt-status.c:1714 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1659 +#: wt-status.c:1716 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1663 +#: wt-status.c:1720 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -5265,32 +8146,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1669 +#: wt-status.c:1726 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1671 +#: wt-status.c:1728 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1677 +#: wt-status.c:1734 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1682 +#: wt-status.c:1739 #, 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:1685 +#: wt-status.c:1742 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1688 +#: wt-status.c:1745 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -5299,195 +8180,186 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1691 +#: wt-status.c:1748 #, 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:1694 +#: wt-status.c:1751 #, 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:1697 wt-status.c:1702 +#: wt-status.c:1754 wt-status.c:1759 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1700 +#: wt-status.c:1757 #, 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:1704 +#: wt-status.c:1761 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1817 +#: wt-status.c:1874 msgid "No commits yet on " msgstr "Inga incheckningar ännu på " -#: wt-status.c:1821 +#: wt-status.c:1878 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1852 +#: wt-status.c:1909 msgid "different" msgstr "olika" -#: wt-status.c:1854 wt-status.c:1862 +#: wt-status.c:1911 wt-status.c:1919 msgid "behind " msgstr "efter " -#: wt-status.c:1857 wt-status.c:1860 +#: wt-status.c:1914 wt-status.c:1917 msgid "ahead " msgstr "före " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2366 +#: wt-status.c:2441 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "kan inte %s: Du har oköade ändringar." -#: wt-status.c:2372 +#: wt-status.c:2447 msgid "additionally, your index contains uncommitted changes." msgstr "dessutom innehåller dit index ändringar som inte har checkats in." -#: wt-status.c:2374 +#: wt-status.c:2449 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in." -#: compat/precompose_utf8.c:58 builtin/clone.c:442 -#, c-format -msgid "failed to unlink '%s'" -msgstr "misslyckades ta bort länken \"%s\"" - -#: builtin/add.c:24 +#: builtin/add.c:25 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<flaggor>] [--] <sökväg>..." -#: builtin/add.c:83 +#: builtin/add.c:84 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:88 builtin/commit.c:266 +#: builtin/add.c:89 builtin/commit.c:285 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:98 +#: builtin/add.c:99 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:173 +#: builtin/add.c:174 msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:233 builtin/rev-parse.c:892 +#: builtin/add.c:234 builtin/rev-parse.c:896 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:244 +#: builtin/add.c:245 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning." -#: builtin/add.c:248 +#: builtin/add.c:249 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:251 +#: builtin/add.c:252 msgid "editing patch failed" msgstr "redigering av patch misslyckades" -#: builtin/add.c:254 +#: builtin/add.c:255 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:256 +#: builtin/add.c:257 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:261 +#: builtin/add.c:262 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:269 +#: builtin/add.c:270 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:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123 -#: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557 -#: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165 +#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560 +#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:292 +#: builtin/add.c:293 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302 +#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306 msgid "select hunks interactively" msgstr "välj stycken interaktivt" -#: builtin/add.c:294 +#: builtin/add.c:295 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:295 +#: builtin/add.c:296 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:296 +#: builtin/add.c:297 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:297 +#: builtin/add.c:298 msgid "renormalize EOL of tracked files (implies -u)" msgstr "åternormalisera radslut i spårade filer (implicerar -u)" -#: builtin/add.c:298 +#: builtin/add.c:299 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:299 +#: builtin/add.c:300 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:302 +#: builtin/add.c:303 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:304 +#: builtin/add.c:305 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:305 +#: builtin/add.c:306 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:306 +#: builtin/add.c:307 msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: builtin/add.c:307 builtin/update-index.c:974 -msgid "(+/-)x" -msgstr "(+/-)x" - -#: builtin/add.c:307 builtin/update-index.c:975 +#: builtin/add.c:309 builtin/update-index.c:1001 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" -#: builtin/add.c:309 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "varna när ett inbyggt arkiv läggs till" -#: builtin/add.c:324 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -5518,152 +8390,150 @@ msgstr "" "\n" "Se ”git help submodule” för ytterligare information." -#: builtin/add.c:352 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "lägger till inbäddat git-arkiv: %s" -#: builtin/add.c:370 +#: 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:378 +#: builtin/add.c:379 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:416 +#: builtin/add.c:419 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:423 +#: builtin/add.c:426 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:427 +#: builtin/add.c:430 #, 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:442 +#: builtin/add.c:445 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:443 +#: builtin/add.c:446 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280 -#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325 -#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241 -#: builtin/rm.c:270 builtin/submodule--helper.c:328 -msgid "index file corrupt" -msgstr "indexfilen trasig" - -#: builtin/am.c:414 +#: builtin/am.c:348 msgid "could not parse author script" msgstr "kunde inte tolka författarskript" -#: builtin/am.c:498 +#: builtin/am.c:432 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "\"%s\" togs bort av kroken applypatch-msg" -#: builtin/am.c:539 +#: builtin/am.c:474 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/am.c:576 +#: builtin/am.c:512 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/am.c:602 +#: builtin/am.c:538 msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:790 +#: builtin/am.c:726 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:855 +#: builtin/am.c:791 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:903 +#: builtin/am.c:839 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:908 builtin/am.c:920 +#: builtin/am.c:844 builtin/am.c:856 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:915 +#: builtin/am.c:851 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:1008 +#: builtin/am.c:944 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:1013 builtin/clone.c:407 +#: builtin/am.c:949 builtin/clone.c:412 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:1018 +#: builtin/am.c:954 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1148 builtin/commit.c:351 +#: builtin/am.c:1084 builtin/commit.c:371 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/am.c:1162 +#: builtin/am.c:1098 #, 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:1163 +#: builtin/am.c:1099 #, 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:1164 +#: builtin/am.c:1100 #, 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:1271 +#: builtin/am.c:1183 +msgid "Patch sent with format=flowed; space at the end of lines might be lost." +msgstr "" +"Patch sänd med format=flowed; blanksteg på slut av rader kan ha tappats." + +#: builtin/am.c:1211 msgid "Patch is empty." msgstr "Patchen är tom." -#: builtin/am.c:1337 +#: builtin/am.c:1277 #, c-format msgid "invalid ident line: %.*s" msgstr "ogiltig ident-rad: %.*s" -#: builtin/am.c:1359 +#: builtin/am.c:1299 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: builtin/am.c:1554 +#: builtin/am.c:1495 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:1556 +#: builtin/am.c:1497 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1575 +#: builtin/am.c:1516 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -5671,30 +8541,30 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1581 +#: builtin/am.c:1522 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1606 +#: builtin/am.c:1548 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1637 +#: builtin/am.c:1580 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1683 builtin/am.c:1687 +#: builtin/am.c:1627 builtin/am.c:1631 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1703 +#: builtin/am.c:1647 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:1708 +#: builtin/am.c:1652 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -5702,45 +8572,45 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1718 +#: builtin/am.c:1662 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:1768 +#: builtin/am.c:1712 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1808 builtin/am.c:1879 +#: builtin/am.c:1752 builtin/am.c:1820 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1824 +#: builtin/am.c:1769 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1832 +#: builtin/am.c:1775 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1838 +#: builtin/am.c:1779 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" "Använd \"git am --show-current-patch\" för att se patchen som misslyckades" -#: builtin/am.c:1882 +#: builtin/am.c:1823 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -"Inga ändringar - glömde du använda \"git add\"?\n" +"Inga ändringar - glömde du att använda \"git add\"?\n" "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:1889 +#: builtin/am.c:1830 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -5752,17 +8622,17 @@ msgstr "" "lösta.\n" "Du kan köra ”git rm” för att godta ”borttagen av dem” för den." -#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324 -#: builtin/reset.c:332 +#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329 +#: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet ”%s”." -#: builtin/am.c:2048 +#: builtin/am.c:1989 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2083 +#: builtin/am.c:2033 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -5770,142 +8640,143 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2174 +#: builtin/am.c:2130 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt värde för --patch-format: %s" -#: builtin/am.c:2210 +#: builtin/am.c:2166 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2211 +#: builtin/am.c:2167 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2217 +#: builtin/am.c:2173 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2219 +#: builtin/am.c:2175 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2221 +#: builtin/am.c:2177 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57 -#: builtin/repack.c:192 +#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:306 builtin/stash.c:805 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2224 +#: builtin/am.c:2180 msgid "add a Signed-off-by line to the commit message" msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet" -#: builtin/am.c:2227 +#: builtin/am.c:2183 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2229 +#: builtin/am.c:2185 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2231 +#: builtin/am.c:2187 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2233 +#: builtin/am.c:2189 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2235 +#: builtin/am.c:2191 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:2238 +#: builtin/am.c:2194 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:2241 +#: builtin/am.c:2197 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 -#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 -#: builtin/am.c:2270 +#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208 +#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220 +#: builtin/am.c:2226 msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665 -#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:208 -#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201 -#: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631 -#: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144 -#: parse-options.h:146 parse-options.h:258 +#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247 +#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412 +#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323 +#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:397 +#: parse-options.h:140 parse-options.h:161 parse-options.h:303 msgid "n" msgstr "n" -#: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38 -#: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39 +#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38 +#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39 msgid "format" msgstr "format" -#: builtin/am.c:2267 +#: builtin/am.c:2223 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2273 +#: builtin/am.c:2229 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2275 +#: builtin/am.c:2231 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2278 +#: builtin/am.c:2234 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2281 +#: builtin/am.c:2237 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2284 +#: builtin/am.c:2240 msgid "restore the original branch and abort the patching operation." msgstr "återställ originalgrenen och avbryt patchningen." -#: builtin/am.c:2287 +#: builtin/am.c:2243 msgid "abort the patching operation but keep HEAD where it is." msgstr "avbryt patchningen men behåll HEAD där det är." -#: builtin/am.c:2290 +#: builtin/am.c:2246 msgid "show the patch being applied." msgstr "visa patchen som tillämpas." -#: builtin/am.c:2294 +#: builtin/am.c:2250 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2296 +#: builtin/am.c:2252 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:239 -#: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399 +#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491 +#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489 +#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2299 +#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2302 +#: builtin/am.c:2258 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2320 +#: builtin/am.c:2276 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." @@ -5913,16 +8784,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:2327 +#: builtin/am.c:2283 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2342 +#: builtin/am.c:2298 #, 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:2366 +#: builtin/am.c:2322 #, c-format msgid "" "Stray %s directory found.\n" @@ -5931,7 +8802,7 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2372 +#: builtin/am.c:2328 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." @@ -5952,221 +8823,431 @@ msgstr "kunde inte omdirigera utdata" msgid "git archive: Remote with no URL" msgstr "git archive: Fjärr utan URL" -#: builtin/archive.c:58 +#: builtin/archive.c:61 msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive: förväntade ACK/NAK, fick flush-paket" -#: builtin/archive.c:61 +#: builtin/archive.c:64 #, c-format msgid "git archive: NACK %s" msgstr "git archive: NACK %s" -#: builtin/archive.c:64 +#: builtin/archive.c:65 msgid "git archive: protocol error" msgstr "git archive: protokollfel" -#: builtin/archive.c:68 +#: builtin/archive.c:69 msgid "git archive: expected a flush" msgstr "git archive: förväntade en tömning (flush)" -#: builtin/bisect--helper.c:12 +#: builtin/bisect--helper.c:22 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "git bisect--helper --next-all [--no-checkout]" -#: builtin/bisect--helper.c:13 +#: builtin/bisect--helper.c:23 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 +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --bisect-clean-state" msgstr "git bisect--helper --bisect-clean-state" -#: builtin/bisect--helper.c:46 +#: builtin/bisect--helper.c:25 +msgid "git bisect--helper --bisect-reset [<commit>]" +msgstr "git bisect--helper --bisect-reset [<incheckning>]" + +#: builtin/bisect--helper.c:26 +msgid "" +"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " +"<bad_term>" +msgstr "" +"git bisect--helper --bisect-write [--no-log] <tillstånd> <revision> <term-" +"för-rätt> <term-för-fel>" + +#: builtin/bisect--helper.c:27 +msgid "" +"git bisect--helper --bisect-check-and-set-terms <command> <good_term> " +"<bad_term>" +msgstr "" +"git bisect--helper --bisect-check-and-set-terms <kommadno> <term-för-rätt> " +"<term-för-fel>" + +#: builtin/bisect--helper.c:28 +msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" +msgstr "" +"git bisect--helper --bisect-next-check <term-för-rätt> <term-för-fel> <eterm>" + +#: builtin/bisect--helper.c:29 +msgid "" +"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" +"term-new]" +msgstr "" +"git-bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" +"term-new]" + +#: builtin/bisect--helper.c:30 +msgid "" +"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" +"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" +msgstr "" +"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" +"=<term>][--no-checkout] [<fel> [<rätt>...]] [--] [<sökvägar>...]" + +#: builtin/bisect--helper.c:86 #, c-format msgid "'%s' is not a valid term" msgstr "\"%s\" är inte en giltig term" -#: builtin/bisect--helper.c:50 +#: builtin/bisect--helper.c:90 #, 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 +#: builtin/bisect--helper.c:100 #, 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 +#: builtin/bisect--helper.c:111 msgid "please use two different terms" msgstr "termerna måste vara olika" -#: builtin/bisect--helper.c:78 +#: builtin/bisect--helper.c:118 msgid "could not open the file BISECT_TERMS" msgstr "kunde inte öppna filen BISECT_TERMS" -#: builtin/bisect--helper.c:120 +#: builtin/bisect--helper.c:155 +#, c-format +msgid "We are not bisecting.\n" +msgstr "Vi utför ingen bisect för tillfället.\n" + +#: builtin/bisect--helper.c:163 +#, c-format +msgid "'%s' is not a valid commit" +msgstr "\"%s\" är inte en giltig incheckning" + +#: builtin/bisect--helper.c:174 +#, c-format +msgid "" +"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." +msgstr "" +"Kunde inte checka ut original-HEAD \"%s\". Försök \"git bisect reset " +"<incheckning>\"." + +#: builtin/bisect--helper.c:215 +#, c-format +msgid "Bad bisect_write argument: %s" +msgstr "Felaktigt argument till bisect_write: %s" + +#: builtin/bisect--helper.c:220 +#, c-format +msgid "couldn't get the oid of the rev '%s'" +msgstr "kan inte läsa oid för referensen \"%s\"" + +#: builtin/bisect--helper.c:232 +#, c-format +msgid "couldn't open the file '%s'" +msgstr "kunde inte öppna filen \"%s\"" + +#: builtin/bisect--helper.c:258 +#, c-format +msgid "Invalid command: you're currently in a %s/%s bisect" +msgstr "Ogiltigt kommando: du utför just nu en \"bisect\" med %s/%s." + +#: builtin/bisect--helper.c:285 +#, c-format +msgid "" +"You need to give me at least one %s and %s revision.\n" +"You can use \"git bisect %s\" and \"git bisect %s\" for that." +msgstr "" +"Du måste ange åtminstone en %s och en %s version.\n" +"(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)" + +#: builtin/bisect--helper.c:289 +#, c-format +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one %s and %s revision.\n" +"You can use \"git bisect %s\" and \"git bisect %s\" for that." +msgstr "" +"Du måste starta med \"git bisect start\".\n" +"Du måste sedan ange åtminstone en %s och en %s version.\n" +"(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)" + +#: builtin/bisect--helper.c:321 +#, c-format +msgid "bisecting only with a %s commit" +msgstr "utför bisect med endast en %s incheckning" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#. +#: builtin/bisect--helper.c:329 +msgid "Are you sure [Y/n]? " +msgstr "Är du säker [Y=ja/N=nej]? " + +#: builtin/bisect--helper.c:376 +msgid "no terms defined" +msgstr "inga termer angivna" + +#: builtin/bisect--helper.c:379 +#, c-format +msgid "" +"Your current terms are %s for the old state\n" +"and %s for the new state.\n" +msgstr "" +"Aktuella termer är %s för det gamla tillståndet\n" +"och %s för det nya tillståndet.\n" + +#: builtin/bisect--helper.c:389 +#, c-format +msgid "" +"invalid argument %s for 'git bisect terms'.\n" +"Supported options are: --term-good|--term-old and --term-bad|--term-new." +msgstr "" +"ogiltigt argument %s för \"git bisect terms\".\n" +"Flaggor som stöds är: --term-good|--term-old och --term-bad|--term-new." + +#: builtin/bisect--helper.c:475 +#, c-format +msgid "unrecognized option: '%s'" +msgstr "okänd flagga: %s" + +#: builtin/bisect--helper.c:479 +#, c-format +msgid "'%s' does not appear to be a valid revision" +msgstr "\"%s\" verkar inte vara en giltig revision" + +#: builtin/bisect--helper.c:511 +msgid "bad HEAD - I need a HEAD" +msgstr "felaktigt HEAD - Jag behöver ett HEAD" + +#: builtin/bisect--helper.c:526 +#, c-format +msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." +msgstr "misslyckades checka ut ”%s”. Försök ”git bisect reset <giltig_gren>”." + +# cogito-relaterat +#: builtin/bisect--helper.c:547 +msgid "won't bisect on cg-seek'ed tree" +msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts" + +#: builtin/bisect--helper.c:550 +msgid "bad HEAD - strange symbolic ref" +msgstr "felaktigt HEAD - konstig symbolisk referens" + +#: builtin/bisect--helper.c:627 msgid "perform 'git bisect next'" msgstr "utför 'git bisect next'" -#: builtin/bisect--helper.c:122 +#: builtin/bisect--helper.c:629 msgid "write the terms to .git/BISECT_TERMS" msgstr "skriv termerna i .git/BISECT_TERMS" -#: builtin/bisect--helper.c:124 +#: builtin/bisect--helper.c:631 msgid "cleanup the bisection state" msgstr "städar upp bisect-tillstånd" -#: builtin/bisect--helper.c:126 +#: builtin/bisect--helper.c:633 msgid "check for expected revs" msgstr "kontrollera för förväntade versioner" -#: builtin/bisect--helper.c:128 +#: builtin/bisect--helper.c:635 +msgid "reset the bisection state" +msgstr "återställ bisect-tillstånd" + +#: builtin/bisect--helper.c:637 +msgid "write out the bisection state in BISECT_LOG" +msgstr "skriver bisect-tillståndet i BISECT_LOG" + +#: builtin/bisect--helper.c:639 +msgid "check and set terms in a bisection state" +msgstr "visa och ange termer för bisect-tillstånd" + +#: builtin/bisect--helper.c:641 +msgid "check whether bad or good terms exist" +msgstr "se efter om termer för rätt och fel finns" + +#: builtin/bisect--helper.c:643 +msgid "print out the bisect terms" +msgstr "skriv ut termer för bisect" + +#: builtin/bisect--helper.c:645 +msgid "start the bisect session" +msgstr "påbörja bisect-körningen" + +#: builtin/bisect--helper.c:647 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 +#: builtin/bisect--helper.c:649 +msgid "no log for BISECT_WRITE" +msgstr "ingen logg för BISECT_WRITE" + +#: builtin/bisect--helper.c:666 msgid "--write-terms requires two arguments" msgstr "--write-terms kräver två argument" -#: builtin/bisect--helper.c:147 +#: builtin/bisect--helper.c:670 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state tar inga argument" -#: builtin/blame.c:29 +#: builtin/bisect--helper.c:677 +msgid "--bisect-reset requires either no argument or a commit" +msgstr "--bisect-reset kräver antingen inget argument eller en incheckning" + +#: builtin/bisect--helper.c:681 +msgid "--bisect-write requires either 4 or 5 arguments" +msgstr "--bisect-write kräver antingen 4 eller 5 argument" + +#: builtin/bisect--helper.c:687 +msgid "--check-and-set-terms requires 3 arguments" +msgstr "--check-and-set-terms kräver tre argument" + +#: builtin/bisect--helper.c:693 +msgid "--bisect-next-check requires 2 or 3 arguments" +msgstr "--bisect-next-check kräver 2 eller 3 argument" + +#: builtin/bisect--helper.c:699 +msgid "--bisect-terms requires 0 or 1 argument" +msgstr "--bisect-terms kräver noll eller ett argument" + +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" -#: builtin/blame.c:34 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" -#: builtin/blame.c:404 +#: builtin/blame.c:407 #, c-format msgid "expecting a color: %s" msgstr "förväntade en färg: %s" -#: builtin/blame.c:411 +#: builtin/blame.c:414 msgid "must end with a color" msgstr "måste sluta med en färg" -#: builtin/blame.c:697 +#: builtin/blame.c:701 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "felaktig färg \"%s\" i color.blame.repeatedLines" -#: builtin/blame.c:715 +#: builtin/blame.c:719 msgid "invalid value for blame.coloring" msgstr "ogiltigt värde för blame.coloring" -#: builtin/blame.c:786 +#: builtin/blame.c:794 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:787 +#: builtin/blame.c:795 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" -#: builtin/blame.c:788 +#: builtin/blame.c:796 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:789 +#: builtin/blame.c:797 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:790 +#: builtin/blame.c:798 msgid "Force progress reporting" msgstr "Tvinga förloppsrapportering" -#: builtin/blame.c:791 +#: builtin/blame.c:799 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:792 +#: builtin/blame.c:800 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:793 +#: builtin/blame.c:801 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:794 +#: builtin/blame.c:802 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:795 +#: builtin/blame.c:803 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:796 +#: builtin/blame.c:804 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Använd samma utdataläge som git-annotate (Standard: av)" -#: builtin/blame.c:797 +#: builtin/blame.c:805 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:798 +#: builtin/blame.c:806 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:799 +#: builtin/blame.c:807 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:800 +#: builtin/blame.c:808 msgid "Show author email instead of name (Default: off)" msgstr "Visa författarens e-post istället för namn (Standard: av)" -#: builtin/blame.c:801 +#: builtin/blame.c:809 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:802 +#: builtin/blame.c:810 msgid "color redundant metadata from previous line differently" msgstr "färglägg redundant metadata från tidigare rader annorlunda" -#: builtin/blame.c:803 +#: builtin/blame.c:811 msgid "color lines by age" msgstr "färglägg rader efter ålder" -#: builtin/blame.c:810 +#: builtin/blame.c:818 msgid "Use an experimental heuristic to improve diffs" msgstr "Använd en experimentell algoritm för att förbättra diffar" -#: builtin/blame.c:812 +#: builtin/blame.c:820 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:813 +#: builtin/blame.c:821 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list" -#: builtin/blame.c:814 +#: builtin/blame.c:822 msgid "Use <file>'s contents as the final image" msgstr "Använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:815 builtin/blame.c:816 +#: builtin/blame.c:823 builtin/blame.c:824 msgid "score" msgstr "poäng" -#: builtin/blame.c:815 +#: builtin/blame.c:823 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:816 +#: builtin/blame.c:824 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:817 +#: builtin/blame.c:825 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:817 +#: builtin/blame.c:825 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med början på 1" -#: builtin/blame.c:866 +#: builtin/blame.c:876 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress kan inte användas med --incremental eller porslinsformat" @@ -6178,50 +9259,50 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:917 +#: builtin/blame.c:927 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" -#: builtin/blame.c:1003 +#: builtin/blame.c:1031 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "filen %s har bara %lu rad" msgstr[1] "filen %s har bara %lu rader" -#: builtin/blame.c:1049 +#: builtin/blame.c:1077 msgid "Blaming lines" msgstr "Klandra rader" -#: builtin/branch.c:27 +#: builtin/branch.c:29 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:28 +#: builtin/branch.c:30 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<flaggor>] [-l] [-f] <grennamn> [<startpunkt>]" -#: builtin/branch.c:29 +#: builtin/branch.c:31 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..." -#: builtin/branch.c:30 +#: builtin/branch.c:32 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>" -#: builtin/branch.c:31 +#: builtin/branch.c:33 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" msgstr "git branch [<flaggor>] (-c | -C) [<gammal_gren>] <ny_gren>" -#: builtin/branch.c:32 +#: builtin/branch.c:34 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<flaggor>] [-r | -a] [--points-at]" -#: builtin/branch.c:33 +#: builtin/branch.c:35 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<flaggor>] [-r | -a] [--format]" -#: builtin/branch.c:146 +#: builtin/branch.c:151 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -6230,7 +9311,7 @@ msgstr "" "tar bort grenen \"%s\" som har slagits ihop med\n" " \"%s\", men ännu inte slagits ihop med HEAD." -#: builtin/branch.c:150 +#: builtin/branch.c:155 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -6239,12 +9320,12 @@ msgstr "" "tar inte bort grenen \"%s\" som inte har slagits ihop med\n" " \"%s\", trots att den har slagits ihop med HEAD." -#: builtin/branch.c:164 +#: builtin/branch.c:169 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" -#: builtin/branch.c:168 +#: builtin/branch.c:173 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -6253,113 +9334,122 @@ msgstr "" "Grenen \"%s\" har inte slagits samman i sin helhet.\n" "Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"." -#: builtin/branch.c:181 +#: builtin/branch.c:186 msgid "Update of config-file failed" msgstr "Misslyckades uppdatera konfigurationsfil" -#: builtin/branch.c:212 +#: builtin/branch.c:217 msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -#: builtin/branch.c:218 +#: builtin/branch.c:223 msgid "Couldn't look up commit object for HEAD" msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" -#: builtin/branch.c:232 +#: builtin/branch.c:237 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\"" -#: builtin/branch.c:247 +#: builtin/branch.c:252 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "fjärrspårande grenen \"%s\" hittades inte." -#: builtin/branch.c:248 +#: builtin/branch.c:253 #, c-format msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." -#: builtin/branch.c:263 +#: builtin/branch.c:268 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\"" -#: builtin/branch.c:264 +#: builtin/branch.c:269 #, c-format msgid "Error deleting branch '%s'" msgstr "Fel vid borttagning av grenen \"%s\"" -#: builtin/branch.c:271 +#: builtin/branch.c:276 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Tog bort fjärrspårande grenen %s (var %s).\n" -#: builtin/branch.c:272 +#: builtin/branch.c:277 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:416 builtin/tag.c:58 +#: builtin/branch.c:421 builtin/tag.c:60 msgid "unable to parse format string" msgstr "kan inte tolka formatsträng" -#: builtin/branch.c:453 +#: builtin/branch.c:452 +msgid "could not resolve HEAD" +msgstr "kunde inte slå upp HEAD" + +#: builtin/branch.c:458 +#, c-format +msgid "HEAD (%s) points outside of refs/heads/" +msgstr "HEAD (%s) pekar utenför refs/heads/" + +#: builtin/branch.c:473 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Grenen %s ombaseras på %s" -#: builtin/branch.c:457 +#: builtin/branch.c:477 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" på %s" -#: builtin/branch.c:474 +#: builtin/branch.c:494 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:476 +#: builtin/branch.c:496 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:487 +#: builtin/branch.c:507 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:514 +#: builtin/branch.c:534 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:516 +#: builtin/branch.c:536 msgid "Branch copy failed" msgstr "Misslyckades kopiera gren" -#: builtin/branch.c:520 +#: builtin/branch.c:540 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Skapade kopia av felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:523 +#: builtin/branch.c:543 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:529 +#: builtin/branch.c:549 #, 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:538 +#: builtin/branch.c:558 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:540 +#: builtin/branch.c:560 msgid "Branch is copied, but update of config-file failed" msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:556 +#: builtin/branch.c:576 #, c-format msgid "" "Please edit the description for the branch\n" @@ -6370,223 +9460,217 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/branch.c:589 +#: builtin/branch.c:610 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:591 +#: builtin/branch.c:612 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:592 +#: builtin/branch.c:613 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:593 +#: builtin/branch.c:614 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:595 +#: builtin/branch.c:616 msgid "do not use" msgstr "använd ej" -#: builtin/branch.c:597 +#: builtin/branch.c:618 builtin/rebase.c:485 msgid "upstream" msgstr "uppströms" -#: builtin/branch.c:597 +#: builtin/branch.c:618 msgid "change the upstream info" msgstr "ändra uppströmsinformationen" -#: builtin/branch.c:598 +#: builtin/branch.c:619 msgid "Unset the upstream info" msgstr "Ta bort uppströmsinformationen" -#: builtin/branch.c:599 +#: builtin/branch.c:620 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:600 +#: builtin/branch.c:621 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:602 builtin/branch.c:604 +#: builtin/branch.c:623 builtin/branch.c:625 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:603 builtin/branch.c:605 +#: builtin/branch.c:624 builtin/branch.c:626 msgid "print only branches that don't contain the commit" msgstr "visa endast grenar som inte innehåller incheckningen" -#: builtin/branch.c:608 +#: builtin/branch.c:629 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:609 +#: builtin/branch.c:630 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:611 +#: builtin/branch.c:632 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:612 +#: builtin/branch.c:633 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:613 +#: builtin/branch.c:634 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:614 +#: builtin/branch.c:635 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:615 +#: builtin/branch.c:636 msgid "copy a branch and its reflog" msgstr "kopiera en gren och dess reflogg" -#: builtin/branch.c:616 +#: builtin/branch.c:637 msgid "copy a branch, even if target exists" msgstr "kopiera en gren, även om målet finns" -#: builtin/branch.c:617 +#: builtin/branch.c:638 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:618 +#: builtin/branch.c:639 +msgid "show current branch name" +msgstr "visa namn på aktuell gren" + +#: builtin/branch.c:640 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:620 +#: builtin/branch.c:642 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:621 +#: builtin/branch.c:643 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:622 +#: builtin/branch.c:644 msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:623 +#: builtin/branch.c:645 msgid "print only branches that are not merged" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:624 +#: builtin/branch.c:646 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:625 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 -#: builtin/tag.c:412 -msgid "key" -msgstr "nyckel" - -#: builtin/branch.c:626 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 -#: builtin/tag.c:413 -msgid "field name to sort on" -msgstr "fältnamn att sortera på" - -#: builtin/branch.c:628 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:415 +#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 +#: builtin/tag.c:427 msgid "object" msgstr "objekt" -#: builtin/branch.c:629 +#: builtin/branch.c:650 msgid "print only branches of the object" msgstr "visa endast grenar för objektet" -#: builtin/branch.c:631 builtin/for-each-ref.c:49 builtin/tag.c:422 +#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434 msgid "sorting and filtering are case insensitive" msgstr "sortering och filtrering skiljer gemener och VERSALER" -#: builtin/branch.c:632 builtin/for-each-ref.c:38 builtin/tag.c:420 +#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/branch.c:655 builtin/clone.c:737 +#: builtin/branch.c:676 builtin/clone.c:751 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:678 +#: builtin/branch.c:700 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:693 builtin/branch.c:745 builtin/branch.c:754 +#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:721 +#: builtin/branch.c:745 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:726 +#: builtin/branch.c:750 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:733 +#: builtin/branch.c:757 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu." -#: builtin/branch.c:736 +#: builtin/branch.c:760 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:751 +#: builtin/branch.c:775 msgid "too many branches for a copy operation" msgstr "för många grenar för kopiering" -#: builtin/branch.c:760 +#: builtin/branch.c:784 msgid "too many arguments for a rename operation" msgstr "för många flaggor för namnbyte" -#: builtin/branch.c:765 +#: builtin/branch.c:789 msgid "too many arguments to set new upstream" msgstr "för många flaggor för att byta uppström" -#: builtin/branch.c:769 +#: builtin/branch.c:793 #, 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:772 builtin/branch.c:794 builtin/branch.c:810 +#: builtin/branch.c:796 builtin/branch.c:819 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:776 +#: builtin/branch.c:800 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:788 +#: builtin/branch.c:813 msgid "too many arguments to unset upstream" msgstr "för många flaggor för att ta bort uppström" -#: builtin/branch.c:792 +#: builtin/branch.c:817 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:798 +#: builtin/branch.c:823 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:813 +#: builtin/branch.c:833 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:816 +#: builtin/branch.c:836 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -6607,7 +9691,7 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/cat-file.c:525 +#: builtin/cat-file.c:593 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -6615,7 +9699,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>" -#: builtin/cat-file.c:526 +#: builtin/cat-file.c:594 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -6623,124 +9707,133 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:563 +#: builtin/cat-file.c:615 +msgid "only one batch option may be specified" +msgstr "endast en buntflagga kan anges" + +#: builtin/cat-file.c:633 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<typ> kan vara en av: blob, tree, commit, tag" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:634 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:565 +#: builtin/cat-file.c:635 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:567 +#: builtin/cat-file.c:637 msgid "exit with zero when there's no error" msgstr "avsluta med noll när det inte uppstått något fel" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:638 msgid "pretty-print object's content" msgstr "visa objektets innehåll snyggt" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:640 msgid "for blob objects, run textconv on object's content" msgstr "för blob-objekt, kör filter på objektets innehåll" -#: builtin/cat-file.c:572 +#: builtin/cat-file.c:642 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:573 git-submodule.sh:894 +#: builtin/cat-file.c:643 git-submodule.sh:936 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:574 +#: builtin/cat-file.c:644 msgid "use a specific path for --textconv/--filters" msgstr "använd specifik sökväg för --textconv/--filters" -#: builtin/cat-file.c:576 +#: builtin/cat-file.c:646 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt" -#: builtin/cat-file.c:577 +#: builtin/cat-file.c:647 msgid "buffer --batch output" msgstr "buffra utdata från --batch" -#: builtin/cat-file.c:579 +#: builtin/cat-file.c:649 msgid "show info and content of objects fed from the standard input" msgstr "visa information och innehåll för objekt som listas på standard in" -#: builtin/cat-file.c:582 +#: builtin/cat-file.c:653 msgid "show info about objects fed from the standard input" msgstr "visa information för objekt som listas på standard in" -#: builtin/cat-file.c:585 +#: builtin/cat-file.c:657 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "följ symboliska länkar i trädet (använd med --batch eller --batch-check)" -#: builtin/cat-file.c:587 +#: builtin/cat-file.c:659 msgid "show all objects with --batch or --batch-check" msgstr "visa alla objekt med --batch eller --batch-check" -#: builtin/check-attr.c:12 +#: builtin/cat-file.c:661 +msgid "do not order --batch-all-objects output" +msgstr "ordna inte --batch-all-objects output" + +#: builtin/check-attr.c:13 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <attr>...] [--] <sökväg>..." -#: builtin/check-attr.c:13 +#: builtin/check-attr.c:14 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]" -#: builtin/check-attr.c:20 +#: builtin/check-attr.c:21 msgid "report all attributes set on file" msgstr "visa alla attribut som satts på filen" -#: builtin/check-attr.c:21 +#: builtin/check-attr.c:22 msgid "use .gitattributes only from the index" msgstr "använd .gitattributes endast från indexet" -#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100 +#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102 msgid "read file names from stdin" msgstr "läs filnamn från standard in" -#: builtin/check-attr.c:24 builtin/check-ignore.c:26 +#: builtin/check-attr.c:25 builtin/check-ignore.c:27 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:1113 builtin/gc.c:500 +#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538 +#: builtin/worktree.c:499 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" -#: builtin/check-ignore.c:28 +#: builtin/check-ignore.c:29 msgid "show non-matching input paths" msgstr "visa indatasökvägar som inte träffas" -#: builtin/check-ignore.c:30 +#: builtin/check-ignore.c:31 msgid "ignore index when checking" msgstr "ignorera index vid kontroll" -#: builtin/check-ignore.c:159 +#: builtin/check-ignore.c:160 msgid "cannot specify pathnames with --stdin" msgstr "kan inte ange sökvägsnamn med --stdin" -#: builtin/check-ignore.c:162 +#: builtin/check-ignore.c:163 msgid "-z only makes sense with --stdin" msgstr "-z kan endast användas tillsammans med --stdin" -#: builtin/check-ignore.c:164 +#: builtin/check-ignore.c:165 msgid "no path specified" msgstr "ingen sökväg angavs" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:169 msgid "--quiet is only valid with a single pathname" msgstr "--quiet kan endast användas med ett enkelt sökvägsnamn" -#: builtin/check-ignore.c:170 +#: builtin/check-ignore.c:171 msgid "cannot have both --quiet and --verbose" msgstr "kan inte använda både --quiet och --verbose" -#: builtin/check-ignore.c:173 +#: builtin/check-ignore.c:174 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching är endast giltig med --verbose" @@ -6761,164 +9854,199 @@ msgstr "kunde inte tolka kontakt: %s" msgid "no contacts specified" msgstr "inga kontakter angavs" -#: builtin/checkout-index.c:128 +#: builtin/checkout-index.c:131 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<flaggor>] [--] [<fil>...]" -#: builtin/checkout-index.c:143 +#: builtin/checkout-index.c:148 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:159 +#: builtin/checkout-index.c:164 msgid "check out all files in the index" msgstr "checka ut alla filer i indexet" -#: builtin/checkout-index.c:160 +#: builtin/checkout-index.c:165 msgid "force overwrite of existing files" msgstr "tvinga överskrivning av befintliga filer" -#: builtin/checkout-index.c:162 +#: builtin/checkout-index.c:167 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:164 +#: builtin/checkout-index.c:169 msgid "don't checkout new files" msgstr "checka inte ut nya filer" -#: builtin/checkout-index.c:166 +#: builtin/checkout-index.c:171 msgid "update stat information in the index file" msgstr "uppdatera stat-information i indexfilen" -#: builtin/checkout-index.c:170 +#: builtin/checkout-index.c:175 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:172 +#: builtin/checkout-index.c:177 msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" -#: builtin/checkout-index.c:173 builtin/column.c:31 -#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1219 -#: builtin/submodule--helper.c:1227 builtin/submodule--helper.c:1591 -#: builtin/worktree.c:610 +#: builtin/checkout-index.c:178 builtin/column.c:31 +#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375 +#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856 +#: builtin/worktree.c:672 msgid "string" msgstr "sträng" -#: builtin/checkout-index.c:174 +#: builtin/checkout-index.c:179 msgid "when creating files, prepend <string>" msgstr "när filer skapas, lägg till <sträng> först" -#: builtin/checkout-index.c:176 +#: builtin/checkout-index.c:181 msgid "copy out the files from named stage" msgstr "kopiera ut filer från namngiven etapp" -#: builtin/checkout.c:27 +#: builtin/checkout.c:32 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<flaggor>] <gren>" -#: builtin/checkout.c:28 +#: builtin/checkout.c:33 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..." -#: builtin/checkout.c:136 builtin/checkout.c:169 +#: builtin/checkout.c:151 builtin/checkout.c:190 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:138 builtin/checkout.c:171 +#: builtin/checkout.c:153 builtin/checkout.c:192 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:154 +#: builtin/checkout.c:169 #, 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:198 +#: builtin/checkout.c:219 #, 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:215 +#: builtin/checkout.c:237 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:231 +#: builtin/checkout.c:253 #, 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:331 builtin/checkout.c:334 builtin/checkout.c:337 +#: builtin/checkout.c:340 #, 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:343 builtin/checkout.c:346 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:271 +#: builtin/checkout.c:349 #, 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:340 builtin/checkout.c:347 +#: builtin/checkout.c:396 builtin/checkout.c:403 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:506 +#: builtin/checkout.c:442 +#, c-format +msgid "Recreated %d merge conflict" +msgid_plural "Recreated %d merge conflicts" +msgstr[0] "Återskapade %d sammanslagningskonflikt" +msgstr[1] "Återskapade %d sammanslagningskonflikter" + +#: builtin/checkout.c:447 +#, c-format +msgid "Updated %d path from %s" +msgid_plural "Updated %d paths from %s" +msgstr[0] "Uppdaterade %d sökväg från %s" +msgstr[1] "Uppdaterade %d sökvägar från %s" + +#: builtin/checkout.c:454 +#, c-format +msgid "Updated %d path from the index" +msgid_plural "Updated %d paths from the index" +msgstr[0] "Uppdaterade %d sökväg från indexet" +msgstr[1] "Uppdaterade %d sökvägar från indexet" + +#: builtin/checkout.c:695 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:643 +#: builtin/checkout.c:744 +#, c-format +msgid "" +"cannot continue with staged changes in the following files:\n" +"%s" +msgstr "" +"kan inte fortsätta med köade ändringar i följande filer:\n" +"%s" + +#: builtin/checkout.c:751 +#, c-format +msgid "staged changes in the following files may be lost: %s" +msgstr "köade ändringar i följande filer kan gå förlorade: %s" + +#: builtin/checkout.c:848 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:684 +#: builtin/checkout.c:890 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:688 builtin/clone.c:691 +#: builtin/checkout.c:894 builtin/clone.c:704 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:692 +#: builtin/checkout.c:898 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:695 +#: builtin/checkout.c:901 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:699 +#: builtin/checkout.c:905 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:701 builtin/checkout.c:1046 +#: builtin/checkout.c:907 builtin/checkout.c:1283 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:703 +#: builtin/checkout.c:909 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:754 +#: builtin/checkout.c:960 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:760 +#: builtin/checkout.c:966 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6941,7 +10069,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:779 +#: builtin/checkout.c:985 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6968,161 +10096,178 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:811 +#: builtin/checkout.c:1017 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:815 +#: builtin/checkout.c:1021 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:843 builtin/checkout.c:1041 +#: builtin/checkout.c:1052 builtin/checkout.c:1278 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:947 +#: builtin/checkout.c:1173 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:987 builtin/worktree.c:240 builtin/worktree.c:389 +#: builtin/checkout.c:1209 +#, c-format +msgid "" +"'%s' could be both a local file and a tracking branch.\n" +"Please use -- (and optionally --no-guess) to disambiguate" +msgstr "" +"\"%s\" kan vara både en lokal fil och en spårande gren.\n" +"Använd -- (och möjligen --no-guess) för att göra otvetydig" + +#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1016 +#: builtin/checkout.c:1251 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1055 +#: builtin/checkout.c:1292 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1058 builtin/checkout.c:1062 +#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1066 builtin/checkout.c:1069 builtin/checkout.c:1074 -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315 +#: builtin/checkout.c:1318 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1082 +#: builtin/checkout.c:1323 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1114 builtin/checkout.c:1116 builtin/clone.c:118 -#: builtin/remote.c:167 builtin/remote.c:169 builtin/worktree.c:433 -#: builtin/worktree.c:435 +#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:121 +#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492 +#: builtin/worktree.c:494 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1115 +#: builtin/checkout.c:1357 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1359 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1118 +#: builtin/checkout.c:1360 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1119 builtin/worktree.c:437 +#: builtin/checkout.c:1361 builtin/worktree.c:496 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1120 +#: builtin/checkout.c:1362 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1364 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1364 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1123 +#: builtin/checkout.c:1366 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1125 +#: builtin/checkout.c:1369 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1127 +#: builtin/checkout.c:1371 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1129 +#: builtin/checkout.c:1373 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:1131 builtin/merge.c:241 +#: builtin/checkout.c:1375 builtin/merge.c:284 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1133 builtin/log.c:1499 parse-options.h:264 +#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:309 msgid "style" msgstr "stil" -#: builtin/checkout.c:1134 +#: builtin/checkout.c:1378 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1137 +#: builtin/checkout.c:1381 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1139 -msgid "second guess 'git checkout <no-such-branch>'" -msgstr "förutspå \"git checkout <gren-saknas>\"" +#: builtin/checkout.c:1383 +msgid "do not second guess 'git checkout <no-such-branch>'" +msgstr "försök inte vara förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1385 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:1145 builtin/clone.c:85 builtin/fetch.c:149 -#: builtin/merge.c:238 builtin/pull.c:128 builtin/push.c:572 +#: builtin/checkout.c:1389 builtin/clone.c:88 builtin/fetch.c:141 +#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/checkout.c:1175 +#: builtin/checkout.c:1390 +msgid "use overlay mode (default)" +msgstr "använd överläggsläge (standard)" + +#: builtin/checkout.c:1422 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1192 +#: builtin/checkout.c:1425 +msgid "-p and --overlay are mutually exclusive" +msgstr "-p och --overlay är ömsesidigt uteslutande" + +#: builtin/checkout.c:1442 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1197 -msgid "Missing branch name; try -b" -msgstr "Grennamn saknas; försök med -b" +#: builtin/checkout.c:1447 +msgid "missing branch name; try -b" +msgstr "grennamn saknas; försök med -b" -#: builtin/checkout.c:1233 +#: builtin/checkout.c:1484 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1240 +#: builtin/checkout.c:1491 #, 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:1244 +#: builtin/checkout.c:1495 #, 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:1248 +#: builtin/checkout.c:1499 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -7130,39 +10275,68 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/clean.c:26 +#: builtin/checkout.c:1519 +#, c-format +msgid "" +"'%s' matched more than one remote tracking branch.\n" +"We found %d remotes with a reference that matched. So we fell back\n" +"on trying to resolve the argument as a path, but failed there too!\n" +"\n" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" +"\"%s\" motsvarar mer än en spårad fjärrgren.\n" +"Vi hittade %d fjärrar med en motsvarande referens. Så vi förösökte\n" +"istället tolka argumentet som en sökväg, men misslyckades också där!\n" +"\n" +"Om du menade checka ut en spårad fjärrgren på t.ex \"origin\", kan du\n" +"göra det genom att ange hela namnet med flaggan --track:\n" +"\n" +" git checkout --track origin/<namn>\n" +"\n" +"Om du alltid vill att utcheckningar med tvetydiga <namn> skall\n" +"föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n" +"checkout.defaultRemote=origin i din konfiguration." + +#: builtin/clean.c:28 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <mönster>] [-x | -X] [--] " "<sökvägar>..." -#: builtin/clean.c:30 +#: builtin/clean.c:32 #, c-format msgid "Removing %s\n" msgstr "Tar bort %s\n" -#: builtin/clean.c:31 +#: builtin/clean.c:33 #, c-format msgid "Would remove %s\n" msgstr "Skulle ta bort %s\n" -#: builtin/clean.c:32 +#: builtin/clean.c:34 #, c-format msgid "Skipping repository %s\n" msgstr "Hoppar över arkivet %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:35 #, c-format msgid "Would skip repository %s\n" msgstr "Skulle hoppa över arkivet %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:36 #, c-format msgid "failed to remove %s" msgstr "misslyckades ta bort %s" -#: builtin/clean.c:302 git-add--interactive.perl:579 +#: builtin/clean.c:299 git-add--interactive.perl:579 #, c-format msgid "" "Prompt help:\n" @@ -7175,7 +10349,7 @@ msgstr "" "foo - markera post baserad på unikt prefix\n" " - (tomt) markera ingenting\n" -#: builtin/clean.c:306 git-add--interactive.perl:588 +#: builtin/clean.c:303 git-add--interactive.perl:588 #, c-format msgid "" "Prompt help:\n" @@ -7196,38 +10370,38 @@ msgstr "" "* - välj alla poster\n" " - (tomt) avsluta markering\n" -#: builtin/clean.c:522 git-add--interactive.perl:554 +#: builtin/clean.c:519 git-add--interactive.perl:554 #: git-add--interactive.perl:559 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Vadå (%s)?\n" -#: builtin/clean.c:664 +#: builtin/clean.c:661 #, c-format msgid "Input ignore patterns>> " msgstr "Ange ignoreringsmönster>>" -#: builtin/clean.c:701 +#: builtin/clean.c:698 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "VARNING: Hittar inte poster som motsvarar: %s" -#: builtin/clean.c:722 +#: builtin/clean.c:719 msgid "Select items to delete" msgstr "Välj poster att ta bort" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:763 +#: builtin/clean.c:760 #, c-format msgid "Remove %s [y/N]? " msgstr "Ta bort %s [Y=ja / N=nej]? " -#: builtin/clean.c:788 git-add--interactive.perl:1717 +#: builtin/clean.c:785 git-add--interactive.perl:1717 #, c-format msgid "Bye.\n" msgstr "Hej då.\n" -#: builtin/clean.c:796 +#: builtin/clean.c:793 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -7245,64 +10419,64 @@ msgstr "" "help - denna skärm\n" "? - hjälp för kommandoval" -#: builtin/clean.c:823 git-add--interactive.perl:1793 +#: builtin/clean.c:820 git-add--interactive.perl:1793 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: builtin/clean.c:824 git-add--interactive.perl:1790 +#: builtin/clean.c:821 git-add--interactive.perl:1790 msgid "What now" msgstr "Vad nu" -#: builtin/clean.c:832 +#: builtin/clean.c:829 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:848 +#: builtin/clean.c:845 msgid "No more files to clean, exiting." msgstr "Inga fler filer att städa, avslutar." -#: builtin/clean.c:910 +#: builtin/clean.c:907 msgid "do not print names of files removed" msgstr "skriv inte ut namn på borttagna filer" -#: builtin/clean.c:912 +#: builtin/clean.c:909 msgid "force" msgstr "tvinga" -#: builtin/clean.c:913 +#: builtin/clean.c:910 msgid "interactive cleaning" msgstr "städa interaktivt" -#: builtin/clean.c:915 +#: builtin/clean.c:912 msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535 -#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159 -#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 -#: builtin/show-ref.c:176 +#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548 +#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173 +#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 +#: builtin/show-ref.c:178 msgid "pattern" msgstr "mönster" -#: builtin/clean.c:917 +#: builtin/clean.c:914 msgid "add <pattern> to ignore rules" msgstr "lägg till <mönster> till ignoreringsregler" -#: builtin/clean.c:918 +#: builtin/clean.c:915 msgid "remove ignored files, too" msgstr "ta även bort ignorerade filer" -#: builtin/clean.c:920 +#: builtin/clean.c:917 msgid "remove only ignored files" msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:938 +#: builtin/clean.c:935 msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" -#: builtin/clean.c:942 +#: builtin/clean.c:939 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -7310,7 +10484,7 @@ msgstr "" "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar " "städa" -#: builtin/clean.c:945 +#: builtin/clean.c:942 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -7318,146 +10492,158 @@ msgstr "" "clean.requireForce har standardvärdet true och varken -i, -n eller -f " "angavs; vägrar städa" -#: builtin/clone.c:42 +#: builtin/clone.c:44 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:87 +#: builtin/clone.c:90 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:88 builtin/clone.c:90 builtin/init-db.c:479 +#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:92 +#: builtin/clone.c:95 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:94 +#: builtin/clone.c:97 msgid "to clone from a local repository" msgstr "för att klona från ett lokalt arkiv" -#: builtin/clone.c:96 +#: builtin/clone.c:99 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hårda länkar, kopiera alltid" -#: builtin/clone.c:98 +#: builtin/clone.c:101 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:100 builtin/clone.c:104 +#: builtin/clone.c:103 builtin/clone.c:107 msgid "pathspec" msgstr "sökvägsangivelse" -#: builtin/clone.c:100 builtin/clone.c:104 +#: builtin/clone.c:103 builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:107 +#: builtin/clone.c:110 msgid "number of submodules cloned in parallel" msgstr "antal undermoduler som klonas parallellt" -#: builtin/clone.c:108 builtin/init-db.c:476 +#: builtin/clone.c:111 builtin/init-db.c:486 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:109 builtin/init-db.c:477 +#: builtin/clone.c:112 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1223 -#: builtin/submodule--helper.c:1594 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1379 +#: builtin/submodule--helper.c:1859 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:115 builtin/submodule--helper.c:1225 -#: builtin/submodule--helper.c:1596 +#: builtin/clone.c:118 builtin/submodule--helper.c:1381 +#: builtin/submodule--helper.c:1861 msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" -#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:44 -#: builtin/pack-objects.c:3166 builtin/repack.c:213 +#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3306 builtin/repack.c:329 msgid "name" msgstr "namn" -#: builtin/clone.c:117 +#: builtin/clone.c:120 msgid "use <name> instead of 'origin' to track upstream" msgstr "använd <namn> istället för \"origin\" för att spåra uppströms" -#: builtin/clone.c:119 +#: builtin/clone.c:122 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checka ut <gren> istället för fjärrens HEAD" -#: builtin/clone.c:121 +#: builtin/clone.c:124 msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:122 builtin/fetch.c:150 builtin/grep.c:813 -#: builtin/pull.c:216 +#: builtin/clone.c:125 builtin/fetch.c:142 builtin/grep.c:836 +#: builtin/pull.c:225 msgid "depth" msgstr "djup" -#: builtin/clone.c:123 +#: builtin/clone.c:126 msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:124 builtin/fetch.c:152 builtin/pack-objects.c:3157 -#: parse-options.h:154 +#: builtin/clone.c:127 builtin/fetch.c:144 builtin/pack-objects.c:3295 msgid "time" msgstr "tid" -#: builtin/clone.c:125 +#: builtin/clone.c:128 msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon från en angiven tidpunkt" -#: builtin/clone.c:126 builtin/fetch.c:154 +#: builtin/clone.c:129 builtin/fetch.c:146 builtin/fetch.c:169 +#: builtin/rebase.c:1389 msgid "revision" msgstr "revision" -#: builtin/clone.c:127 builtin/fetch.c:155 +#: builtin/clone.c:130 builtin/fetch.c:147 msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" -#: builtin/clone.c:129 +#: builtin/clone.c:132 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:131 +#: builtin/clone.c:134 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "klona inga taggar och gör att senare hämtningar inte följer dem" -#: builtin/clone.c:133 +#: builtin/clone.c:136 msgid "any cloned submodules will be shallow" msgstr "klonade undermoduler kommer vara grunda" -#: builtin/clone.c:134 builtin/init-db.c:485 +#: builtin/clone.c:137 builtin/init-db.c:495 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:135 builtin/init-db.c:486 +#: builtin/clone.c:138 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" -#: builtin/clone.c:136 +#: builtin/clone.c:139 msgid "key=value" msgstr "nyckel=värde" -#: builtin/clone.c:137 +#: builtin/clone.c:140 msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:138 builtin/fetch.c:173 builtin/pull.c:229 -#: builtin/push.c:583 +#: builtin/clone.c:142 builtin/fetch.c:164 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:172 +msgid "server-specific" +msgstr "serverspecifik" + +#: builtin/clone.c:142 builtin/fetch.c:164 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:173 +msgid "option to transmit" +msgstr "" +"inget att checka in\n" +"flagga att sända" + +#: builtin/clone.c:143 builtin/fetch.c:165 builtin/pull.c:238 +#: builtin/push.c:586 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:140 builtin/fetch.c:175 builtin/pull.c:232 -#: builtin/push.c:585 +#: builtin/clone.c:145 builtin/fetch.c:167 builtin/pull.c:241 +#: builtin/push.c:588 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" -#: builtin/clone.c:278 +#: builtin/clone.c:283 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -7465,42 +10651,47 @@ msgstr "" "Kunde inte gissa katalognamn.\n" "Ange en katalog på kommandoraden" -#: builtin/clone.c:331 +#: builtin/clone.c:336 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n" -#: builtin/clone.c:403 +#: builtin/clone.c:408 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: builtin/clone.c:411 +#: builtin/clone.c:416 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:425 +#: builtin/clone.c:430 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" #: builtin/clone.c:447 #, c-format +msgid "failed to unlink '%s'" +msgstr "misslyckades ta bort länken \"%s\"" + +#: builtin/clone.c:452 +#, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:451 +#: builtin/clone.c:456 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:477 +#: builtin/clone.c:482 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:491 +#: builtin/clone.c:496 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -7510,137 +10701,133 @@ 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:568 +#: builtin/clone.c:573 #, 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:663 -msgid "remote did not send all necessary objects" -msgstr "fjärren sände inte alla nödvändiga objekt" - -#: builtin/clone.c:679 +#: builtin/clone.c:692 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:728 +#: builtin/clone.c:742 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n" -#: builtin/clone.c:758 +#: builtin/clone.c:773 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:803 +#: builtin/clone.c:818 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:866 +#: builtin/clone.c:881 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:868 +#: builtin/clone.c:883 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:907 builtin/receive-pack.c:1947 +#: builtin/clone.c:923 builtin/receive-pack.c:1952 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:911 +#: builtin/clone.c:927 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:924 +#: builtin/clone.c:940 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:927 +#: builtin/clone.c:943 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:940 +#: builtin/clone.c:956 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:946 builtin/fetch.c:1460 +#: builtin/clone.c:962 builtin/fetch.c:1610 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:956 +#: builtin/clone.c:972 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." -#: builtin/clone.c:966 +#: builtin/clone.c:982 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:981 builtin/clone.c:1002 builtin/difftool.c:270 -#: builtin/worktree.c:246 builtin/worktree.c:276 +#: builtin/clone.c:997 builtin/clone.c:1018 builtin/difftool.c:270 +#: builtin/worktree.c:296 builtin/worktree.c:328 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:986 +#: builtin/clone.c:1002 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:1006 +#: builtin/clone.c:1022 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:1008 +#: builtin/clone.c:1024 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:1032 +#: builtin/clone.c:1048 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" "clone --recursive är inte kompatibel med --reference och --reference-if-able" -#: builtin/clone.c:1093 +#: builtin/clone.c:1109 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1095 +#: builtin/clone.c:1111 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1097 +#: builtin/clone.c:1113 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1099 +#: builtin/clone.c:1115 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1102 +#: builtin/clone.c:1118 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1107 +#: builtin/clone.c:1123 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1169 builtin/clone.c:1177 +#: builtin/clone.c:1200 builtin/clone.c:1208 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1180 +#: builtin/clone.c:1211 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -7676,15 +10863,83 @@ msgstr "Spaltfyllnad mellan spalter" msgid "--command must be the first argument" msgstr "--command måste vara första argument" -#: builtin/commit.c:37 +#: builtin/commit-tree.c:18 +msgid "" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " +"<file>)...] <tree>" +msgstr "" +"git commit-tree [(-p <föräldrer>)...] [-S[<nyckelid>]] [(-m " +"<meddelande>)...] [(-F <fil>)...] <träd>" + +#: builtin/commit-tree.c:31 +#, c-format +msgid "duplicate parent %s ignored" +msgstr "duplicerad förälder %s ignorerades" + +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520 +#, c-format +msgid "not a valid object name %s" +msgstr "objektnamnet är inte giltigt: %s" + +#: builtin/commit-tree.c:93 +#, c-format +msgid "git commit-tree: failed to open '%s'" +msgstr "git commit-tree: misslyckades öppna \"%s\"" + +#: builtin/commit-tree.c:96 +#, c-format +msgid "git commit-tree: failed to read '%s'" +msgstr "git commit-tree: misslyckades läsa \"%s\"" + +#: builtin/commit-tree.c:98 +#, c-format +msgid "git commit-tree: failed to close '%s'" +msgstr "git commit-tree: misslyckades stänga \"%s\"" + +#: builtin/commit-tree.c:111 +msgid "parent" +msgstr "förälder" + +#: builtin/commit-tree.c:112 +msgid "id of a parent commit object" +msgstr "id på ett förälderincheckningsobjekt" + +#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473 +#: builtin/tag.c:406 +msgid "message" +msgstr "meddelande" + +#: builtin/commit-tree.c:115 builtin/commit.c:1480 +msgid "commit message" +msgstr "incheckningsmeddelande" + +#: builtin/commit-tree.c:118 +msgid "read commit log message from file" +msgstr "läs incheckningsloggmeddelande från fil" + +#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283 +#: builtin/pull.c:193 builtin/revert.c:117 +msgid "GPG sign commit" +msgstr "GPG-signera incheckning" + +#: builtin/commit-tree.c:133 +msgid "must give exactly one tree" +msgstr "måste ange exakt ett träd" + +#: builtin/commit-tree.c:140 +msgid "git commit-tree: failed to read" +msgstr "git commit-tree: misslyckades läsa" + +#: builtin/commit.c:41 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<flaggor>] [--] <sökväg>..." -#: builtin/commit.c:42 +#: builtin/commit.c:46 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<flaggor>] [--] <sökväg>..." -#: builtin/commit.c:47 +#: builtin/commit.c:51 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -7694,7 +10949,7 @@ msgstr "" "blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n" "så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n" -#: builtin/commit.c:52 +#: builtin/commit.c:56 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -7708,11 +10963,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:59 +#: builtin/commit.c:63 msgid "Otherwise, please use 'git reset'\n" msgstr "Använd annars \"git reset\"\n" -#: builtin/commit.c:62 +#: builtin/commit.c:66 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -7728,61 +10983,61 @@ msgstr "" "\"git cherry-pick --continue\" kommer därefter att återuppta\n" "cherry-pick för återstående incheckningar.\n" -#: builtin/commit.c:293 +#: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:334 +#: builtin/commit.c:353 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:340 +#: builtin/commit.c:359 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:353 +#: builtin/commit.c:373 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporärt index" -#: builtin/commit.c:355 +#: builtin/commit.c:375 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cacheträdet" -#: builtin/commit.c:380 builtin/commit.c:403 builtin/commit.c:449 +#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:432 +#: builtin/commit.c:452 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:434 +#: builtin/commit.c:454 msgid "cannot do a partial commit during a cherry-pick." msgstr "kan inte utföra en delvis incheckning under en cherry-pick." -#: builtin/commit.c:442 +#: builtin/commit.c:462 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:461 +#: builtin/commit.c:481 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:558 +#: builtin/commit.c:579 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar författarhuvud" -#: builtin/commit.c:560 +#: builtin/commit.c:581 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:579 +#: builtin/commit.c:600 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:631 +#: builtin/commit.c:653 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -7790,38 +11045,38 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:668 builtin/commit.c:701 builtin/commit.c:1029 +#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:680 builtin/shortlog.c:316 +#: builtin/commit.c:703 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:682 +#: builtin/commit.c:705 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:686 +#: builtin/commit.c:709 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:715 builtin/commit.c:723 +#: builtin/commit.c:740 builtin/commit.c:756 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:720 +#: builtin/commit.c:747 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:774 +#: builtin/commit.c:807 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:792 +#: builtin/commit.c:826 #, c-format msgid "" "\n" @@ -7836,7 +11091,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:797 +#: builtin/commit.c:831 #, c-format msgid "" "\n" @@ -7851,7 +11106,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:810 +#: builtin/commit.c:844 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7861,7 +11116,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:818 +#: builtin/commit.c:852 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7872,147 +11127,144 @@ msgstr "" "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:835 +#: builtin/commit.c:869 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:843 +#: builtin/commit.c:877 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:850 +#: builtin/commit.c:884 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:867 +#: builtin/commit.c:902 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:933 +#: builtin/commit.c:969 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:947 builtin/tag.c:257 +#: builtin/commit.c:983 builtin/tag.c:269 #, 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:991 +#: builtin/commit.c:1027 #, 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:1005 +#: builtin/commit.c:1041 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Ogiltigt ignorerat läge \"%s\"" -#: builtin/commit.c:1019 builtin/commit.c:1269 +#: builtin/commit.c:1059 builtin/commit.c:1284 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1057 +#: builtin/commit.c:1097 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1090 +#: builtin/commit.c:1130 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:1099 +#: builtin/commit.c:1139 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1102 +#: builtin/commit.c:1142 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:1104 +#: builtin/commit.c:1144 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:1107 +#: builtin/commit.c:1147 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1117 +#: builtin/commit.c:1157 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:1119 +#: builtin/commit.c:1159 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F." -#: builtin/commit.c:1127 +#: builtin/commit.c:1167 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:1144 +#: builtin/commit.c:1184 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:1146 +#: builtin/commit.c:1186 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:1160 builtin/tag.c:543 +#: builtin/commit.c:1192 #, c-format -msgid "Invalid cleanup mode %s" -msgstr "Felaktigt städningsläge %s" - -#: builtin/commit.c:1165 -msgid "Paths with -a does not make sense." -msgstr "Kan inte ange sökvägar med -a." +msgid "paths '%s ...' with -a does not make sense" +msgstr "sökvägarna \"%s ...\" med -a ger ingen mening" -#: builtin/commit.c:1303 builtin/commit.c:1480 +#: builtin/commit.c:1319 builtin/commit.c:1503 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1305 builtin/commit.c:1482 +#: builtin/commit.c:1321 builtin/commit.c:1505 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1307 +#: builtin/commit.c:1323 msgid "show stash information" msgstr "visa information om stash" -#: builtin/commit.c:1309 builtin/commit.c:1484 +#: builtin/commit.c:1325 builtin/commit.c:1507 msgid "compute full ahead/behind values" msgstr "beräkna fullständiga före-/efter-värden" -#: builtin/commit.c:1311 +#: builtin/commit.c:1327 msgid "version" msgstr "version" -#: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558 -#: builtin/worktree.c:581 +#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561 +#: builtin/worktree.c:643 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1314 builtin/commit.c:1488 +#: builtin/commit.c:1330 builtin/commit.c:1511 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1317 builtin/commit.c:1491 +#: builtin/commit.c:1333 builtin/commit.c:1514 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494 -#: builtin/fast-export.c:1001 builtin/fast-export.c:1004 builtin/tag.c:397 +#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517 +#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465 +#: parse-options.h:323 msgid "mode" msgstr "läge" -#: builtin/commit.c:1320 builtin/commit.c:1494 +#: builtin/commit.c:1336 builtin/commit.c:1517 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "visa ospårade filer, valfria lägen: all, normal, no. (Standard: all)" -#: builtin/commit.c:1324 +#: builtin/commit.c:1340 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -8020,11 +11272,11 @@ msgstr "" "visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: " "traditional)" -#: builtin/commit.c:1326 parse-options.h:167 +#: builtin/commit.c:1342 parse-options.h:178 msgid "when" msgstr "när" -#: builtin/commit.c:1327 +#: builtin/commit.c:1343 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -8032,409 +11284,441 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1329 +#: builtin/commit.c:1345 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1330 +#: builtin/commit.c:1346 msgid "do not detect renames" msgstr "detektera inte namnändringar" -#: builtin/commit.c:1332 +#: builtin/commit.c:1348 msgid "detect renames, optionally set similarity index" msgstr "detektera namnändringar, möjligen sätt likhetsindex" -#: builtin/commit.c:1352 +#: builtin/commit.c:1368 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:1450 +#: builtin/commit.c:1473 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1451 +#: builtin/commit.c:1474 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1453 +#: builtin/commit.c:1476 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1454 builtin/tag.c:394 +#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1455 +#: builtin/commit.c:1478 msgid "author" msgstr "författare" -#: builtin/commit.c:1455 +#: builtin/commit.c:1478 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1456 builtin/gc.c:501 +#: builtin/commit.c:1479 builtin/gc.c:539 msgid "date" msgstr "datum" -#: builtin/commit.c:1456 +#: builtin/commit.c:1479 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1457 builtin/merge.c:228 builtin/notes.c:402 -#: builtin/notes.c:565 builtin/tag.c:392 -msgid "message" -msgstr "meddelande" - -#: builtin/commit.c:1457 -msgid "commit message" -msgstr "incheckningsmeddelande" - -#: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460 -#: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92 +#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483 +#: builtin/commit.c:1484 parse-options.h:315 ref-filter.h:92 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1458 +#: builtin/commit.c:1481 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1459 +#: builtin/commit.c:1482 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1460 +#: builtin/commit.c:1483 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1461 +#: builtin/commit.c:1484 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:1462 +#: builtin/commit.c:1485 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:1463 builtin/log.c:1446 builtin/merge.c:242 -#: builtin/pull.c:154 builtin/revert.c:105 +#: builtin/commit.c:1486 builtin/log.c:1541 builtin/merge.c:285 +#: builtin/pull.c:162 builtin/revert.c:109 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1464 +#: builtin/commit.c:1487 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1465 +#: builtin/commit.c:1488 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1466 -msgid "default" -msgstr "standard" - -#: builtin/commit.c:1466 builtin/tag.c:398 -msgid "how to strip spaces and #comments from message" -msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" - -#: builtin/commit.c:1467 +#: builtin/commit.c:1490 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1469 builtin/merge.c:240 builtin/pull.c:184 -#: builtin/revert.c:113 -msgid "GPG sign commit" -msgstr "GPG-signera incheckning" - -#: builtin/commit.c:1472 +#: builtin/commit.c:1495 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1473 +#: builtin/commit.c:1496 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1474 +#: builtin/commit.c:1497 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1475 +#: builtin/commit.c:1498 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1476 +#: builtin/commit.c:1499 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1477 +#: builtin/commit.c:1500 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1478 +#: builtin/commit.c:1501 msgid "bypass pre-commit and commit-msg hooks" msgstr "förbigå pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1479 +#: builtin/commit.c:1502 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1492 +#: builtin/commit.c:1515 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1493 +#: builtin/commit.c:1516 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1498 +#: builtin/commit.c:1521 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1500 +#: builtin/commit.c:1523 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1573 +#: builtin/commit.c:1596 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1580 +#: builtin/commit.c:1603 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1599 +#: builtin/commit.c:1622 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1610 +#: builtin/commit.c:1629 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1615 +#: builtin/commit.c:1634 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1650 +#: builtin/commit.c:1668 msgid "" -"Repository has been updated, but unable to write\n" +"repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" -"Arkivet har uppdaterats, men kunde inte skriva filen\n" +"arkivet har uppdaterats, men kunde inte skriva filen\n" "new_index. Kontrollera att disken inte är full och\n" "att kvoten inte har överskridits, och kör sedan\n" "\"git reset HEAD\" för att återställa." -#: builtin/commit-graph.c:9 +#: builtin/commit-graph.c:10 msgid "git commit-graph [--object-dir <objdir>]" msgstr "git commit-graph [--object-dir <objkat>]" -#: builtin/commit-graph.c:10 builtin/commit-graph.c:16 +#: builtin/commit-graph.c:11 builtin/commit-graph.c:23 msgid "git commit-graph read [--object-dir <objdir>]" msgstr "git commit-graph read [--object-dir <objkat>]" -#: builtin/commit-graph.c:11 builtin/commit-graph.c:21 +#: builtin/commit-graph.c:12 builtin/commit-graph.c:18 +msgid "git commit-graph verify [--object-dir <objdir>]" +msgstr "git commit-graph verify [--object-dir <objkat>]" + +#: builtin/commit-graph.c:13 builtin/commit-graph.c:28 msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--" -"stdin-commits]" +"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--" +"stdin-packs|--stdin-commits]" msgstr "" -"git commit-graph write [--object-dir <objkat>] [--append] [--stdin-packs|--" -"stdin-commits]" +"git commit-graph write [--object-dir <objkat>] [--append] [--reachable|--" +"stdin-packs|--stdin-commits]" -#: builtin/commit-graph.c:39 builtin/commit-graph.c:92 -#: builtin/commit-graph.c:147 builtin/fetch.c:161 builtin/log.c:1466 +#: builtin/commit-graph.c:51 builtin/commit-graph.c:89 +#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153 +#: builtin/log.c:1561 msgid "dir" msgstr "kat" -#: builtin/commit-graph.c:40 builtin/commit-graph.c:93 -#: builtin/commit-graph.c:148 +#: builtin/commit-graph.c:52 builtin/commit-graph.c:90 +#: builtin/commit-graph.c:148 builtin/commit-graph.c:206 msgid "The object directory to store the graph" msgstr "Objektkatalogen där grafen skall lagras" -#: builtin/commit-graph.c:95 +#: builtin/commit-graph.c:68 builtin/commit-graph.c:105 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "Kunde inte öppna incheckningsgrafen \"%s\"" + +#: builtin/commit-graph.c:150 +msgid "start walk at all refs" +msgstr "starta traversering vid alla referenser" + +#: builtin/commit-graph.c:152 msgid "scan pack-indexes listed by stdin for commits" msgstr "sök paketindex listade på standard in efter incheckningar" -#: builtin/commit-graph.c:97 +#: builtin/commit-graph.c:154 msgid "start walk at commits listed by stdin" msgstr "börja gå genom incheckningar listade på standard in" -#: builtin/commit-graph.c:99 +#: builtin/commit-graph.c:156 msgid "include all commits already in the commit-graph file" msgstr "ta med alla incheckningar redan i filen commit-graph" -#: builtin/commit-graph.c:108 -msgid "cannot use both --stdin-commits and --stdin-packs" -msgstr "kan inte använda både --stdin-commit och --stdin-packs" +#: builtin/commit-graph.c:165 +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "använd som mest en av --reachable, --stdin-commit och --stdin-packs" -#: builtin/config.c:10 +#: builtin/config.c:11 msgid "git config [<options>]" msgstr "git config [<flaggor>]" -#: builtin/config.c:101 +#: builtin/config.c:103 #, c-format msgid "unrecognized --type argument, %s" msgstr "okänt argument för --type, %s" -#: builtin/config.c:123 +#: builtin/config.c:115 +msgid "only one type at a time" +msgstr "endast en typ åt gången" + +#: builtin/config.c:124 msgid "Config file location" msgstr "Konfigurationsfilens plats" -#: builtin/config.c:124 +#: builtin/config.c:125 msgid "use global config file" msgstr "använd global konfigurationsfil" -#: builtin/config.c:125 +#: builtin/config.c:126 msgid "use system config file" msgstr "använd systemets konfigurationsfil" -#: builtin/config.c:126 +#: builtin/config.c:127 msgid "use repository config file" msgstr "använd arkivets konfigurationsfil" -#: builtin/config.c:127 +#: builtin/config.c:128 +msgid "use per-worktree config file" +msgstr "använd arbetskatalogens konfigurationsfil" + +#: builtin/config.c:129 msgid "use given config file" msgstr "använd angiven konfigurationsfil" -#: builtin/config.c:128 +#: builtin/config.c:130 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:128 +#: builtin/config.c:130 msgid "read config from given blob object" msgstr "läs konfiguration från givet blob-objekt" -#: builtin/config.c:129 +#: builtin/config.c:131 msgid "Action" msgstr "Åtgärd" -#: builtin/config.c:130 +#: builtin/config.c:132 msgid "get value: name [value-regex]" msgstr "hämta värde: namn [värde-reguttr]" -#: builtin/config.c:131 +#: builtin/config.c:133 msgid "get all values: key [value-regex]" msgstr "hämta alla värden: nyckel [värde-reguttr]" -#: builtin/config.c:132 +#: builtin/config.c:134 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:133 +#: builtin/config.c:135 msgid "get value specific for the URL: section[.var] URL" msgstr "hämta värde specifikt URL:en: sektion[.var] URL" -#: builtin/config.c:134 +#: builtin/config.c:136 msgid "replace all matching variables: name value [value_regex]" msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]" -#: builtin/config.c:135 +#: builtin/config.c:137 msgid "add a new variable: name value" msgstr "lägg till en ny variabel: namn värde" -#: builtin/config.c:136 +#: builtin/config.c:138 msgid "remove a variable: name [value-regex]" msgstr "ta bort en variabel: namn [värde-reguttr]" -#: builtin/config.c:137 +#: builtin/config.c:139 msgid "remove all matches: name [value-regex]" msgstr "ta bort alla träffar: namn [värde-reguttr]" -#: builtin/config.c:138 +#: builtin/config.c:140 msgid "rename section: old-name new-name" msgstr "byt namn på sektion: gammalt-namn nytt-namn" -#: builtin/config.c:139 +#: builtin/config.c:141 msgid "remove a section: name" msgstr "ta bort en sektion: namn" -#: builtin/config.c:140 +#: builtin/config.c:142 msgid "list all" msgstr "visa alla" -#: builtin/config.c:141 +#: builtin/config.c:143 msgid "open an editor" msgstr "öppna textredigeringsprogram" -#: builtin/config.c:142 +#: builtin/config.c:144 msgid "find the color configured: slot [default]" msgstr "hitta den inställda färgen: slot [default]" -#: builtin/config.c:143 +#: builtin/config.c:145 msgid "find the color setting: slot [stdout-is-tty]" msgstr "hitta färginställningen: slot [stdout-is-tty]" -#: builtin/config.c:144 +#: builtin/config.c:146 msgid "Type" msgstr "Typ" -#: builtin/config.c:145 +#: builtin/config.c:147 msgid "value is given this type" msgstr "värdet har givits denna typ" -#: builtin/config.c:146 +#: builtin/config.c:148 msgid "value is \"true\" or \"false\"" msgstr "värdet är \"true\" eller \"false\"" -#: builtin/config.c:147 +#: builtin/config.c:149 msgid "value is decimal number" msgstr "värdet är ett decimalt tal" -#: builtin/config.c:148 +#: builtin/config.c:150 msgid "value is --bool or --int" msgstr "värdet är --bool eller --int" -#: builtin/config.c:149 +#: builtin/config.c:151 msgid "value is a path (file or directory name)" msgstr "värdet är en sökväg (fil- eller katalognamn)" -#: builtin/config.c:150 +#: builtin/config.c:152 msgid "value is an expiry date" msgstr "värdet är ett utgångsdatum" -#: builtin/config.c:151 +#: builtin/config.c:153 msgid "Other" msgstr "Andra" -#: builtin/config.c:152 +#: builtin/config.c:154 msgid "terminate values with NUL byte" msgstr "terminera värden med NUL-byte" -#: builtin/config.c:153 +#: builtin/config.c:155 msgid "show variable names only" msgstr "visa endast variabelnamn" -#: builtin/config.c:154 +#: builtin/config.c:156 msgid "respect include directives on lookup" msgstr "respektera inkluderingsdirektiv vid uppslag" -#: builtin/config.c:155 +#: builtin/config.c:157 msgid "show origin of config (file, standard input, blob, command line)" msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)" -#: builtin/config.c:156 +#: builtin/config.c:158 msgid "value" msgstr "värde" -#: builtin/config.c:156 +#: builtin/config.c:158 msgid "with --get, use default value when missing entry" msgstr "med --get, använd standardvärde vid saknad post" -#: builtin/config.c:332 +#: builtin/config.c:172 +#, c-format +msgid "wrong number of arguments, should be %d" +msgstr "fel antal argument, skulle vara %d" + +#: builtin/config.c:174 +#, c-format +msgid "wrong number of arguments, should be from %d to %d" +msgstr "fel antal argument, skulle vara från %d till %d" + +#: builtin/config.c:308 +#, c-format +msgid "invalid key pattern: %s" +msgstr "felaktigt nyckelmönster: %s" + +#: builtin/config.c:344 #, c-format msgid "failed to format default config value: %s" msgstr "misslyckades formatera standardkonfigurationsvärde: %s" -#: builtin/config.c:431 +#: builtin/config.c:401 +#, c-format +msgid "cannot parse color '%s'" +msgstr "kan inte tolka färgen \"%s\"" + +#: builtin/config.c:443 msgid "unable to parse default color value" msgstr "kan inte tolka standardfärgvärde" -#: builtin/config.c:575 +#: builtin/config.c:496 builtin/config.c:742 +msgid "not in a git directory" +msgstr "inte i en git-katalog" + +#: builtin/config.c:499 +msgid "writing to stdin is not supported" +msgstr "skriva till standard in stöds inte" + +#: builtin/config.c:502 +msgid "writing config blobs is not supported" +msgstr "skriva konfigurations-blobbar stöds inte" + +#: builtin/config.c:587 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -8449,20 +11733,78 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:603 +#: builtin/config.c:611 +msgid "only one config file at a time" +msgstr "endast en konfigurationsfil åt gången" + +#: builtin/config.c:616 msgid "--local can only be used inside a git repository" msgstr "--local kan bara användas inuti ett git-arkiv" -#: builtin/config.c:606 +#: builtin/config.c:619 msgid "--blob can only be used inside a git repository" msgstr "--blob kan bara användas inuti ett git-arkiv" -#: builtin/config.c:735 +#: builtin/config.c:638 +msgid "$HOME not set" +msgstr "$HOME inte satt" + +#: builtin/config.c:658 +msgid "" +"--worktree cannot be used with multiple working trees unless the config\n" +"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" +"section in \"git help worktree\" for details" +msgstr "" +"--worktree kan inte användas med flera arbetskataloger om inte\n" +"konfigurationsutöknignen worktreeConfig har aktiverats. Läsa stycket\n" +"\"KONFIGURATIONSFIL\" i \"git help worktree\" för detaljer" + +#: builtin/config.c:688 +msgid "--get-color and variable type are incoherent" +msgstr "--get-color och variabeltyp stämmer inte överens" + +#: builtin/config.c:693 +msgid "only one action at a time" +msgstr "endast en åtgärd åt gången" + +#: builtin/config.c:706 +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "--name-only gäller bara för --list eller --get-regexp" + +#: builtin/config.c:712 +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "" +"--show-origin gäller bara för --get, --get-all, --get-regexp och --list" + +#: builtin/config.c:718 +msgid "--default is only applicable to --get" +msgstr "--default gäller bara för --get" + +#: builtin/config.c:731 +#, c-format +msgid "unable to read config file '%s'" +msgstr "kan inte konfigurationsfil \"%s\"" + +#: builtin/config.c:734 +msgid "error processing config file(s)" +msgstr "fel vid hantering av konfigurationsfil(er)" + +#: builtin/config.c:744 +msgid "editing stdin is not supported" +msgstr "redigering av standard in stöds ej" + +#: builtin/config.c:746 +msgid "editing blobs is not supported" +msgstr "redigering av blobbar stöds ej" + +#: builtin/config.c:760 #, c-format msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%s\"" -#: builtin/config.c:748 +#: builtin/config.c:773 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -8471,6 +11813,11 @@ msgstr "" "kan inte skriva över flera värden med ett ensamt värde\n" " Använd en regexp, --add eller --replace-all för att ändra %s." +#: builtin/config.c:847 builtin/config.c:858 +#, c-format +msgid "no such section: %s" +msgstr "ingen sådan sektion: %s" + #: builtin/count-objects.c:90 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" @@ -8479,58 +11826,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:22 +#: builtin/describe.c:27 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<flaggor>] [<incheckning-igt>...]" -#: builtin/describe.c:23 +#: builtin/describe.c:28 msgid "git describe [<options>] --dirty" msgstr "git describe [<flaggor>] --dirty" -#: builtin/describe.c:57 +#: builtin/describe.c:63 msgid "head" msgstr "huvud" -#: builtin/describe.c:57 +#: builtin/describe.c:63 msgid "lightweight" msgstr "lättviktig" -#: builtin/describe.c:57 +#: builtin/describe.c:63 msgid "annotated" msgstr "annoterad" -#: builtin/describe.c:267 +#: builtin/describe.c:273 #, c-format msgid "annotated tag %s not available" msgstr "den annoterade taggen %s inte tillgänglig" -#: builtin/describe.c:271 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s has no embedded name" msgstr "den annoterade taggen %s har inget inbäddat namn" -#: builtin/describe.c:273 +#: builtin/describe.c:279 #, c-format msgid "tag '%s' is really '%s' here" msgstr "taggen \"%s\" är i verkligheten \"%s\" här" -#: builtin/describe.c:317 +#: builtin/describe.c:323 #, c-format msgid "no tag exactly matches '%s'" msgstr "ingen tagg motsvarar \"%s\" exakt" -#: builtin/describe.c:319 +#: builtin/describe.c:325 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" "Ingen exakt träff mot referenser eller taggar, söker för att beskriva\n" -#: builtin/describe.c:366 +#: builtin/describe.c:379 #, c-format msgid "finished search at %s\n" msgstr "avslutade sökning på %s\n" -#: builtin/describe.c:392 +#: builtin/describe.c:405 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -8539,7 +11886,7 @@ msgstr "" "Inga annoterade taggar kan beskriva \"%s\".\n" "Det finns dock oannoterade taggar: testa --tags." -#: builtin/describe.c:396 +#: builtin/describe.c:409 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -8548,12 +11895,12 @@ msgstr "" "Inga taggar kan beskriva \"%s\".\n" "Testa --always, eller skapa några taggar." -#: builtin/describe.c:426 +#: builtin/describe.c:439 #, c-format msgid "traversed %lu commits\n" msgstr "traverserade %lu incheckningar\n" -#: builtin/describe.c:429 +#: builtin/describe.c:442 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -8562,123 +11909,123 @@ msgstr "" "mer än %i taggar hittades; listar de %i senaste\n" "gav upp sökningen vid %s\n" -#: builtin/describe.c:497 +#: builtin/describe.c:510 #, c-format msgid "describe %s\n" msgstr "beskriva %s\n" -#: builtin/describe.c:500 builtin/log.c:502 +#: builtin/describe.c:513 #, c-format msgid "Not a valid object name %s" msgstr "Objektnamnet är inte giltigt: %s" -#: builtin/describe.c:508 +#: builtin/describe.c:521 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s är varken incheckning eller blob" -#: builtin/describe.c:522 +#: builtin/describe.c:535 msgid "find the tag that comes after the commit" msgstr "hitta taggen som kommer efter incheckningen" -#: builtin/describe.c:523 +#: builtin/describe.c:536 msgid "debug search strategy on stderr" msgstr "felsök sökstrategin på standard fel" -#: builtin/describe.c:524 +#: builtin/describe.c:537 msgid "use any ref" msgstr "använd alla referenser" -#: builtin/describe.c:525 +#: builtin/describe.c:538 msgid "use any tag, even unannotated" msgstr "använd alla taggar, även oannoterade" -#: builtin/describe.c:526 +#: builtin/describe.c:539 msgid "always use long format" msgstr "använd alltid långt format" -#: builtin/describe.c:527 +#: builtin/describe.c:540 msgid "only follow first parent" msgstr "följ endast första föräldern" -#: builtin/describe.c:530 +#: builtin/describe.c:543 msgid "only output exact matches" msgstr "skriv endast ut exakta träffar" -#: builtin/describe.c:532 +#: builtin/describe.c:545 msgid "consider <n> most recent tags (default: 10)" msgstr "överväg de <n> nyaste taggarna (standard: 10)" -#: builtin/describe.c:534 +#: builtin/describe.c:547 msgid "only consider tags matching <pattern>" msgstr "överväg endast taggar som motsvarar <mönster>" -#: builtin/describe.c:536 +#: builtin/describe.c:549 msgid "do not consider tags matching <pattern>" msgstr "överväg inte taggar som motsvarar <mönster>" -#: builtin/describe.c:538 builtin/name-rev.c:406 +#: builtin/describe.c:551 builtin/name-rev.c:426 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" -#: builtin/describe.c:539 builtin/describe.c:542 +#: builtin/describe.c:552 builtin/describe.c:555 msgid "mark" msgstr "märke" -#: builtin/describe.c:540 +#: builtin/describe.c:553 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")" -#: builtin/describe.c:543 +#: builtin/describe.c:556 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")" -#: builtin/describe.c:561 +#: builtin/describe.c:574 msgid "--long is incompatible with --abbrev=0" msgstr "--long är inkompatibel med --abbrev=0" -#: builtin/describe.c:590 +#: builtin/describe.c:603 msgid "No names found, cannot describe anything." msgstr "Inga namn hittades, kan inte beskriva något." -#: builtin/describe.c:640 +#: builtin/describe.c:654 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden" -#: builtin/describe.c:642 +#: builtin/describe.c:656 msgid "--broken is incompatible with commit-ishes" msgstr "--broken är inkompatibelt med \"commit-ish\"-värden" -#: builtin/diff.c:83 +#: builtin/diff.c:84 #, c-format msgid "'%s': not a regular file or symlink" msgstr "\"%s\": inte en normal fil eller symbolisk länk" -#: builtin/diff.c:234 +#: builtin/diff.c:235 #, c-format msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:356 +#: builtin/diff.c:350 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:399 +#: builtin/diff.c:394 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:408 +#: builtin/diff.c:403 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:413 +#: builtin/diff.c:408 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." -#: builtin/difftool.c:29 +#: builtin/difftool.c:31 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" "git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]" @@ -8746,8 +12093,8 @@ msgid "use symlinks in dir-diff mode" msgstr "använd symboliska länkar i katalogdiffläge" #: builtin/difftool.c:705 -msgid "<tool>" -msgstr "<verktyg>" +msgid "tool" +msgstr "verktyg" #: builtin/difftool.c:706 msgid "use the specified diff tool" @@ -8765,164 +12112,176 @@ msgstr "" "låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde " "skilt från noll" -#: builtin/difftool.c:713 -msgid "<command>" -msgstr "<kommando>" - #: builtin/difftool.c:714 msgid "specify a custom command for viewing diffs" msgstr "ange eget kommando för att visa diffar" -#: builtin/difftool.c:738 +#: builtin/difftool.c:715 +msgid "passed to `diff`" +msgstr "sändes till \"diff\"" + +#: builtin/difftool.c:730 +msgid "difftool requires worktree or --no-index" +msgstr "difftool kräver en arbetskatalog eller --no-index" + +#: builtin/difftool.c:744 msgid "no <tool> given for --tool=<tool>" msgstr "inget <verktyg> angavs för --tool=<verktyg>" -#: builtin/difftool.c:745 +#: builtin/difftool.c:751 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "inget <kommando> angavs för --extcmd=<kommando>" -#: builtin/fast-export.c:27 +#: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-flaggor]" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1084 msgid "show progress after <n> objects" msgstr "visa förlopp efter <n> objekt" -#: builtin/fast-export.c:1002 +#: builtin/fast-export.c:1086 msgid "select handling of signed tags" msgstr "välj hantering av signerade taggar" -#: builtin/fast-export.c:1005 +#: builtin/fast-export.c:1089 msgid "select handling of tags that tag filtered objects" msgstr "välj hantering av taggar som har taggfiltrerade objekt" -#: builtin/fast-export.c:1008 +#: builtin/fast-export.c:1092 msgid "Dump marks to this file" msgstr "Dump märken till filen" -#: builtin/fast-export.c:1010 +#: builtin/fast-export.c:1094 msgid "Import marks from this file" msgstr "Importera märken från filen" -#: builtin/fast-export.c:1012 +#: builtin/fast-export.c:1096 msgid "Fake a tagger when tags lack one" msgstr "Fejka taggare när taggen saknar en" -#: builtin/fast-export.c:1014 +#: builtin/fast-export.c:1098 msgid "Output full tree for each commit" msgstr "Skriv ut hela trädet för varje incheckning" -#: builtin/fast-export.c:1016 +#: builtin/fast-export.c:1100 msgid "Use the done feature to terminate the stream" msgstr "Använd done-funktionen för att avsluta strömmen" -#: builtin/fast-export.c:1017 +#: builtin/fast-export.c:1101 msgid "Skip output of blob data" msgstr "Hoppa över skrivning av blob-data" -#: builtin/fast-export.c:1018 +#: builtin/fast-export.c:1102 builtin/log.c:1609 msgid "refspec" msgstr "referensspecifikation" -#: builtin/fast-export.c:1019 +#: builtin/fast-export.c:1103 msgid "Apply refspec to exported refs" msgstr "Applicera referensspecifikation på exporterade referenser" -#: builtin/fast-export.c:1020 +#: builtin/fast-export.c:1104 msgid "anonymize output" msgstr "anonymisera utdata" -#: builtin/fetch.c:26 +#: builtin/fast-export.c:1106 +msgid "Reference parents which are not in fast-export stream by object id" +msgstr "Referera föräldrar som inte finns i fast-export-ström med objekt-id" + +#: builtin/fast-export.c:1108 +msgid "Show original object ids of blobs/commits" +msgstr "Visa ursprungliga objekt-ID för blobbar/incheckningar" + +#: builtin/fetch.c:28 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/fetch.c:27 +#: builtin/fetch.c:29 msgid "git fetch [<options>] <group>" msgstr "git fetch [<flaggor>] <grupp>" -#: builtin/fetch.c:28 +#: builtin/fetch.c:30 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" -#: builtin/fetch.c:29 +#: builtin/fetch.c:31 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:123 builtin/pull.c:193 +#: builtin/fetch.c:115 builtin/pull.c:202 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:125 builtin/pull.c:196 +#: builtin/fetch.c:117 builtin/pull.c:205 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:127 builtin/pull.c:199 +#: builtin/fetch.c:119 builtin/pull.c:208 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:128 builtin/pull.c:201 -msgid "force overwrite of local branch" -msgstr "tvinga överskrivning av lokal gren" +#: builtin/fetch.c:120 +msgid "force overwrite of local reference" +msgstr "tvinga överskrivning av lokal referens" -#: builtin/fetch.c:130 +#: builtin/fetch.c:122 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:132 builtin/pull.c:203 +#: builtin/fetch.c:124 builtin/pull.c:212 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:134 +#: builtin/fetch.c:126 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:136 +#: builtin/fetch.c:128 msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:138 builtin/pull.c:206 +#: builtin/fetch.c:130 builtin/pull.c:215 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:140 +#: builtin/fetch.c:132 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "rensa lokala taggar inte längre på fjärren och skriv över ändrade taggar" -#: builtin/fetch.c:141 builtin/fetch.c:164 builtin/pull.c:131 +#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:142 +#: builtin/fetch.c:134 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:146 builtin/pull.c:214 +#: builtin/fetch.c:138 builtin/pull.c:223 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:148 +#: builtin/fetch.c:140 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:151 builtin/fetch.c:157 builtin/pull.c:217 +#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:153 +#: builtin/fetch.c:145 msgid "deepen history of shallow repository based on time" msgstr "fördjupa historik för grund klon baserad på tid" -#: builtin/fetch.c:159 builtin/pull.c:220 +#: builtin/fetch.c:151 builtin/pull.c:229 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:162 +#: builtin/fetch.c:154 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:165 +#: builtin/fetch.c:157 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -8930,101 +12289,97 @@ msgstr "" "standard för rekursiv hämtning av undermoduler (lägre prioritet än " "konfigurationsfiler)" -#: builtin/fetch.c:169 builtin/pull.c:223 +#: builtin/fetch.c:161 builtin/pull.c:232 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:170 builtin/pull.c:225 +#: builtin/fetch.c:162 builtin/pull.c:234 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:171 builtin/pull.c:226 +#: builtin/fetch.c:163 builtin/pull.c:235 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582 -#: builtin/send-pack.c:172 -msgid "server-specific" -msgstr "serverspecifik" - -#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582 -#: builtin/send-pack.c:173 -msgid "option to transmit" -msgstr "" -"inget att checka in\n" -"flagga att sända" +#: builtin/fetch.c:170 +msgid "report that we have only objects reachable from this object" +msgstr "rapportera att vi bara har objekt nåbara från detta objektet" -#: builtin/fetch.c:442 +#: builtin/fetch.c:469 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:560 +#: builtin/fetch.c:608 #, 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:653 +#: builtin/fetch.c:705 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:657 +#: builtin/fetch.c:709 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:670 builtin/fetch.c:750 +#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:671 +#: builtin/fetch.c:723 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:680 +#: builtin/fetch.c:733 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:681 builtin/fetch.c:714 builtin/fetch.c:730 -#: builtin/fetch.c:745 +#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784 +#: builtin/fetch.c:796 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:700 +#: builtin/fetch.c:738 +msgid "would clobber existing tag" +msgstr "skulle skriva över befintlig tagg" + +#: builtin/fetch.c:760 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:703 +#: builtin/fetch.c:763 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:706 +#: builtin/fetch.c:766 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:745 +#: builtin/fetch.c:796 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:750 +#: builtin/fetch.c:801 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:795 +#: builtin/fetch.c:847 #, 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:815 +#: builtin/fetch.c:868 #, 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:903 builtin/fetch.c:999 +#: builtin/fetch.c:959 builtin/fetch.c:1081 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:914 +#: builtin/fetch.c:970 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -9033,56 +12388,58 @@ 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:969 +#: builtin/fetch.c:1051 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:970 +#: builtin/fetch.c:1052 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:1002 +#: builtin/fetch.c:1084 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:1003 builtin/remote.c:1033 +#: builtin/fetch.c:1085 builtin/remote.c:1036 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:1026 +#: builtin/fetch.c:1108 #, 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:1045 +#: builtin/fetch.c:1127 #, 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:1048 +#: builtin/fetch.c:1130 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1287 +#: builtin/fetch.c:1434 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1289 builtin/remote.c:98 +#: builtin/fetch.c:1436 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1335 builtin/fetch.c:1503 +#: builtin/fetch.c:1482 msgid "" -"--filter can only be used with the remote configured in core.partialClone" +"--filter can only be used with the remote configured in extensions." +"partialClone" msgstr "" -"--filter kan endast användas med fjärren konfigurerad i core.partialClone" +"--filter kan endast användas med fjärren konfigurerad i extensions." +"partialClone" -#: builtin/fetch.c:1358 +#: builtin/fetch.c:1506 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -9090,66 +12447,74 @@ 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:1395 +#: builtin/fetch.c:1543 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1444 +#: builtin/fetch.c:1594 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1446 +#: builtin/fetch.c:1596 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1451 +#: builtin/fetch.c:1601 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1453 +#: builtin/fetch.c:1603 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1469 +#: builtin/fetch.c:1619 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1471 +#: builtin/fetch.c:1621 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1480 +#: builtin/fetch.c:1630 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1487 +#: builtin/fetch.c:1637 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" -#: builtin/fmt-merge-msg.c:15 +#: builtin/fetch.c:1653 +msgid "" +"--filter can only be used with the remote configured in extensions." +"partialclone" +msgstr "" +"--filter kan endast användas med fjärren konfigurerad i extensions." +"partialclone" + +#: builtin/fmt-merge-msg.c:18 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:672 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:669 +#: builtin/fmt-merge-msg.c:675 msgid "alias for --log (deprecated)" msgstr "alias för --log (avråds)" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:678 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:679 msgid "use <text> as start of message" msgstr "inled meddelande med <text>" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:680 msgid "file to read from" msgstr "fil att läsa från" @@ -9190,107 +12555,302 @@ msgstr "citera platshållare passande för Tcl" msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:39 builtin/tag.c:421 +#: builtin/for-each-ref.c:39 builtin/tag.c:433 msgid "respect format colors" msgstr "använd formatfärger" -#: builtin/for-each-ref.c:43 +#: builtin/for-each-ref.c:42 msgid "print only refs which points at the given object" msgstr "visa endast referenser som pekar på objektet" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:44 msgid "print only refs that are merged" msgstr "visa endast referenser som slagits samman" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:45 msgid "print only refs that are not merged" msgstr "visa endast referenser som ej slagits samman" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:46 msgid "print only refs which contain the commit" msgstr "visa endast referenser som innehåller incheckningen" -#: builtin/for-each-ref.c:48 +#: builtin/for-each-ref.c:47 msgid "print only refs which don't contain the commit" msgstr "visa endast referenser som inte innehåller incheckningen" -#: builtin/fsck.c:569 +#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 +msgid "unknown" +msgstr "okänd" + +#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> +#: builtin/fsck.c:120 builtin/fsck.c:136 +#, c-format +msgid "error in %s %s: %s" +msgstr "fel i %s %s: %s" + +#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> +#: builtin/fsck.c:131 +#, c-format +msgid "warning in %s %s: %s" +msgstr "varning i %s %s: %s" + +#: builtin/fsck.c:157 builtin/fsck.c:159 +#, c-format +msgid "broken link from %7s %s" +msgstr "trasig länk från %7s %s" + +#: builtin/fsck.c:168 +msgid "wrong object type in link" +msgstr "fel objekttyp i länk" + +#: builtin/fsck.c:184 +#, c-format +msgid "" +"broken link from %7s %s\n" +" to %7s %s" +msgstr "" +"trasig länk från %7s %s\n" +" till %7s %s" + +#: builtin/fsck.c:295 +#, c-format +msgid "missing %s %s" +msgstr "saknat %s %s" + +#: builtin/fsck.c:321 +#, c-format +msgid "unreachable %s %s" +msgstr "onåbart %s %s" + +#: builtin/fsck.c:340 +#, c-format +msgid "dangling %s %s" +msgstr "hängande %s %s" + +#: builtin/fsck.c:349 +msgid "could not create lost-found" +msgstr "kunde inte skapa lost-found" + +#: builtin/fsck.c:360 +#, c-format +msgid "could not finish '%s'" +msgstr "kunde inte avsluta \"%s\"" + +#: builtin/fsck.c:377 +#, c-format +msgid "Checking %s" +msgstr "Kontrollerar %s" + +# Vague original, not networking-related, but rather related to the actual +# objects in the database. +#: builtin/fsck.c:415 +#, c-format +msgid "Checking connectivity (%d objects)" +msgstr "Kontrollerar konnektivitet (%d objekt)" + +#: builtin/fsck.c:434 +#, c-format +msgid "Checking %s %s" +msgstr "Kontrollerar %s %s" + +#: builtin/fsck.c:438 +msgid "broken links" +msgstr "trasiga länkar" + +#: builtin/fsck.c:447 +#, c-format +msgid "root %s" +msgstr "roten %s" + +#: builtin/fsck.c:455 +#, c-format +msgid "tagged %s %s (%s) in %s" +msgstr "taggad %s %s (%s) i %s" + +#: builtin/fsck.c:484 +#, c-format +msgid "%s: object corrupt or missing" +msgstr "%s: objekt trasigt eller saknas" + +#: builtin/fsck.c:509 +#, c-format +msgid "%s: invalid reflog entry %s" +msgstr "%s: ogiltig reflog-post %s" + +#: builtin/fsck.c:523 +#, c-format +msgid "Checking reflog %s->%s" +msgstr "Kontrollerar reflog %s->%s" + +#: builtin/fsck.c:557 +#, c-format +msgid "%s: invalid sha1 pointer %s" +msgstr "%s: ogiltig sha1-pekare %s" + +#: builtin/fsck.c:564 +#, c-format +msgid "%s: not a commit" +msgstr "%s: inte en incheckning!" + +#: builtin/fsck.c:619 +msgid "notice: No default references" +msgstr "obs: Inga förvalda referenser" + +#: builtin/fsck.c:634 +#, c-format +msgid "%s: object corrupt or missing: %s" +msgstr "%s: objektet trasigt eller saknas: %s" + +#: builtin/fsck.c:647 +#, c-format +msgid "%s: object could not be parsed: %s" +msgstr "%s: objektet kunde inte tolkas: %s" + +#: builtin/fsck.c:667 +#, c-format +msgid "bad sha1 file: %s" +msgstr "ogiltig sha1-fil: %s" + +#: builtin/fsck.c:682 +msgid "Checking object directory" +msgstr "Kontrollerar objektkatalog" + +#: builtin/fsck.c:685 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:661 +#: builtin/fsck.c:700 +#, c-format +msgid "Checking %s link" +msgstr "Kontrollerar %s-länk" + +#: builtin/fsck.c:705 builtin/index-pack.c:841 +#, c-format +msgid "invalid %s" +msgstr "ogiltigt %s" + +#: builtin/fsck.c:712 +#, c-format +msgid "%s points to something strange (%s)" +msgstr "%s pekar på något konstigt (%s)" + +#: builtin/fsck.c:718 +#, c-format +msgid "%s: detached HEAD points at nothing" +msgstr "%s: frånkopplat HEAD pekar på ingenting" + +#: builtin/fsck.c:722 +#, c-format +msgid "notice: %s points to an unborn branch (%s)" +msgstr "obs: %s pekar på en ofödd gren (%s)" + +#: builtin/fsck.c:734 +msgid "Checking cache tree" +msgstr "Kontrollerar cacheträd" + +#: builtin/fsck.c:739 +#, c-format +msgid "%s: invalid sha1 pointer in cache-tree" +msgstr "%s: ogiltig sha1-pekare i cacheträd" + +#: builtin/fsck.c:750 +msgid "non-tree in cache-tree" +msgstr "icke-träd i cacheträd" + +#: builtin/fsck.c:781 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:667 +#: builtin/fsck.c:787 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:668 +#: builtin/fsck.c:788 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:669 +#: builtin/fsck.c:789 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:670 +#: builtin/fsck.c:790 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:671 +#: builtin/fsck.c:791 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:672 +#: builtin/fsck.c:792 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:673 +#: builtin/fsck.c:793 msgid "also consider packs and alternate objects" msgstr "ta även hänsyn till paket och alternativa objekt" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:674 +#: builtin/fsck.c:794 msgid "check only connectivity" msgstr "kontrollera endast konnektivitet" -#: builtin/fsck.c:675 +#: builtin/fsck.c:795 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:677 +#: builtin/fsck.c:797 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:678 builtin/prune.c:109 +#: builtin/fsck.c:798 builtin/prune.c:132 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:679 +#: builtin/fsck.c:799 msgid "show verbose names for reachable objects" msgstr "visa ordrika namn för nåbara objekt" -#: builtin/fsck.c:745 +#: builtin/fsck.c:859 builtin/index-pack.c:224 msgid "Checking objects" msgstr "Kontrollerar objekt" -#: builtin/gc.c:33 +#: builtin/fsck.c:887 +#, c-format +msgid "%s: object missing" +msgstr "%s: objekt saknas" + +#: builtin/fsck.c:899 +#, c-format +msgid "invalid parameter: expected sha1, got '%s'" +msgstr "ogiltig parameter: förväntade sha1, fick \"%s\"" + +#: builtin/gc.c:34 msgid "git gc [<options>]" msgstr "git gc [<flaggor>]" -#: builtin/gc.c:88 +#: builtin/gc.c:90 #, c-format msgid "Failed to fstat %s: %s" msgstr "Misslyckades ta status (fstat) på %s: %s" -#: builtin/gc.c:452 +#: builtin/gc.c:126 +#, c-format +msgid "failed to parse '%s' value '%s'" +msgstr "misslyckades tolka \"%s\" värde \"%s\"" + +#: builtin/gc.c:476 builtin/init-db.c:55 +#, c-format +msgid "cannot stat '%s'" +msgstr "kan inte ta status på \"%s\"" + +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519 #, c-format -msgid "Can't stat %s" -msgstr "Kan inte ta status på %s" +msgid "cannot read '%s'" +msgstr "kunde inte läsa \"%s\"" -#: builtin/gc.c:461 +#: builtin/gc.c:492 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -9305,52 +12865,52 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:502 +#: builtin/gc.c:540 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:504 +#: builtin/gc.c:542 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:505 +#: builtin/gc.c:543 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:508 +#: builtin/gc.c:546 msgid "force running gc even if there may be another gc running" msgstr "tvinga gc-körning även om en annan gc kanske körs" -#: builtin/gc.c:511 +#: builtin/gc.c:549 msgid "repack all other packs except the largest pack" msgstr "packa om alla paket förutom det största paketet" -#: builtin/gc.c:528 +#: builtin/gc.c:566 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "kunde inte tolka värdet %s för gc.logexpiry" -#: builtin/gc.c:539 +#: builtin/gc.c:577 #, c-format msgid "failed to parse prune expiry value %s" msgstr "kunde inte tolka värdet %s för prune expiry" -#: builtin/gc.c:559 +#: builtin/gc.c:597 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n" -#: builtin/gc.c:561 +#: builtin/gc.c:599 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:562 +#: builtin/gc.c:600 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Se \"git help gc\" för manuell hushållning.\n" -#: builtin/gc.c:598 +#: builtin/gc.c:640 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -9358,23 +12918,23 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:645 +#: builtin/gc.c:693 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort " "dem." -#: builtin/grep.c:28 +#: builtin/grep.c:29 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]" -#: builtin/grep.c:226 +#: builtin/grep.c:225 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: misslyckades skapa tråd. %s" -#: builtin/grep.c:284 +#: builtin/grep.c:279 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "felaktigt antal trådar angivet (%d) för %s" @@ -9383,245 +12943,262 @@ 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:1531 builtin/index-pack.c:1723 +#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705 +#: builtin/pack-objects.c:2720 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623 +#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:638 +#: builtin/grep.c:646 #, c-format msgid "unable to grep from object of type %s" msgstr "kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:703 +#: builtin/grep.c:712 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:790 +#: builtin/grep.c:811 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:792 +#: builtin/grep.c:813 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:794 +#: builtin/grep.c:815 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:796 +#: builtin/grep.c:817 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:798 +#: builtin/grep.c:819 msgid "recursively search in each submodule" msgstr "sök varje undermodul rekursivt" -#: builtin/grep.c:801 +#: builtin/grep.c:822 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:803 +#: builtin/grep.c:824 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:805 +#: builtin/grep.c:826 msgid "match patterns only at word boundaries" msgstr "matcha endast mönster vid ordgränser" -#: builtin/grep.c:807 +#: builtin/grep.c:828 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:809 +#: builtin/grep.c:830 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:812 +#: builtin/grep.c:833 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:814 +#: builtin/grep.c:835 +msgid "search in subdirectories (default)" +msgstr "sök i underkataloger (standard)" + +#: builtin/grep.c:837 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:818 +#: builtin/grep.c:841 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:821 +#: builtin/grep.c:844 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:824 +#: builtin/grep.c:847 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:827 +#: builtin/grep.c:850 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:830 +#: builtin/grep.c:853 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:831 +#: builtin/grep.c:854 +msgid "show column number of first match" +msgstr "visa kolumnnummer för första träff" + +#: builtin/grep.c:855 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:832 +#: builtin/grep.c:856 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:834 +#: builtin/grep.c:858 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:836 +#: builtin/grep.c:860 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:838 +#: builtin/grep.c:862 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:841 +#: builtin/grep.c:865 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:843 +#: builtin/grep.c:867 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:846 +#: builtin/grep.c:870 +msgid "show only matching parts of a line" +msgstr "visa endast träffade delar av rader" + +#: builtin/grep.c:872 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:847 +#: builtin/grep.c:873 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:849 +#: builtin/grep.c:875 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:851 +#: builtin/grep.c:877 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:854 +#: builtin/grep.c:880 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:857 +#: builtin/grep.c:883 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:859 +#: builtin/grep.c:885 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:861 +#: builtin/grep.c:887 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:862 +#: builtin/grep.c:888 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:865 +#: builtin/grep.c:891 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:867 +#: builtin/grep.c:893 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:870 +#: builtin/grep.c:896 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:872 +#: builtin/grep.c:898 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:874 +#: builtin/grep.c:900 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:886 +#: builtin/grep.c:912 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:888 +#: builtin/grep.c:914 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:890 +#: builtin/grep.c:916 msgid "show parse tree for grep expression" msgstr "visa analysträd för grep-uttryck" -#: builtin/grep.c:894 +#: builtin/grep.c:920 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:894 +#: builtin/grep.c:920 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:898 +#: builtin/grep.c:924 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:962 -msgid "no pattern given." -msgstr "inget mönster angavs." +#: builtin/grep.c:988 +msgid "no pattern given" +msgstr "inget mönster angavs" -#: builtin/grep.c:994 +#: builtin/grep.c:1024 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index och --untracked kan inte användas med revisioner" -#: builtin/grep.c:1001 +#: builtin/grep.c:1032 #, c-format msgid "unable to resolve revision: %s" msgstr "kan inte slå upp revision: %s" -#: builtin/grep.c:1036 builtin/index-pack.c:1527 -#, c-format -msgid "invalid number of threads specified (%d)" -msgstr "felaktigt antal trådar angivet (%d)" +#: builtin/grep.c:1063 +msgid "invalid option combination, ignoring --threads" +msgstr "ogiltig kombination av flaggor, ignorerar --threads" -#: builtin/grep.c:1041 +#: builtin/grep.c:1066 builtin/pack-objects.c:3403 msgid "no threads support, ignoring --threads" msgstr "trådstöd saknas, ignorerar --threads" -#: builtin/grep.c:1065 +#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "felaktigt antal trådar angivet (%d)" + +#: builtin/grep.c:1092 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1088 -msgid "option not supported with --recurse-submodules." -msgstr "flaggan stöds inte med --recurse-submodules." +#: builtin/grep.c:1115 +msgid "option not supported with --recurse-submodules" +msgstr "flaggan stöds inte med --recurse-submodules" -#: builtin/grep.c:1094 -msgid "--cached or --untracked cannot be used with --no-index." -msgstr "--cached och --untracked kan inte användas med --no-index." +#: builtin/grep.c:1121 +msgid "--cached or --untracked cannot be used with --no-index" +msgstr "--cached och --untracked kan inte användas med --no-index" -#: builtin/grep.c:1100 -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:1127 +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:1108 -msgid "both --cached and trees are given." -msgstr "både --cached och träd angavs." +#: builtin/grep.c:1135 +msgid "both --cached and trees are given" +msgstr "både --cached och träd angavs" -#: builtin/hash-object.c:83 +#: builtin/hash-object.c:85 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -9629,96 +13206,100 @@ msgstr "" "git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] " "<fil>..." -#: builtin/hash-object.c:84 +#: builtin/hash-object.c:86 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:98 msgid "type" msgstr "typ" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:98 msgid "object type" msgstr "objekttyp" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:99 msgid "write the object into the object database" msgstr "skriv objektet till objektdatabasen" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:101 msgid "read the object from stdin" msgstr "läs objektet från standard in" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:103 msgid "store file as is without filters" msgstr "spara filen som den är utan filer" -#: builtin/hash-object.c:102 +#: builtin/hash-object.c:104 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "hasha slumpmässigt skräp för att skapa korrupta objekt för felsökning av Git" -#: builtin/hash-object.c:103 +#: builtin/hash-object.c:105 msgid "process file as it were from this path" msgstr "hantera filen som om den kom från sökvägen" -#: builtin/help.c:45 +#: builtin/help.c:46 msgid "print all available commands" msgstr "visa alla tillgängliga kommandon" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "exclude guides" msgstr "uteslut vägledningar" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "print list of useful guides" msgstr "lista användbara vägledningar" -#: builtin/help.c:48 +#: builtin/help.c:49 +msgid "print all configuration variable names" +msgstr "visa namn på alla konfigurationsvariabler" + +#: builtin/help.c:51 msgid "show man page" msgstr "visa manualsida" -#: builtin/help.c:49 +#: builtin/help.c:52 msgid "show manual in web browser" msgstr "visa manual i webbläsare" -#: builtin/help.c:51 +#: builtin/help.c:54 msgid "show info page" msgstr "visa info-sida" -#: builtin/help.c:53 +#: builtin/help.c:56 msgid "print command description" msgstr "visa kommandobeskrivning" -#: builtin/help.c:58 +#: builtin/help.c:61 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<kommando>]" -#: builtin/help.c:70 +#: builtin/help.c:77 #, c-format msgid "unrecognized help format '%s'" msgstr "okänt hjälpformat: ”%s”" -#: builtin/help.c:97 +#: builtin/help.c:104 msgid "Failed to start emacsclient." msgstr "Misslyckades starta emacsclient." -#: builtin/help.c:110 +#: builtin/help.c:117 msgid "Failed to parse emacsclient version." msgstr "Kunde inte tolka emacsclient-version." -#: builtin/help.c:118 +#: builtin/help.c:125 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient version \"%d\" för gammal (< 22)." -#: builtin/help.c:136 builtin/help.c:158 builtin/help.c:168 builtin/help.c:176 +#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 #, c-format msgid "failed to exec '%s'" msgstr "exec misslyckades för \"%s\"" -#: builtin/help.c:214 +#: builtin/help.c:221 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -9727,7 +13308,7 @@ msgstr "" "\"%s\": sökväg för man-visare som ej stöds.\n" "Använd \"man.<verktyg>.cmd\" istället." -#: builtin/help.c:226 +#: builtin/help.c:233 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -9736,331 +13317,325 @@ msgstr "" "\"%s\": kommando för man-visare som stöds.\n" "Använd \"man.<verktyg>.path\" istället." -#: builtin/help.c:343 +#: builtin/help.c:350 #, c-format msgid "'%s': unknown man viewer." msgstr "\"%s\": okänd man-visare." -#: builtin/help.c:360 +#: builtin/help.c:367 msgid "no man viewer handled the request" msgstr "ingen man-visare hanterade förfrågan" -#: builtin/help.c:368 +#: builtin/help.c:375 msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:415 +#: builtin/help.c:434 builtin/help.c:445 git.c:335 #, c-format msgid "'%s' is aliased to '%s'" msgstr "\"%s\" är ett alias för \"%s\"" -#: builtin/help.c:442 builtin/help.c:459 +#: builtin/help.c:448 git.c:364 +#, c-format +msgid "bad alias.%s string: %s" +msgstr "felaktig alias.%s-sträng: %s" + +#: builtin/help.c:477 builtin/help.c:507 #, c-format msgid "usage: %s%s" msgstr "användning: %s%s" -#: builtin/index-pack.c:158 -#, c-format -msgid "unable to open %s" -msgstr "kunde inte öppna %s" +#: builtin/help.c:491 +msgid "'git help config' for more information" +msgstr "\"git help config\" för mer information" -#: builtin/index-pack.c:208 +#: builtin/index-pack.c:184 #, c-format msgid "object type mismatch at %s" msgstr "objekttyp stämmer inte överens vid %s" -#: builtin/index-pack.c:228 +#: builtin/index-pack.c:204 #, c-format msgid "did not receive expected object %s" msgstr "emottog inte det förväntade objektet %s" -#: builtin/index-pack.c:231 +#: builtin/index-pack.c:207 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objektet %s: förväntad typ %s, såg %s" -#: builtin/index-pack.c:273 +#: builtin/index-pack.c:257 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "kan inte fylla %d byte" msgstr[1] "kan inte fylla %d byte" -#: builtin/index-pack.c:283 +#: builtin/index-pack.c:267 msgid "early EOF" msgstr "tidigt filslut" -#: builtin/index-pack.c:284 +#: builtin/index-pack.c:268 msgid "read error on input" msgstr "indataläsfel" -#: builtin/index-pack.c:296 +#: builtin/index-pack.c:280 msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:303 +#: builtin/index-pack.c:287 builtin/pack-objects.c:600 msgid "pack too large for current definition of off_t" msgstr "paket för stort för nuvarande definition av off_t" -#: builtin/index-pack.c:306 builtin/unpack-objects.c:93 +#: builtin/index-pack.c:290 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "paket är större än tillåten maximal storlek" -#: builtin/index-pack.c:321 +#: builtin/index-pack.c:305 builtin/repack.c:250 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: builtin/index-pack.c:327 +#: builtin/index-pack.c:311 #, c-format msgid "cannot open packfile '%s'" msgstr "kan inte öppna paketfilen \"%s\"" -#: builtin/index-pack.c:341 +#: builtin/index-pack.c:325 msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" -#: builtin/index-pack.c:343 +#: builtin/index-pack.c:327 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stöds ej" -#: builtin/index-pack.c:361 +#: builtin/index-pack.c:345 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s" -#: builtin/index-pack.c:482 +#: builtin/index-pack.c:465 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:514 msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" -#: builtin/index-pack.c:539 +#: builtin/index-pack.c:522 msgid "delta base offset is out of bound" msgstr "deltabasindex utanför gränsen" -#: builtin/index-pack.c:547 +#: builtin/index-pack.c:530 #, c-format msgid "unknown object type %d" msgstr "okänd objekttyp %d" -#: builtin/index-pack.c:578 +#: builtin/index-pack.c:561 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: builtin/index-pack.c:580 +#: builtin/index-pack.c:563 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" -#: builtin/index-pack.c:606 +#: builtin/index-pack.c:589 msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780 -#: builtin/index-pack.c:819 builtin/index-pack.c:828 +#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763 +#: builtin/index-pack.c:802 builtin/index-pack.c:811 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:754 builtin/pack-objects.c:198 -#: builtin/pack-objects.c:292 +#: builtin/index-pack.c:737 builtin/pack-objects.c:153 +#: builtin/pack-objects.c:213 builtin/pack-objects.c:307 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:817 +#: builtin/index-pack.c:800 #, c-format msgid "cannot read existing object info %s" msgstr "kan inte läsa information om befintligt objekt %s" -#: builtin/index-pack.c:825 +#: builtin/index-pack.c:808 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:839 +#: builtin/index-pack.c:822 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:842 builtin/index-pack.c:860 +#: builtin/index-pack.c:825 builtin/index-pack.c:844 msgid "fsck error in packed object" msgstr "fsck-fel i packat objekt" -#: builtin/index-pack.c:857 -#, c-format -msgid "invalid %s" -msgstr "ogiltigt %s" - -#: builtin/index-pack.c:862 +#: builtin/index-pack.c:846 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Inte alla barnobjekt för %s kan nås" -#: builtin/index-pack.c:934 builtin/index-pack.c:965 +#: builtin/index-pack.c:918 builtin/index-pack.c:949 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1135 +#: builtin/index-pack.c:1117 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1135 +#: builtin/index-pack.c:1117 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1169 +#: builtin/index-pack.c:1151 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1174 +#: builtin/index-pack.c:1156 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1177 +#: builtin/index-pack.c:1159 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1189 +#: builtin/index-pack.c:1171 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1212 +#: builtin/index-pack.c:1194 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1223 +#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1265 +#: builtin/index-pack.c:1245 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1251 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "slutfördes med %d lokalt objekt" msgstr[1] "slutfördes med %d lokala objekt" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1263 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1287 +#: builtin/index-pack.c:1267 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paketet har %d oanalyserat delta" msgstr[1] "paketet har %d oanalyserade delta" -#: builtin/index-pack.c:1311 +#: builtin/index-pack.c:1291 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1368 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1382 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1407 #, c-format msgid "cannot write %s file '%s'" msgstr "kan inte ta skriva %s-fil \"%s\"" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1415 #, c-format msgid "cannot close written %s file '%s'" msgstr "kan inte stänga skriven %s-fil \"%s\"" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1439 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1453 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1461 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1521 +#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1590 +#: builtin/index-pack.c:1573 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1592 +#: builtin/index-pack.c:1575 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\"" -#: builtin/index-pack.c:1640 +#: builtin/index-pack.c:1623 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "icke-delta: %d objekt" msgstr[1] "icke-delta: %d objekt" -#: builtin/index-pack.c:1647 +#: builtin/index-pack.c:1630 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "kedjelängd = %d: %lu objekt" msgstr[1] "kedjelängd = %d: %lu objekt" -#: builtin/index-pack.c:1684 +#: builtin/index-pack.c:1667 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1735 builtin/index-pack.c:1738 -#: builtin/index-pack.c:1754 builtin/index-pack.c:1758 +#: builtin/index-pack.c:1716 builtin/index-pack.c:1719 +#: builtin/index-pack.c:1735 builtin/index-pack.c:1739 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1774 +#: builtin/index-pack.c:1755 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1776 +#: builtin/index-pack.c:1757 msgid "--stdin requires a git repository" msgstr "--stdin kräver ett git-arkiv" -#: builtin/index-pack.c:1782 +#: builtin/index-pack.c:1763 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" -#: builtin/index-pack.c:1832 builtin/unpack-objects.c:578 +#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580 msgid "fsck error in pack objects" msgstr "fsck-fel i packat objekt" -#: builtin/init-db.c:55 -#, c-format -msgid "cannot stat '%s'" -msgstr "kan inte ta status på \"%s\"" - #: builtin/init-db.c:61 #, c-format msgid "cannot stat template '%s'" @@ -10071,72 +13646,72 @@ msgstr "kan inte ta status på mallen \"%s\"" msgid "cannot opendir '%s'" msgstr "kan inte öppna katalogen (opendir) \"%s\"" -#: builtin/init-db.c:77 +#: builtin/init-db.c:78 #, c-format msgid "cannot readlink '%s'" msgstr "kan inte läsa länk (readlink) \"%s\"" -#: builtin/init-db.c:79 +#: builtin/init-db.c:80 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\"" -#: builtin/init-db.c:85 +#: builtin/init-db.c:86 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "kan inte kopiera \"%s\" till \"%s\"" -#: builtin/init-db.c:89 +#: builtin/init-db.c:90 #, c-format msgid "ignoring template %s" msgstr "ignorerar mallen %s" -#: builtin/init-db.c:120 +#: builtin/init-db.c:121 #, c-format msgid "templates not found in %s" msgstr "mallarna hittades inte i %s" -#: builtin/init-db.c:135 +#: builtin/init-db.c:136 #, c-format msgid "not copying templates from '%s': %s" msgstr "kopierade inte mallar från \"%s\": %s" -#: builtin/init-db.c:328 +#: builtin/init-db.c:334 #, c-format msgid "unable to handle file type %d" msgstr "kan inte hantera filtyp %d" -#: builtin/init-db.c:331 +#: builtin/init-db.c:337 #, c-format msgid "unable to move %s to %s" msgstr "kan inte flytta %s till %s" -#: builtin/init-db.c:348 builtin/init-db.c:351 +#: builtin/init-db.c:354 builtin/init-db.c:357 #, c-format msgid "%s already exists" msgstr "%s finns redan" -#: builtin/init-db.c:404 +#: builtin/init-db.c:413 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Ominitierade befintligt delat Git-arkiv i %s%s\n" -#: builtin/init-db.c:405 +#: builtin/init-db.c:414 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Ominitierade befintligt Git-arkiv i %s%s\n" -#: builtin/init-db.c:409 +#: builtin/init-db.c:418 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Initierade tomt delat Git-arkiv i %s%s\n" -#: builtin/init-db.c:410 +#: builtin/init-db.c:419 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Initierade tomt Git-arkiv i %s%s\n" -#: builtin/init-db.c:458 +#: builtin/init-db.c:468 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -10144,20 +13719,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" "shared[=<behörigheter>]] [<katalog>]" -#: builtin/init-db.c:481 +#: builtin/init-db.c:491 msgid "permissions" msgstr "behörigheter" -#: builtin/init-db.c:482 +#: builtin/init-db.c:492 msgid "specify that the git repository is to be shared amongst several users" msgstr "ange att git-arkivet skall delas bland flera användare" -#: builtin/init-db.c:525 +#: builtin/init-db.c:526 builtin/init-db.c:531 +#, c-format +msgid "cannot mkdir %s" +msgstr "kan inte skapa katalogen (mkdir) %s" + +#: builtin/init-db.c:535 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:546 +#: builtin/init-db.c:556 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -10166,7 +13746,7 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:574 +#: builtin/init-db.c:584 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" @@ -10179,508 +13759,557 @@ msgstr "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<symbol>[(=|:)<värde>])...] [<fil>...]" -#: builtin/interpret-trailers.c:92 +#: builtin/interpret-trailers.c:94 msgid "edit files in place" msgstr "redigera filer på plats" -#: builtin/interpret-trailers.c:93 +#: builtin/interpret-trailers.c:95 msgid "trim empty trailers" msgstr "ta bort tomma släprader" -#: builtin/interpret-trailers.c:96 +#: builtin/interpret-trailers.c:98 msgid "where to place the new trailer" msgstr "var nya släprader skall placeras" -#: builtin/interpret-trailers.c:98 +#: builtin/interpret-trailers.c:100 msgid "action if trailer already exists" msgstr "att göra om släprader redan finns" -#: builtin/interpret-trailers.c:100 +#: builtin/interpret-trailers.c:102 msgid "action if trailer is missing" msgstr "att göra om släprader saknas" -#: builtin/interpret-trailers.c:102 +#: builtin/interpret-trailers.c:104 msgid "output only the trailers" msgstr "visa endast släprader" -#: builtin/interpret-trailers.c:103 +#: builtin/interpret-trailers.c:105 msgid "do not apply config rules" msgstr "använd inte regler från konfigurationen" -#: builtin/interpret-trailers.c:104 +#: builtin/interpret-trailers.c:106 msgid "join whitespace-continued values" msgstr "slå ihop värden avdelade med blanksteg" -#: builtin/interpret-trailers.c:105 +#: builtin/interpret-trailers.c:107 msgid "set parsing options" msgstr "välj tolkningsalternativ" -#: builtin/interpret-trailers.c:107 +#: builtin/interpret-trailers.c:109 +msgid "do not treat --- specially" +msgstr "tolka inte --- speciellt" + +#: builtin/interpret-trailers.c:110 msgid "trailer" msgstr "släprad" -#: builtin/interpret-trailers.c:108 +#: builtin/interpret-trailers.c:111 msgid "trailer(s) to add" msgstr "släprad(er) att lägga till" -#: builtin/interpret-trailers.c:117 +#: builtin/interpret-trailers.c:120 msgid "--trailer with --only-input does not make sense" msgstr "--trailer med --only-input ger ingen mening" -#: builtin/interpret-trailers.c:127 +#: builtin/interpret-trailers.c:130 msgid "no input file given for in-place editing" msgstr "ingen indatafil angiven för redigering på plats" -#: builtin/log.c:48 +#: builtin/log.c:55 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" -#: builtin/log.c:49 +#: builtin/log.c:56 msgid "git show [<options>] <object>..." msgstr "git show [<flaggor>] <objekt>..." -#: builtin/log.c:93 +#: builtin/log.c:104 #, c-format msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:153 -msgid "suppress diff output" -msgstr "undertryck diff-utdata" - -#: builtin/log.c:154 +#: builtin/log.c:168 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:155 +#: builtin/log.c:169 msgid "Use mail map file" msgstr "Använd e-postmappningsfil" -#: builtin/log.c:157 +#: builtin/log.c:171 msgid "only decorate refs that match <pattern>" msgstr "dekorera endast referenser som motsvarar <mönster>" -#: builtin/log.c:159 +#: builtin/log.c:173 msgid "do not decorate refs that match <pattern>" msgstr "dekorera inte referenser som motsvarar <mönster>" -#: builtin/log.c:160 +#: builtin/log.c:174 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:163 +#: builtin/log.c:177 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:259 +#: builtin/log.c:275 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:510 +#: builtin/log.c:529 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:525 builtin/log.c:619 +#: builtin/log.c:544 builtin/log.c:638 #, c-format -msgid "Could not read object %s" -msgstr "Kunde inte läsa objektet %s" +msgid "could not read object %s" +msgstr "kunde inte läsa objektet %s" -#: builtin/log.c:643 +#: builtin/log.c:663 #, c-format -msgid "Unknown type: %d" -msgstr "Okänd typ: %d" +msgid "unknown type: %d" +msgstr "okänd typ: %d" -#: builtin/log.c:764 +#: builtin/log.c:784 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:865 +#: builtin/log.c:885 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:881 +#: builtin/log.c:901 #, c-format -msgid "Cannot open patch file %s" -msgstr "Kan inte öppna patchfilen %s" +msgid "cannot open patch file %s" +msgstr "kan inte öppna patchfilen %s" -#: builtin/log.c:898 -msgid "Need exactly one range." -msgstr "Behöver precis ett intervall." +#: builtin/log.c:918 +msgid "need exactly one range" +msgstr "behöver precis ett intervall" -#: builtin/log.c:908 -msgid "Not a range." -msgstr "Inte ett intervall." +#: builtin/log.c:928 +msgid "not a range" +msgstr "inte ett intervall" -#: builtin/log.c:1014 -msgid "Cover letter needs email format" -msgstr "Omslagsbrevet behöver e-postformat" +#: builtin/log.c:1051 +msgid "cover letter needs email format" +msgstr "omslagsbrevet behöver e-postformat" -#: builtin/log.c:1095 +#: builtin/log.c:1057 +msgid "failed to create cover-letter file" +msgstr "misslyckades skapa fil för omslagsbrev" + +#: builtin/log.c:1136 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1122 +#: builtin/log.c:1163 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1172 -msgid "Two output directories?" -msgstr "Två utdatakataloger?" +#: builtin/log.c:1221 +msgid "two output directories?" +msgstr "två utdatakataloger?" -#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946 +#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090 #, c-format -msgid "Unknown commit %s" -msgstr "Okänd incheckning %s" +msgid "unknown commit %s" +msgstr "okänd incheckning %s" -#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:523 +#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/replace.c:210 #, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "Kunde inte slå upp \"%s\" som en giltig referens." +msgid "failed to resolve '%s' as a valid ref" +msgstr "misslyckades slå upp \"%s\" som en giltig referens" -#: builtin/log.c:1294 -msgid "Could not find exact merge base." -msgstr "Kunde inte hitta exakt sammanslagningsbas." +#: builtin/log.c:1347 +msgid "could not find exact merge base" +msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1298 +#: builtin/log.c:1351 msgid "" -"Failed to get upstream, if you want to record base commit automatically,\n" +"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" -"Or you could specify base commit by --base=<base-commit-id> manually." +"Or you could specify base commit by --base=<base-commit-id> manually" msgstr "" -"Kunde inte hämta uppström, om du vill lagra basincheckningen automatiskt,\n" +"kunde inte hämta uppström, om du vill lagra basincheckningen automatiskt,\n" "använd git branch --set-upstream-to för att spåra en fjärrgren.\n" -"Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> " -"manuellt." +"Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> manuellt" -#: builtin/log.c:1318 -msgid "Failed to find exact merge base" -msgstr "Kunde inte hitta exakt sammanslagningsbas" +#: builtin/log.c:1371 +msgid "failed to find exact merge base" +msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1329 +#: builtin/log.c:1382 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1333 +#: builtin/log.c:1386 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1382 +#: builtin/log.c:1439 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1441 +#: builtin/log.c:1491 +msgid "failed to infer range-diff ranges" +msgstr "misslyckades räkna ut intervall range-diff" + +#: builtin/log.c:1536 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:1444 +#: builtin/log.c:1539 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1448 +#: builtin/log.c:1543 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1450 +#: builtin/log.c:1545 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1452 +#: builtin/log.c:1547 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1453 +#: builtin/log.c:1548 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1454 +#: builtin/log.c:1549 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1456 +#: builtin/log.c:1551 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1458 +#: builtin/log.c:1553 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1460 +#: builtin/log.c:1555 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Använd [RFC PATCH] istället för [PATCH]" -#: builtin/log.c:1463 +#: builtin/log.c:1558 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1466 +#: builtin/log.c:1561 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1469 +#: builtin/log.c:1564 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1472 +#: builtin/log.c:1567 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1474 +#: builtin/log.c:1569 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1476 +#: builtin/log.c:1571 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1478 +#: builtin/log.c:1573 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1480 +#: builtin/log.c:1575 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1481 +#: builtin/log.c:1576 msgid "header" msgstr "huvud" -#: builtin/log.c:1482 +#: builtin/log.c:1577 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1483 builtin/log.c:1485 +#: builtin/log.c:1578 builtin/log.c:1580 msgid "email" msgstr "epost" -#: builtin/log.c:1483 +#: builtin/log.c:1578 msgid "add To: header" msgstr "lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1485 +#: builtin/log.c:1580 msgid "add Cc: header" msgstr "lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1487 +#: builtin/log.c:1582 msgid "ident" msgstr "ident" -#: builtin/log.c:1488 +#: builtin/log.c:1583 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:1490 +#: builtin/log.c:1585 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1491 +#: builtin/log.c:1586 msgid "make first mail a reply to <message-id>" msgstr "gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1492 builtin/log.c:1495 +#: builtin/log.c:1587 builtin/log.c:1590 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1493 +#: builtin/log.c:1588 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1496 +#: builtin/log.c:1591 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1500 +#: builtin/log.c:1595 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1502 +#: builtin/log.c:1597 msgid "signature" msgstr "signatur" -#: builtin/log.c:1503 +#: builtin/log.c:1598 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1504 +#: builtin/log.c:1599 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1505 +#: builtin/log.c:1600 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1507 +#: builtin/log.c:1602 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1508 +#: builtin/log.c:1603 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1510 +#: builtin/log.c:1605 msgid "show progress while generating patches" msgstr "visa förloppsindikator medan patchar skapas" -#: builtin/log.c:1585 +#: builtin/log.c:1606 +msgid "rev" +msgstr "rev" + +#: builtin/log.c:1607 +msgid "show changes against <rev> in cover letter or single patch" +msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch" + +#: builtin/log.c:1610 +msgid "show changes against <refspec> in cover letter or single patch" +msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch" + +#: builtin/log.c:1612 +msgid "percentage by which creation is weighted" +msgstr "procent som skapelse vägs med" + +#: builtin/log.c:1687 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1600 -msgid "-n and -k are mutually exclusive." -msgstr "-n och -k kan inte användas samtidigt." +#: builtin/log.c:1702 +msgid "-n and -k are mutually exclusive" +msgstr "-n och -k kan inte användas samtidigt" -#: builtin/log.c:1602 -msgid "--subject-prefix/--rfc and -k are mutually exclusive." -msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt." +#: builtin/log.c:1704 +msgid "--subject-prefix/--rfc and -k are mutually exclusive" +msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt" -#: builtin/log.c:1610 +#: builtin/log.c:1712 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1612 +#: builtin/log.c:1714 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1614 +#: builtin/log.c:1716 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1646 +#: builtin/log.c:1748 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1648 +#: builtin/log.c:1837 +msgid "--interdiff requires --cover-letter or single patch" +msgstr "--interdiff kräver --cover-letter eller ensam patch" + +#: builtin/log.c:1841 +msgid "Interdiff:" +msgstr "Interdiff:" + +#: builtin/log.c:1842 #, c-format -msgid "Could not create directory '%s'" -msgstr "Kunde inte skapa katalogen \"%s\"" +msgid "Interdiff against v%d:" +msgstr "Interdiff mot v%d:" -#: builtin/log.c:1741 +#: builtin/log.c:1848 +msgid "--creation-factor requires --range-diff" +msgstr "--creation-factor kräver --range-diff" + +#: builtin/log.c:1852 +msgid "--range-diff requires --cover-letter or single patch" +msgstr "--range-diff kräver --cover-letter eller ensam patch" + +#: builtin/log.c:1860 +msgid "Range-diff:" +msgstr "Intervall-diff:" + +#: builtin/log.c:1861 +#, c-format +msgid "Range-diff against v%d:" +msgstr "Intervall-diff mot v%d:" + +#: builtin/log.c:1872 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:1773 +#: builtin/log.c:1908 msgid "Generating patches" msgstr "Skapar patchar" -#: builtin/log.c:1817 -msgid "Failed to create output files" -msgstr "Misslyckades skapa utdatafiler" +#: builtin/log.c:1952 +msgid "failed to create output files" +msgstr "misslyckades skapa utdatafiler" -#: builtin/log.c:1867 +#: builtin/log.c:2011 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:1921 +#: builtin/log.c:2065 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:470 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<flaggor>] [<fil>...]" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:526 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:528 msgid "use lowercase letters for 'assume unchanged' files" msgstr "använd små bokstäver för \"anta oförändrade\"-filer" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:530 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "använd små bokstäver för \"fsmonitor clean\"-filer" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:532 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:534 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:536 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:538 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:540 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:543 msgid "show staged contents' object name in the output" msgstr "visa köat innehålls objektnamn i utdata" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:545 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:538 +#: builtin/ls-files.c:547 msgid "show 'other' directories' names only" msgstr "visa endast namn för \"andra\" kataloger" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:549 msgid "show line endings of files" msgstr "visa radslut i filer" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:551 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:554 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:556 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:558 msgid "skip files matching pattern" msgstr "hoppa över filer som motsvarar mönster" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:561 msgid "exclude patterns are read from <file>" msgstr "exkludera mönster som läses från <fil>" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:564 msgid "read additional per-directory exclude patterns in <file>" msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:566 msgid "add the standard git exclusions" msgstr "lägg till git:s standardexkluderingar" -#: builtin/ls-files.c:560 +#: builtin/ls-files.c:570 msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:573 msgid "recurse through submodules" msgstr "rekursera ner i undermoduler" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:575 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:566 +#: builtin/ls-files.c:576 msgid "tree-ish" msgstr "träd-igt" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:577 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:569 +#: builtin/ls-files.c:579 msgid "show debugging data" msgstr "visa felsökningsutdata" @@ -10698,7 +14327,7 @@ msgstr "" msgid "do not print remote URL" msgstr "visa inte fjärr-URL" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458 msgid "exec" msgstr "exec" @@ -10722,47 +14351,47 @@ msgstr "visa inte avskalade taggar" msgid "take url.<base>.insteadOf into account" msgstr "ta hänsyn till url.<bas>.insteadOf" -#: builtin/ls-remote.c:73 +#: builtin/ls-remote.c:72 msgid "exit with exit code 2 if no matching refs are found" msgstr "avsluta med felkod 2 om motsvarande referenser inte hittas" -#: builtin/ls-remote.c:76 +#: builtin/ls-remote.c:75 msgid "show underlying ref in addition to the object pointed by it" msgstr "visa underliggande referens och objektet det pekar på" -#: builtin/ls-tree.c:29 +#: builtin/ls-tree.c:30 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]" -#: builtin/ls-tree.c:127 +#: builtin/ls-tree.c:128 msgid "only show trees" msgstr "visa endast träd" -#: builtin/ls-tree.c:129 +#: builtin/ls-tree.c:130 msgid "recurse into subtrees" msgstr "rekursera ner i underträd" -#: builtin/ls-tree.c:131 +#: builtin/ls-tree.c:132 msgid "show trees when recursing" msgstr "visa träd medan rekursering" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "terminate entries with NUL byte" msgstr "terminera poster med NUL-byte" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:136 msgid "include object size" msgstr "inkludera objektstorlek" -#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 +#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 msgid "list only filenames" msgstr "visa endast filnamn" -#: builtin/ls-tree.c:142 +#: builtin/ls-tree.c:143 msgid "use full path names" msgstr "använd fullständiga sökvägsnamn" -#: builtin/ls-tree.c:144 +#: builtin/ls-tree.c:145 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" @@ -10771,261 +14400,274 @@ msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" msgid "empty mbox: '%s'" msgstr "tom mbox: ”%s”" -#: builtin/merge.c:51 +#: builtin/merge.c:54 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<flaggor>] [<incheckning>...]" -#: builtin/merge.c:52 +#: builtin/merge.c:55 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:53 +#: builtin/merge.c:56 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:110 +#: builtin/merge.c:116 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:147 +#: builtin/merge.c:139 +#, c-format +msgid "option `%s' requires a value" +msgstr "flaggan \"%s\" behöver ett värde" + +#: builtin/merge.c:185 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:148 +#: builtin/merge.c:186 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:153 +#: builtin/merge.c:191 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:203 builtin/pull.c:142 +#: builtin/merge.c:242 builtin/pull.c:150 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:206 builtin/pull.c:145 +#: builtin/merge.c:245 builtin/pull.c:153 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:207 builtin/pull.c:148 +#: builtin/merge.c:246 builtin/pull.c:156 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:209 builtin/pull.c:151 +#: builtin/merge.c:248 builtin/pull.c:159 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:212 builtin/pull.c:157 +#: builtin/merge.c:251 builtin/pull.c:165 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:214 builtin/pull.c:160 +#: builtin/merge.c:253 builtin/pull.c:168 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:216 builtin/pull.c:163 +#: builtin/merge.c:255 builtin/pull.c:171 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:217 +#: builtin/merge.c:257 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:219 builtin/pull.c:169 +#: builtin/merge.c:259 builtin/pull.c:178 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:223 builtin/pull.c:172 +#: builtin/merge.c:263 builtin/pull.c:181 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:224 builtin/notes.c:777 builtin/pull.c:176 -#: builtin/revert.c:109 +#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185 +#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:225 builtin/pull.c:177 +#: builtin/merge.c:265 builtin/pull.c:186 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:226 builtin/pull.c:180 +#: builtin/merge.c:266 builtin/pull.c:189 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:227 builtin/pull.c:181 +#: builtin/merge.c:267 builtin/pull.c:190 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:229 +#: builtin/merge.c:269 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:233 +#: builtin/merge.c:276 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:235 +#: builtin/merge.c:278 msgid "continue the current in-progress merge" msgstr "fortsätt den pågående sammanslagningen" -#: builtin/merge.c:237 builtin/pull.c:188 +#: builtin/merge.c:280 builtin/pull.c:197 msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" -#: builtin/merge.c:243 +#: builtin/merge.c:286 msgid "verify commit-msg hook" msgstr "bekräfta commit-msg-krok" -#: builtin/merge.c:268 +#: builtin/merge.c:311 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:273 +#: builtin/merge.c:316 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:278 +#: builtin/merge.c:321 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:300 builtin/merge.c:317 +#: builtin/merge.c:343 builtin/merge.c:360 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:347 +#: builtin/merge.c:390 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:358 +#: builtin/merge.c:401 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:408 +#: builtin/merge.c:451 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:458 +#: builtin/merge.c:502 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:548 +#: builtin/merge.c:589 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:669 +#: builtin/merge.c:712 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:683 +#: builtin/merge.c:726 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:698 +#: builtin/merge.c:741 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:749 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:758 +#: builtin/merge.c:802 #, 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:764 -#, c-format +#: builtin/merge.c:808 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" -"Lines starting with '%c' will be ignored, and an empty message aborts\n" -"the commit.\n" msgstr "" "Ange ett incheckningsmeddelande för att förklara varför sammanslagningen\n" "är nödvändig, speciellt om den slår in en uppdaterad uppström i en\n" "temagren.\n" "\n" + +#: builtin/merge.c:813 +msgid "An empty message aborts the commit.\n" +msgstr "Ett tomt meddelande avbryter incheckningen.\n" + +#: builtin/merge.c:816 +#, c-format +msgid "" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:800 +#: builtin/merge.c:857 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:819 +#: builtin/merge.c:876 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:872 +#: builtin/merge.c:936 #, 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:911 +#: builtin/merge.c:975 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:913 +#: builtin/merge.c:977 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:915 +#: builtin/merge.c:979 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:920 +#: builtin/merge.c:984 #, 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:973 +#: builtin/merge.c:1041 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1075 +#: builtin/merge.c:1144 #, 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:1109 +#: builtin/merge.c:1178 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1211 +#: builtin/merge.c:1281 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1215 +#: builtin/merge.c:1285 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1227 +#: builtin/merge.c:1297 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1231 +#: builtin/merge.c:1301 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1247 +#: builtin/merge.c:1317 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -11033,7 +14675,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1254 +#: builtin/merge.c:1324 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -11041,156 +14683,134 @@ 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:1257 +#: builtin/merge.c:1327 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:1266 +#: builtin/merge.c:1341 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1274 +#: builtin/merge.c:1349 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1291 +#: builtin/merge.c:1366 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1293 +#: builtin/merge.c:1368 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:1298 +#: builtin/merge.c:1373 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1300 +#: builtin/merge.c:1375 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:1334 -#, 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:1337 -#, 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:1340 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "Incheckning %s har inte någon GPG-signatur." - -#: builtin/merge.c:1343 -#, 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:1402 +#: builtin/merge.c:1454 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1411 +#: builtin/merge.c:1463 msgid "Already up to date." msgstr "Redan à jour." -#: builtin/merge.c:1421 +#: builtin/merge.c:1473 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1462 +#: builtin/merge.c:1515 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1469 +#: builtin/merge.c:1522 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1494 +#: builtin/merge.c:1547 msgid "Already up to date. Yeeah!" msgstr "Redan à jour. Toppen!" -#: builtin/merge.c:1500 +#: builtin/merge.c:1553 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1576 builtin/merge.c:1655 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1527 +#: builtin/merge.c:1580 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1646 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1595 +#: builtin/merge.c:1648 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1604 +#: builtin/merge.c:1657 #, 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:1616 +#: builtin/merge.c:1669 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n" -#: builtin/merge-base.c:30 +#: builtin/merge-base.c:32 msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "git merge-base [-a | --all] <incheckning> <incheckning>..." -#: builtin/merge-base.c:31 +#: builtin/merge-base.c:33 msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <incheckning>..." -#: builtin/merge-base.c:32 +#: builtin/merge-base.c:34 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <incheckning>..." -#: builtin/merge-base.c:33 +#: builtin/merge-base.c:35 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <incheckning> <incheckning>" -#: builtin/merge-base.c:34 +#: builtin/merge-base.c:36 msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <ref> [<incheckning>]" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:153 msgid "output all common ancestors" msgstr "skriv ut alla gemensamma anfäder" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:155 msgid "find ancestors for a single n-way merge" msgstr "hitta anfader för enkel n-vägssammanslagning" -#: builtin/merge-base.c:224 +#: builtin/merge-base.c:157 msgid "list revs not reachable from others" msgstr "visa revisioner som inte kan nås från andra" -#: builtin/merge-base.c:226 +#: builtin/merge-base.c:159 msgid "is the first one ancestor of the other?" msgstr "är den första anfader till den andra?" -#: builtin/merge-base.c:228 +#: builtin/merge-base.c:161 msgid "find where <commit> forked from reflog of <ref>" msgstr "se var <incheckning> grenades av från referensloggen från <ref>" @@ -11202,227 +14822,244 @@ msgstr "" "git merge-file [<alternativ>] [-L <namn1> [-L <orig> [-L <namn2>]]] <fil1> " "<origfil> <fil2>" -#: builtin/merge-file.c:33 +#: builtin/merge-file.c:35 msgid "send results to standard output" msgstr "sänd resultat till standard ut" -#: builtin/merge-file.c:34 +#: builtin/merge-file.c:36 msgid "use a diff3 based merge" msgstr "använd diff3-baserad sammanslagning" -#: builtin/merge-file.c:35 +#: builtin/merge-file.c:37 msgid "for conflicts, use our version" msgstr "för konflikter, använd vår version" -#: builtin/merge-file.c:37 +#: builtin/merge-file.c:39 msgid "for conflicts, use their version" msgstr "för konflikter, använd deras version" -#: builtin/merge-file.c:39 +#: builtin/merge-file.c:41 msgid "for conflicts, use a union version" msgstr "för konflikter, använd en förenad version" -#: builtin/merge-file.c:42 +#: builtin/merge-file.c:44 msgid "for conflicts, use this marker size" msgstr "för konflikter, använd denna markörstorlek" -#: builtin/merge-file.c:43 +#: builtin/merge-file.c:45 msgid "do not warn about conflicts" msgstr "varna inte om konflikter" -#: builtin/merge-file.c:45 +#: builtin/merge-file.c:47 msgid "set labels for file1/orig-file/file2" msgstr "sätt etiketter för fil1/origfil/fil2" -#: builtin/merge-recursive.c:45 +#: builtin/merge-recursive.c:46 #, c-format msgid "unknown option %s" msgstr "okänd flagga %s" -#: builtin/merge-recursive.c:51 +#: builtin/merge-recursive.c:52 #, c-format msgid "could not parse object '%s'" msgstr "kunde inte tolka objektet \"%s\"" -#: builtin/merge-recursive.c:55 +#: builtin/merge-recursive.c:56 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "kan inte hantera mer än %d bas. Ignorerar %s." msgstr[1] "kan inte hantera mer än %d baser. Ignorerar %s." -#: builtin/merge-recursive.c:63 +#: builtin/merge-recursive.c:64 msgid "not handling anything other than two heads merge." msgstr "hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 +#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 #, c-format msgid "could not resolve ref '%s'" msgstr "kunde inte bestämma referensen ”%s”" -#: builtin/merge-recursive.c:77 +#: builtin/merge-recursive.c:78 #, c-format msgid "Merging %s with %s\n" msgstr "Slår ihop %s med %s\n" -#: builtin/mktree.c:65 +#: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" -#: builtin/mktree.c:153 +#: builtin/mktree.c:154 msgid "input is NUL terminated" msgstr "indata är NUL-terminerad" -#: builtin/mktree.c:154 builtin/write-tree.c:25 +#: builtin/mktree.c:155 builtin/write-tree.c:26 msgid "allow missing objects" msgstr "tillåt saknade objekt" -#: builtin/mktree.c:155 +#: builtin/mktree.c:156 msgid "allow creation of more than one tree" msgstr "tillåt skapa mer än ett träd" -#: builtin/mv.c:17 +#: builtin/multi-pack-index.c:9 +msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)" +msgstr "git multi-pack-index [--object-dir=<kat>] (write|verify)" + +#: builtin/multi-pack-index.c:22 +msgid "object directory containing set of packfile and pack-index pairs" +msgstr "objektkatalog med uppsättning av par med paketfiler och pack-index" + +#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67 +msgid "too many arguments" +msgstr "för många argument" + +#: builtin/multi-pack-index.c:51 +#, c-format +msgid "unrecognized verb: %s" +msgstr "okänt verb: %s" + +#: builtin/mv.c:18 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<flaggor>] <källa>... <mål>" -#: builtin/mv.c:82 +#: builtin/mv.c:83 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "Katalogen %s är i indexet och inte en undermodul?" -#: builtin/mv.c:84 builtin/rm.c:288 +#: builtin/mv.c:85 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta" -#: builtin/mv.c:102 +#: builtin/mv.c:103 #, c-format msgid "%.*s is in index" msgstr "%.*s är i indexet" -#: builtin/mv.c:124 +#: builtin/mv.c:125 msgid "force move/rename even if target exists" msgstr "tvinga flytta/ändra namn även om målet finns" -#: builtin/mv.c:126 +#: builtin/mv.c:127 msgid "skip move/rename errors" msgstr "hoppa över fel vid flytt/namnändring" -#: builtin/mv.c:168 +#: builtin/mv.c:169 #, c-format msgid "destination '%s' is not a directory" msgstr "destinationen \"%s\" är ingen katalog" -#: builtin/mv.c:179 +#: builtin/mv.c:180 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n" -#: builtin/mv.c:183 +#: builtin/mv.c:184 msgid "bad source" msgstr "felaktig källa" -#: builtin/mv.c:186 +#: builtin/mv.c:187 msgid "can not move directory into itself" msgstr "kan inte flytta katalog till sig själv" -#: builtin/mv.c:189 +#: builtin/mv.c:190 msgid "cannot move directory over file" msgstr "kan inte flytta katalog över fil" -#: builtin/mv.c:198 +#: builtin/mv.c:199 msgid "source directory is empty" msgstr "källkatalogen är tom" -#: builtin/mv.c:223 +#: builtin/mv.c:224 msgid "not under version control" msgstr "inte versionshanterad" -#: builtin/mv.c:226 +#: builtin/mv.c:227 msgid "destination exists" msgstr "destinationen finns" -#: builtin/mv.c:234 +#: builtin/mv.c:235 #, c-format msgid "overwriting '%s'" msgstr "skriver över \"%s\"" -#: builtin/mv.c:237 +#: builtin/mv.c:238 msgid "Cannot overwrite" msgstr "Kan inte skriva över" -#: builtin/mv.c:240 +#: builtin/mv.c:241 msgid "multiple sources for the same target" msgstr "flera källor för samma mål" -#: builtin/mv.c:242 +#: builtin/mv.c:243 msgid "destination directory does not exist" msgstr "destinationskatalogen finns inte" -#: builtin/mv.c:249 +#: builtin/mv.c:250 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, källa=%s, mål=%s" -#: builtin/mv.c:270 +#: builtin/mv.c:271 #, c-format msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:276 builtin/remote.c:715 builtin/repack.c:409 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" -#: builtin/name-rev.c:338 +#: builtin/name-rev.c:355 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<flaggor>] <incheckning>..." -#: builtin/name-rev.c:339 +#: builtin/name-rev.c:356 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<flaggor>] --all" -#: builtin/name-rev.c:340 +#: builtin/name-rev.c:357 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<flaggor>] --stdin" -#: builtin/name-rev.c:395 +#: builtin/name-rev.c:415 msgid "print only names (no SHA-1)" msgstr "skriv endast namn (ingen SHA-1)" -#: builtin/name-rev.c:396 +#: builtin/name-rev.c:416 msgid "only use tags to name the commits" msgstr "använd endast taggar för att namnge incheckningar" -#: builtin/name-rev.c:398 +#: builtin/name-rev.c:418 msgid "only use refs matching <pattern>" msgstr "använd endast referenser som motsvarar <mönster>" -#: builtin/name-rev.c:400 +#: builtin/name-rev.c:420 msgid "ignore refs matching <pattern>" msgstr "ignorera referenser som motsvarar <mönster>" -#: builtin/name-rev.c:402 +#: builtin/name-rev.c:422 msgid "list all commits reachable from all refs" msgstr "lista alla incheckningar som kan nås alla referenser" -#: builtin/name-rev.c:403 +#: builtin/name-rev.c:423 msgid "read from stdin" msgstr "läs från standard in" -#: builtin/name-rev.c:404 +#: builtin/name-rev.c:424 msgid "allow to print `undefined` names (default)" msgstr "tillåt att skriva \"odefinierade\" namn (standard)" -#: builtin/name-rev.c:410 +#: builtin/name-rev.c:430 msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" -#: builtin/notes.c:26 +#: builtin/notes.c:28 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]" -#: builtin/notes.c:27 +#: builtin/notes.c:29 msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" @@ -11430,12 +15067,12 @@ msgstr "" "git notes [--ref <anteckningsref>] add [-f] [--allow-empty] [-m <medd> | -F " "<fil> | (-c | -C) <objekt>] [<objekt>]" -#: builtin/notes.c:28 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" "git notes [--ref <anteckningsref>] copy [-f] <från-objekt> <till-objekt>" -#: builtin/notes.c:29 +#: builtin/notes.c:31 msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" @@ -11443,157 +15080,152 @@ msgstr "" "git notes [--ref <anteckningsref>] append [--allow-empty] [-m <medd> | -F " "<fil> | (-c | -C) <objekt>] [<objekt>]" -#: builtin/notes.c:30 +#: builtin/notes.c:32 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <anteckningsref>] edit [--allow-empty] [<objekt>]" -#: builtin/notes.c:31 +#: builtin/notes.c:33 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <anteckningsref>] show [<objekt>]" -#: builtin/notes.c:32 +#: builtin/notes.c:34 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" "git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi>] " "<anteckningsref>" -#: builtin/notes.c:33 +#: builtin/notes.c:35 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:34 +#: builtin/notes.c:36 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:35 +#: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]" -#: builtin/notes.c:36 +#: builtin/notes.c:38 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" msgstr "git notes [--ref <anteckningsref>] prune [-n] [-v]" -#: builtin/notes.c:37 +#: builtin/notes.c:39 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <anteckningsref>] get-ref" -#: builtin/notes.c:42 +#: builtin/notes.c:44 msgid "git notes [list [<object>]]" msgstr "git notes [list [<objekt>]]" -#: builtin/notes.c:47 +#: builtin/notes.c:49 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<flaggor>] [<objekt>]" -#: builtin/notes.c:52 +#: builtin/notes.c:54 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<flaggor>] <från-objekt> <till-objekt>" -#: builtin/notes.c:53 +#: builtin/notes.c:55 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<från-objekt> <till-objekt>]..." -#: builtin/notes.c:58 +#: builtin/notes.c:60 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<flaggor>] [<objekt>]" -#: builtin/notes.c:63 +#: builtin/notes.c:65 msgid "git notes edit [<object>]" msgstr "git notes edit [<objekt>]" -#: builtin/notes.c:68 +#: builtin/notes.c:70 msgid "git notes show [<object>]" msgstr "git notes show [<objekt>]" -#: builtin/notes.c:73 +#: builtin/notes.c:75 msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<flaggor>] <anteckningsref>" -#: builtin/notes.c:74 +#: builtin/notes.c:76 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<flaggor>]" -#: builtin/notes.c:75 +#: builtin/notes.c:77 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<flaggor>]" -#: builtin/notes.c:80 +#: builtin/notes.c:82 msgid "git notes remove [<object>]" msgstr "git notes remove [<objekt>]" -#: builtin/notes.c:85 +#: builtin/notes.c:87 msgid "git notes prune [<options>]" msgstr "git notes prune [<flaggor>]" -#: builtin/notes.c:90 +#: builtin/notes.c:92 msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:95 +#: builtin/notes.c:97 msgid "Write/edit the notes for the following object:" msgstr "Skriv/redigera anteckningar för följande objekt:" -#: builtin/notes.c:148 +#: builtin/notes.c:150 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "kunde inte starta \"show\" för objektet \"%s\"" -#: builtin/notes.c:152 +#: builtin/notes.c:154 msgid "could not read 'show' output" msgstr "kunde inte läsa utdata från \"show\"" -#: builtin/notes.c:160 +#: builtin/notes.c:162 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "kunde inte avsluta \"show\" för objektet \"%s\"" -#: builtin/notes.c:195 +#: builtin/notes.c:197 msgid "please supply the note contents using either -m or -F option" msgstr "ange innehåll för anteckningen med antingen -m eller -F" -#: builtin/notes.c:204 +#: builtin/notes.c:206 msgid "unable to write note object" msgstr "kunde inte skriva anteckningsobjekt" -#: builtin/notes.c:206 +#: builtin/notes.c:208 #, c-format msgid "the note contents have been left in %s" msgstr "anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:234 builtin/tag.c:507 -#, c-format -msgid "cannot read '%s'" -msgstr "kunde inte läsa \"%s\"" - -#: builtin/notes.c:236 builtin/tag.c:510 +#: builtin/notes.c:242 builtin/tag.c:522 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" -#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 -#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 -#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 +#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 +#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526 +#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/notes.c:258 +#: builtin/notes.c:265 #, c-format msgid "failed to read object '%s'." msgstr "kunde inte läsa objektet \"%s\"." -#: builtin/notes.c:262 +#: builtin/notes.c:268 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "kan inte läsa anteckningsdata från icke-blob-objektet \"%s\"." -#: builtin/notes.c:302 +#: builtin/notes.c:309 #, c-format msgid "malformed input line: '%s'." msgstr "felaktig indatarad: \"%s\"." -#: builtin/notes.c:317 +#: builtin/notes.c:324 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\"" @@ -11601,47 +15233,47 @@ msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\"" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c:349 +#: builtin/notes.c:356 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "vägrar utföra \"%s\" på anteckningar i %s (utanför refs/notes/)" -#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 -#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 -#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 +#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 +#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 msgid "too many parameters" msgstr "för många parametrar" -#: builtin/notes.c:382 builtin/notes.c:668 +#: builtin/notes.c:389 builtin/notes.c:678 #, c-format msgid "no note found for object %s." msgstr "inga anteckningar hittades för objektet %s." -#: builtin/notes.c:403 builtin/notes.c:566 +#: builtin/notes.c:410 builtin/notes.c:576 msgid "note contents as a string" msgstr "anteckningsinnehåll som sträng" -#: builtin/notes.c:406 builtin/notes.c:569 +#: builtin/notes.c:413 builtin/notes.c:579 msgid "note contents in a file" msgstr "anteckningsinnehåll i en fil" -#: builtin/notes.c:409 builtin/notes.c:572 +#: builtin/notes.c:416 builtin/notes.c:582 msgid "reuse and edit specified note object" msgstr "återanvänd och redigera angivet anteckningsobjekt" -#: builtin/notes.c:412 builtin/notes.c:575 +#: builtin/notes.c:419 builtin/notes.c:585 msgid "reuse specified note object" msgstr "återanvänd angivet anteckningsobjekt" -#: builtin/notes.c:415 builtin/notes.c:578 +#: builtin/notes.c:422 builtin/notes.c:588 msgid "allow storing empty note" msgstr "tillåt lagra tom anteckning" -#: builtin/notes.c:416 builtin/notes.c:487 +#: builtin/notes.c:423 builtin/notes.c:496 msgid "replace existing notes" msgstr "ersätt befintliga anteckningar" -#: builtin/notes.c:441 +#: builtin/notes.c:448 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -11650,29 +15282,29 @@ msgstr "" "Kan inte lägga till anteckningar. Hittade befintliga anteckningar för " "objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:456 builtin/notes.c:535 +#: builtin/notes.c:463 builtin/notes.c:544 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Skriver över befintliga anteckningar för objektet %s\n" -#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 +#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902 #, c-format msgid "Removing note for object %s\n" msgstr "Tar bort anteckning för objektet %s\n" -#: builtin/notes.c:488 +#: builtin/notes.c:497 msgid "read objects from stdin" msgstr "läs objekt från standard in" -#: builtin/notes.c:490 +#: builtin/notes.c:499 msgid "load rewriting config for <command> (implies --stdin)" msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)" -#: builtin/notes.c:508 +#: builtin/notes.c:517 msgid "too few parameters" msgstr "för få parametrar" -#: builtin/notes.c:529 +#: builtin/notes.c:538 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -11681,12 +15313,12 @@ msgstr "" "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet " "%s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:541 +#: builtin/notes.c:550 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "anteckningar på källobjektet %s saknas. Kan inte kopiera." -#: builtin/notes.c:593 +#: builtin/notes.c:603 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -11695,52 +15327,52 @@ msgstr "" "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n" "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n" -#: builtin/notes.c:688 +#: builtin/notes.c:698 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "misslyckades ta bort referensen NOTES_MERGE_PARTIAL" -#: builtin/notes.c:690 +#: builtin/notes.c:700 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "misslyckades ta bort referensen NOTES_MERGE_REF" -#: builtin/notes.c:692 +#: builtin/notes.c:702 msgid "failed to remove 'git notes merge' worktree" msgstr "misslyckades ta bort arbetskatalogen för \"git notes merge\"" -#: builtin/notes.c:712 +#: builtin/notes.c:722 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "misslyckades läsa references NOTES_MERGE_PARTIAL" -#: builtin/notes.c:714 +#: builtin/notes.c:724 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "kunde inte hitta incheckning från NOTES_MERGE_PARTIAL." -#: builtin/notes.c:716 +#: builtin/notes.c:726 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "kunde inte tolka incheckning från NOTES_MERGE_PARTIAL." -#: builtin/notes.c:729 +#: builtin/notes.c:739 msgid "failed to resolve NOTES_MERGE_REF" msgstr "misslyckades bestämma NOTES_MERGE_REF" -#: builtin/notes.c:732 +#: builtin/notes.c:742 msgid "failed to finalize notes merge" msgstr "misslyckades färdigställa sammanslagning av anteckningar" -#: builtin/notes.c:758 +#: builtin/notes.c:768 #, c-format msgid "unknown notes merge strategy %s" msgstr "okänd sammanslagningsstrategi för anteckningar: %s" -#: builtin/notes.c:774 +#: builtin/notes.c:784 msgid "General options" msgstr "Allmänna flaggor" -#: builtin/notes.c:776 +#: builtin/notes.c:786 msgid "Merge options" msgstr "Flaggor för sammanslagning" -#: builtin/notes.c:778 +#: builtin/notes.c:788 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -11748,48 +15380,48 @@ msgstr "" "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:780 +#: builtin/notes.c:790 msgid "Committing unmerged notes" msgstr "Checkar in ej sammanslagna anteckningar" -#: builtin/notes.c:782 +#: builtin/notes.c:792 msgid "finalize notes merge by committing unmerged notes" msgstr "" "färdigställ sammanslagning av anteckningar genom att checka in ej " "sammanslagna anteckningar" -#: builtin/notes.c:784 +#: builtin/notes.c:794 msgid "Aborting notes merge resolution" msgstr "Avbryt lösning av sammanslagning av anteckningar" -#: builtin/notes.c:786 +#: builtin/notes.c:796 msgid "abort notes merge" msgstr "avbryt sammanslagning av anteckningar" -#: builtin/notes.c:797 +#: builtin/notes.c:807 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "kan inte blanda --commit, --abort eller -s/--strategy" -#: builtin/notes.c:802 +#: builtin/notes.c:812 msgid "must specify a notes ref to merge" msgstr "måste ange en antecknings-referens att slå ihop" -#: builtin/notes.c:826 +#: builtin/notes.c:836 #, c-format msgid "unknown -s/--strategy: %s" msgstr "okänd -s/--strategy: %s" -#: builtin/notes.c:863 +#: builtin/notes.c:873 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "sammanslagning av anteckningar till %s är redan igångsatt på %s" -#: builtin/notes.c:866 +#: builtin/notes.c:876 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "misslyckades lagra länk till aktuell anteckningsreferens (%s)" -#: builtin/notes.c:868 +#: builtin/notes.c:878 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -11800,264 +15432,431 @@ msgstr "" "%s och checka in resultatet med \"git notes merge --commit\", eller avbryt " "sammanslagningen med \"git notes merge --abort\".\n" -#: builtin/notes.c:890 +#: builtin/notes.c:897 builtin/tag.c:535 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Kunde inte slå upp \"%s\" som en giltig referens." + +#: builtin/notes.c:900 #, c-format msgid "Object %s has no note\n" msgstr "Objektet %s har ingen anteckning\n" -#: builtin/notes.c:902 +#: builtin/notes.c:912 msgid "attempt to remove non-existent note is not an error" msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel" -#: builtin/notes.c:905 +#: builtin/notes.c:915 msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: builtin/notes.c:943 builtin/prune.c:107 builtin/worktree.c:151 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" -#: builtin/notes.c:944 +#: builtin/notes.c:955 msgid "report pruned notes" msgstr "rapportera borttagna anteckningar" -#: builtin/notes.c:986 +#: builtin/notes.c:998 msgid "notes-ref" msgstr "anteckningar-ref" -#: builtin/notes.c:987 +#: builtin/notes.c:999 msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1022 +#: builtin/notes.c:1034 builtin/stash.c:1611 #, c-format msgid "unknown subcommand: %s" msgstr "okänt underkommando: %s" -#: builtin/pack-objects.c:48 +#: builtin/pack-objects.c:52 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:49 +#: builtin/pack-objects.c:53 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:211 builtin/pack-objects.c:214 +#: builtin/pack-objects.c:424 #, c-format -msgid "deflate error (%d)" -msgstr "fel i deflate (%d)" +msgid "bad packed object CRC for %s" +msgstr "felaktig CRC för packat objekt %s" + +#: builtin/pack-objects.c:435 +#, c-format +msgid "corrupt packed object for %s" +msgstr "trasigt packat objekt för %s" + +#: builtin/pack-objects.c:566 +#, c-format +msgid "recursive delta detected for object %s" +msgstr "rekursivt delta upptäcktes för objektet %s" + +#: builtin/pack-objects.c:777 +#, c-format +msgid "ordered %u objects, expected %<PRIu32>" +msgstr "ordnade %u objekt, förväntade %<PRIu32>" -#: builtin/pack-objects.c:810 +#: builtin/pack-objects.c:790 +#, c-format +msgid "packfile is invalid: %s" +msgstr "packfil är ogiltig: %s" + +#: builtin/pack-objects.c:794 +#, c-format +msgid "unable to open packfile for reuse: %s" +msgstr "kan inte öppna packfil för återanvändning: %s" + +#: builtin/pack-objects.c:798 +msgid "unable to seek in reused packfile" +msgstr "kan inte söka i återanvänd packfil" + +#: builtin/pack-objects.c:809 +msgid "unable to read from reused packfile" +msgstr "kan inte läsa från återanvänd packfil" + +#: builtin/pack-objects.c:837 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:823 +#: builtin/pack-objects.c:850 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1106 +#: builtin/pack-objects.c:912 builtin/update-index.c:89 +#, c-format +msgid "failed to stat %s" +msgstr "misslyckades ta status på %s" + +#: builtin/pack-objects.c:965 +#, c-format +msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" +msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades" + +#: builtin/pack-objects.c:1161 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:1765 +#: builtin/pack-objects.c:1589 +#, c-format +msgid "delta base offset overflow in pack for %s" +msgstr "deltabasoffset utanför gränsen i pack för %s" + +#: builtin/pack-objects.c:1598 +#, c-format +msgid "delta base offset out of bound for %s" +msgstr "deltabasoffset utanför gränsvärden för %s" + +#: builtin/pack-objects.c:1867 msgid "Counting objects" msgstr "Räknar objekt" -#: builtin/pack-objects.c:1895 +#: builtin/pack-objects.c:1997 #, c-format msgid "unable to get size of %s" msgstr "kan inte hämta storlek på %s" -#: builtin/pack-objects.c:1910 +#: builtin/pack-objects.c:2012 #, c-format msgid "unable to parse object header of %s" msgstr "kunde inte tolka objekthuvud för %s" -#: builtin/pack-objects.c:2564 +#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098 +#: builtin/pack-objects.c:2108 +#, c-format +msgid "object %s cannot be read" +msgstr "objektet %s kunde inte läsas" + +#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112 +#, c-format +msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" +msgstr "objektet %s har inkonsistent objektlängd (%<PRIuMAX> mot %<PRIuMAX>)" + +#: builtin/pack-objects.c:2122 +msgid "suboptimal pack - out of memory" +msgstr "icke-optimalt pack - minnet slut" + +#: builtin/pack-objects.c:2448 +#, c-format +msgid "Delta compression using up to %d threads" +msgstr "Deltakomprimering använder upp till %d trådar" + +#: builtin/pack-objects.c:2580 +#, c-format +msgid "unable to pack objects reachable from tag %s" +msgstr "kan inte packa objekt nåbara från taggen %s" + +#: builtin/pack-objects.c:2667 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2735 +#: builtin/pack-objects.c:2673 +msgid "inconsistency with delta count" +msgstr "deltaräknaren är inkonsekvent" + +#: builtin/pack-objects.c:2754 +#, c-format +msgid "" +"expected edge object ID, got garbage:\n" +" %s" +msgstr "" +"förväntade kant-objekt-id, fick skräp:\n" +" %s" + +#: builtin/pack-objects.c:2760 +#, c-format +msgid "" +"expected object ID, got garbage:\n" +" %s" +msgstr "" +"förväntade objekt-id, fick skräp:\n" +" %s" + +#: builtin/pack-objects.c:2858 msgid "invalid value for --missing" msgstr "ogiltigt värde för --missing" -#: builtin/pack-objects.c:3067 +#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025 +msgid "cannot open pack index" +msgstr "kan inte öppna paketfilen" + +#: builtin/pack-objects.c:2948 +#, c-format +msgid "loose object at %s could not be examined" +msgstr "lösa objekt på %s kunde inte underökas" + +#: builtin/pack-objects.c:3033 +msgid "unable to force loose object" +msgstr "kan inte tvinga lösa objekt" + +#: builtin/pack-objects.c:3125 +#, c-format +msgid "not a rev '%s'" +msgstr "inte en referens \"%s\"" + +#: builtin/pack-objects.c:3128 +#, c-format +msgid "bad revision '%s'" +msgstr "felaktig revision \"%s\"" + +#: builtin/pack-objects.c:3153 +msgid "unable to add recent objects" +msgstr "kan inte lägga till nya objekt" + +#: builtin/pack-objects.c:3206 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:3071 +#: builtin/pack-objects.c:3210 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:3102 +#: builtin/pack-objects.c:3240 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:3104 +#: builtin/pack-objects.c:3242 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:3106 +#: builtin/pack-objects.c:3244 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:3109 +#: builtin/pack-objects.c:3247 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" -#: builtin/pack-objects.c:3110 -msgid "version[,offset]" -msgstr "version[,offset]" +#: builtin/pack-objects.c:3248 +msgid "<version>[,<offset>]" +msgstr "<version>[,<offset>]" -#: builtin/pack-objects.c:3111 +#: builtin/pack-objects.c:3249 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:3114 +#: builtin/pack-objects.c:3252 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:3116 +#: builtin/pack-objects.c:3254 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:3118 +#: builtin/pack-objects.c:3256 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:3120 +#: builtin/pack-objects.c:3258 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:3122 +#: builtin/pack-objects.c:3260 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:3124 +#: builtin/pack-objects.c:3262 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:3126 +#: builtin/pack-objects.c:3264 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:3128 +#: builtin/pack-objects.c:3266 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:3130 +#: builtin/pack-objects.c:3268 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:3132 +#: builtin/pack-objects.c:3270 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:3134 +#: builtin/pack-objects.c:3272 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:3136 +#: builtin/pack-objects.c:3274 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:3138 +#: builtin/pack-objects.c:3276 msgid "limit the objects to those that are not yet packed" -msgstr "begränsa objekt till de som ännu inte packats" +msgstr "begränsa objekt till dem som ännu inte packats" -#: builtin/pack-objects.c:3141 +#: builtin/pack-objects.c:3279 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:3144 +#: builtin/pack-objects.c:3282 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:3147 +#: builtin/pack-objects.c:3285 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:3150 +#: builtin/pack-objects.c:3288 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:3152 +#: builtin/pack-objects.c:3290 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:3154 +#: builtin/pack-objects.c:3292 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:3156 +#: builtin/pack-objects.c:3294 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:3158 +#: builtin/pack-objects.c:3296 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:3161 +#: builtin/pack-objects.c:3299 +msgid "use the sparse reachability algorithm" +msgstr "använd gles-nåbarhetsalgoritmen" + +#: builtin/pack-objects.c:3301 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:3163 +#: builtin/pack-objects.c:3303 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:3165 +#: builtin/pack-objects.c:3305 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:3167 +#: builtin/pack-objects.c:3307 msgid "ignore this pack" msgstr "ignorera detta paket" -#: builtin/pack-objects.c:3169 +#: builtin/pack-objects.c:3309 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:3171 +#: builtin/pack-objects.c:3311 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:3173 +#: builtin/pack-objects.c:3313 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:3175 +#: builtin/pack-objects.c:3315 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:3178 +#: builtin/pack-objects.c:3318 msgid "handling for missing objects" msgstr "hantering av saknade objekt" -#: builtin/pack-objects.c:3181 +#: builtin/pack-objects.c:3321 msgid "do not pack objects in promisor packfiles" msgstr "packa inte objekt i kontraktspackfiler" -#: builtin/pack-objects.c:3205 +#: builtin/pack-objects.c:3323 +msgid "respect islands during delta compression" +msgstr "respektera öar under deltakomprimering" + +#: builtin/pack-objects.c:3348 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "deltakedjedjupet %d är för djupt, påtvingar %d" -#: builtin/pack-objects.c:3210 +#: builtin/pack-objects.c:3353 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit är för högt, påtvingar %d" -#: builtin/pack-objects.c:3338 +#: builtin/pack-objects.c:3407 +msgid "--max-pack-size cannot be used to build a pack for transfer" +msgstr "" +"--max-pack-size kan inte användas för att bygga ett paket som skall överföras" + +#: builtin/pack-objects.c:3409 +msgid "minimum pack size limit is 1 MiB" +msgstr "minsta packstorlek är 1 MiB" + +#: builtin/pack-objects.c:3414 +msgid "--thin cannot be used to build an indexable pack" +msgstr "--thin kan inte användas för att bygga ett indexerbart paket" + +#: builtin/pack-objects.c:3417 +msgid "--keep-unreachable and --unpack-unreachable are incompatible" +msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt" + +#: builtin/pack-objects.c:3423 +msgid "cannot use --filter without --stdout" +msgstr "kan inte använda --filter utan --stdout" + +#: builtin/pack-objects.c:3484 msgid "Enumerating objects" msgstr "Räknar upp objekt" +#: builtin/pack-objects.c:3514 +#, c-format +msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +msgstr "" +"Totalt %<PRIu32> (delta %<PRIu32>), återanvände %<PRIu32> (delta %<PRIu32>)" + #: builtin/pack-refs.c:7 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<flaggor>]" @@ -12070,77 +15869,81 @@ msgstr "packa allt" msgid "prune loose refs (default)" msgstr "ta bort lösa referenser (standard)" -#: builtin/prune-packed.c:8 +#: builtin/prune-packed.c:9 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" -#: builtin/prune-packed.c:41 +#: builtin/prune-packed.c:42 msgid "Removing duplicate objects" msgstr "Tar bort duplicerade objekt" -#: builtin/prune.c:11 +#: builtin/prune.c:12 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]" -#: builtin/prune.c:108 +#: builtin/prune.c:131 msgid "report pruned objects" msgstr "rapportera borttagna objekt" -#: builtin/prune.c:111 +#: builtin/prune.c:134 msgid "expire objects older than <time>" msgstr "låt tid gå ut för objekt äldre än <tid>" -#: builtin/prune.c:113 +#: builtin/prune.c:136 msgid "limit traversal to objects outside promisor packfiles" msgstr "begränsa vandring av objekt utanför kontraktspackfiler." -#: builtin/prune.c:127 +#: builtin/prune.c:150 msgid "cannot prune in a precious-objects repo" msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv" -#: builtin/pull.c:59 builtin/pull.c:61 +#: builtin/pull.c:66 builtin/pull.c:68 #, c-format msgid "Invalid value for %s: %s" msgstr "Felaktigt värde för %s: %s" -#: builtin/pull.c:81 +#: builtin/pull.c:88 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/pull.c:132 +#: builtin/pull.c:140 msgid "control for recursive fetching of submodules" msgstr "styrning för rekursiv hämtning av undermoduler" -#: builtin/pull.c:136 +#: builtin/pull.c:144 msgid "Options related to merging" msgstr "Alternativ gällande sammanslagning" -#: builtin/pull.c:139 +#: builtin/pull.c:147 msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" -#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:121 +#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125 msgid "allow fast-forward" msgstr "tillåt snabbspolning" -#: builtin/pull.c:175 +#: builtin/pull.c:184 msgid "automatically stash/stash pop before and after rebase" msgstr "utför automatiskt stash/stash pop före och efter ombasering" -#: builtin/pull.c:191 +#: builtin/pull.c:200 msgid "Options related to fetching" msgstr "Alternativ gällande hämtningar" -#: builtin/pull.c:209 +#: builtin/pull.c:210 +msgid "force overwrite of local branch" +msgstr "tvinga överskrivning av lokal gren" + +#: builtin/pull.c:218 msgid "number of submodules pulled in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/pull.c:304 +#: builtin/pull.c:313 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Felaktigt värde för pull.ff: %s" -#: builtin/pull.c:420 +#: builtin/pull.c:430 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -12148,14 +15951,14 @@ msgstr "" "Det finns ingen kandidat för ombasering bland referenserna du precis har " "hämtat." -#: builtin/pull.c:422 +#: builtin/pull.c:432 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:423 +#: builtin/pull.c:433 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -12163,7 +15966,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:426 +#: builtin/pull.c:436 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -12174,42 +15977,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:431 git-parse-remote.sh:73 +#: builtin/pull.c:441 builtin/rebase.c:1321 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:433 builtin/pull.c:448 git-parse-remote.sh:79 +#: builtin/pull.c:443 builtin/pull.c:458 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:435 builtin/pull.c:450 git-parse-remote.sh:82 +#: builtin/pull.c:445 builtin/pull.c:460 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:436 builtin/pull.c:451 +#: builtin/pull.c:446 builtin/pull.c:461 msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." -#: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453 -#: git-parse-remote.sh:64 +#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463 +#: builtin/rebase.c:1327 git-parse-remote.sh:64 msgid "<remote>" msgstr "<fjärr>" -#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:523 +#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<gren>" -#: builtin/pull.c:446 git-parse-remote.sh:75 +#: builtin/pull.c:456 builtin/rebase.c:1319 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:455 git-parse-remote.sh:95 +#: builtin/pull.c:465 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:460 +#: builtin/pull.c:470 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -12218,27 +16021,32 @@ msgstr "" "Dina inställningar anger sammanslagning med referensen \"%s\"\n" "från fjärren, men någon sådan referens togs inte emot." -#: builtin/pull.c:826 +#: builtin/pull.c:574 +#, c-format +msgid "unable to access commit %s" +msgstr "kunde inte komma åt incheckningen %s" + +#: builtin/pull.c:854 msgid "ignoring --verify-signatures for rebase" msgstr "ignorera --verify-signatures för ombasering" -#: builtin/pull.c:874 +#: builtin/pull.c:909 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash är endast giltig med --rebase." -#: builtin/pull.c:882 +#: builtin/pull.c:917 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:885 +#: builtin/pull.c:921 msgid "pull with rebase" msgstr "pull med ombasering" -#: builtin/pull.c:886 +#: builtin/pull.c:922 msgid "please commit or stash them." msgstr "checka in eller använd \"stash\" på dem." -#: builtin/pull.c:911 +#: builtin/pull.c:947 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -12249,7 +16057,7 @@ msgstr "" "snabbspolar din arbetskatalog från\n" "incheckningen %s." -#: builtin/pull.c:916 +#: builtin/pull.c:953 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -12266,15 +16074,15 @@ msgstr "" "$ git reset --hard\n" "för att återgå." -#: builtin/pull.c:931 +#: builtin/pull.c:968 msgid "Cannot merge multiple branches into empty head." msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: builtin/pull.c:935 +#: builtin/pull.c:972 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpå flera grenar." -#: builtin/pull.c:942 +#: builtin/pull.c:979 msgid "cannot rebase with locally recorded submodule modifications" msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" @@ -12290,7 +16098,7 @@ msgstr "taggförkortning utan <tagg>" msgid "--delete only accepts plain target ref names" msgstr "--delete godtar endast enkla målreferensnamn" -#: builtin/push.c:165 +#: builtin/push.c:167 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -12299,7 +16107,7 @@ msgstr "" "För att välja ett av alternativen permanent, se push.default i \"git help " "config\"." -#: builtin/push.c:168 +#: builtin/push.c:170 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -12310,7 +16118,7 @@ msgid "" "\n" "To push to the branch of the same name on the remote, use\n" "\n" -" git push %s %s\n" +" git push %s HEAD\n" "%s" msgstr "" "Uppströmsgrenen för din nuvarande gren stämmer inte överens\n" @@ -12321,10 +16129,10 @@ msgstr "" "\n" "För att sända till grenen med samma namn i fjärrarkivet använder du\n" "\n" -" git push %s %s\n" +" git push %s HEAD\n" "%s" -#: builtin/push.c:183 +#: builtin/push.c:185 #, c-format msgid "" "You are not currently on a branch.\n" @@ -12339,7 +16147,7 @@ msgstr "" "\n" " git push %s HEAD:<namn-på-fjärrgren>\n" -#: builtin/push.c:197 +#: builtin/push.c:199 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -12352,12 +16160,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:205 +#: builtin/push.c:207 #, 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:208 +#: builtin/push.c:210 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -12368,14 +16176,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:267 +#: builtin/push.c:269 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:274 +#: builtin/push.c:276 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -12387,7 +16195,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:280 +#: builtin/push.c:282 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" @@ -12399,7 +16207,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:286 +#: builtin/push.c:288 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" @@ -12413,11 +16221,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:293 +#: builtin/push.c:295 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:296 +#: builtin/push.c:298 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" @@ -12428,22 +16236,22 @@ msgstr "" "pekar på något som inte är en incheckning, utan att använda flaggan\n" "\"--force\".\n" -#: builtin/push.c:357 +#: builtin/push.c:359 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:361 +#: builtin/push.c:364 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:395 +#: builtin/push.c:398 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:396 +#: builtin/push.c:399 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -12464,108 +16272,142 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:551 +#: builtin/push.c:554 msgid "repository" msgstr "arkiv" -#: builtin/push.c:552 builtin/send-pack.c:164 +#: builtin/push.c:555 builtin/send-pack.c:164 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:553 builtin/send-pack.c:166 +#: builtin/push.c:556 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:555 +#: builtin/push.c:558 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:556 +#: builtin/push.c:559 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:559 builtin/send-pack.c:167 +#: builtin/push.c:562 builtin/send-pack.c:167 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:561 builtin/send-pack.c:181 -msgid "refname>:<expect" -msgstr "refnamn>:<förvänta" +#: builtin/push.c:564 builtin/send-pack.c:181 +msgid "<refname>:<expect>" +msgstr "<refnamn>:<förvänta>" -#: builtin/push.c:562 builtin/send-pack.c:182 +#: builtin/push.c:565 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "kräv att ref:s tidigare värde är detta" -#: builtin/push.c:565 +#: builtin/push.c:568 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:567 builtin/send-pack.c:175 +#: builtin/push.c:570 builtin/send-pack.c:175 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "program för att ta emot paket" -#: builtin/push.c:570 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:573 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:575 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "förbigå pre-push-krok" -#: builtin/push.c:576 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:579 builtin/send-pack.c:169 +#: builtin/push.c:582 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "GPG-signera insändningen" -#: builtin/push.c:581 builtin/send-pack.c:176 +#: builtin/push.c:584 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "begär atomiska transaktioner på fjärrsidan" -#: builtin/push.c:599 +#: builtin/push.c:602 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är inkompatibel med --all, --mirror och --tags" -#: builtin/push.c:601 +#: builtin/push.c:604 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" -#: builtin/push.c:604 +#: builtin/push.c:607 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:606 +#: builtin/push.c:609 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:610 +#: builtin/push.c:613 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:612 +#: builtin/push.c:615 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:615 +#: builtin/push.c:618 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:634 +#: builtin/push.c:637 msgid "push options must not have new line characters" msgstr "push-flaggor kan inte innehålla radbrytning" -#: builtin/read-tree.c:40 +#: builtin/range-diff.c:8 +msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" +msgstr "" +"git range-diff [<flaggor>] <gammal-bas>..<gammal-ända> <ny-bas>..<ny-ända>" + +#: builtin/range-diff.c:9 +msgid "git range-diff [<options>] <old-tip>...<new-tip>" +msgstr "git range-diff [<flaggor>] <gammal-bas>..<ny-ända>" + +#: builtin/range-diff.c:10 +msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" +msgstr "git range-diff [<flaggor>] <bas> <gammal-ända> <ny-ända>" + +#: builtin/range-diff.c:21 +msgid "Percentage by which creation is weighted" +msgstr "Procent som skapelse vägs med" + +#: builtin/range-diff.c:23 +msgid "use simple diff colors" +msgstr "använd enkla diff-färger" + +#: builtin/range-diff.c:46 builtin/range-diff.c:50 +#, c-format +msgid "no .. in range: '%s'" +msgstr ".. saknas i intervall: \"%s\"" + +#: builtin/range-diff.c:60 +msgid "single arg format must be symmetric range" +msgstr "ensamt argument måste vara symmetriskt intervall" + +#: builtin/range-diff.c:75 +msgid "need two commit ranges" +msgstr "behöver två incheckningsintervall" + +#: builtin/read-tree.c:41 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -12575,135 +16417,724 @@ msgstr "" "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<fil>] (--empty | <träd-igt1> [<träd-igt2> [<träd-igt3>]])" -#: builtin/read-tree.c:120 +#: builtin/read-tree.c:124 msgid "write resulting index to <file>" msgstr "skriv resulterande index till <fil>" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:127 msgid "only empty the index" msgstr "töm bara indexet" -#: builtin/read-tree.c:125 +#: builtin/read-tree.c:129 msgid "Merging" msgstr "Sammanslagning" -#: builtin/read-tree.c:127 +#: builtin/read-tree.c:131 msgid "perform a merge in addition to a read" msgstr "utför en sammanslagning i tillägg till en läsning" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c:133 msgid "3-way merge if no file level merging required" msgstr "3-vägssammanslagning om sammanslagning på filnivå ej krävs" -#: builtin/read-tree.c:131 +#: builtin/read-tree.c:135 msgid "3-way merge in presence of adds and removes" msgstr "3-vägssammanslagning när det finns tillägg och borttagningar" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:137 msgid "same as -m, but discard unmerged entries" msgstr "som -m, men kasta bort ej sammanslagna poster" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:138 msgid "<subdirectory>/" msgstr "<underkatalog>/" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:139 msgid "read the tree into the index under <subdirectory>/" msgstr "läs in trädet i indexet under <underkatalog>/" -#: builtin/read-tree.c:138 +#: builtin/read-tree.c:142 msgid "update working tree with merge result" msgstr "uppdatera arbetskatalogen med resultatet från sammanslagningen" -#: builtin/read-tree.c:140 +#: builtin/read-tree.c:144 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:141 +#: builtin/read-tree.c:145 msgid "allow explicitly ignored files to be overwritten" msgstr "tillåt explicit ignorerade filer att skrivas över" -#: builtin/read-tree.c:144 +#: builtin/read-tree.c:148 msgid "don't check the working tree after merging" msgstr "kontrollera inte arbetskatalogen efter sammanslagning" -#: builtin/read-tree.c:145 +#: builtin/read-tree.c:149 msgid "don't update the index or the work tree" msgstr "uppdatera inte indexet eller arbetskatalogen" -#: builtin/read-tree.c:147 +#: builtin/read-tree.c:151 msgid "skip applying sparse checkout filter" msgstr "hoppa över att applicera filter för gles utcheckning" -#: builtin/read-tree.c:149 +#: builtin/read-tree.c:153 msgid "debug unpack-trees" msgstr "felsök unpack-trees" -#: builtin/rebase--helper.c:8 -msgid "git rebase--helper [<options>]" -msgstr "git rebase--helper [<flaggor>]" +#: builtin/read-tree.c:157 +msgid "suppress feedback messages" +msgstr "undertryck återkopplingsmeddelanden" + +#: builtin/rebase.c:32 +msgid "" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " +"[<branch>]" +msgstr "" +"git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas>] [<uppström>] " +"[<gren>]" + +#: builtin/rebase.c:34 +msgid "" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" +msgstr "" +"git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas>] --root [<gren>]" + +#: builtin/rebase.c:36 +msgid "git rebase --continue | --abort | --skip | --edit-todo" +msgstr "git rebase --continue | --abort | --skip | --edit-todo" + +#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#, c-format +msgid "unusable todo list: '%s'" +msgstr "oanvändbar todo-lista: %s" + +#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 +#, c-format +msgid "could not write '%s'." +msgstr "kunde inte skriva \"%s\"." + +#: builtin/rebase.c:252 +msgid "no HEAD?" +msgstr "inget HEAD?" + +#: builtin/rebase.c:279 +#, c-format +msgid "could not create temporary %s" +msgstr "kunde inte skapa temporär %s" + +#: builtin/rebase.c:285 +msgid "could not mark as interactive" +msgstr "kunde inte markera som interaktiv" + +#: builtin/rebase.c:343 +msgid "could not generate todo list" +msgstr "Kunde inte skapa attgöra-lista" + +#: builtin/rebase.c:382 +msgid "a base commit must be provided with --upstream or --onto" +msgstr "en basincheckning måste anges med --upstream eller --onto" + +#: builtin/rebase.c:437 +msgid "git rebase--interactive [<options>]" +msgstr "git rebase--interactive [<flaggor>]" -#: builtin/rebase--helper.c:24 +#: builtin/rebase.c:449 msgid "keep empty commits" msgstr "behåll tomma incheckningar" -#: builtin/rebase--helper.c:26 builtin/revert.c:123 +#: builtin/rebase.c:451 builtin/revert.c:127 msgid "allow commits with empty messages" msgstr "tillåt incheckningar med tomt meddelande" -#: builtin/rebase--helper.c:27 +#: builtin/rebase.c:452 msgid "rebase merge commits" msgstr "ombasera sammanslagningar" -#: builtin/rebase--helper.c:29 +#: builtin/rebase.c:454 msgid "keep original branch points of cousins" msgstr "behåll ursprungliga förgreningspunkter för kusiner" -#: builtin/rebase--helper.c:30 +#: builtin/rebase.c:456 +msgid "move commits that begin with squash!/fixup!" +msgstr "flytta incheckningar som inleds med squash!/fixup!" + +#: builtin/rebase.c:457 +msgid "sign commits" +msgstr "signera incheckningar" + +#: builtin/rebase.c:459 builtin/rebase.c:1397 +msgid "display a diffstat of what changed upstream" +msgstr "vis diffstat för vad som ändrats uppströms" + +#: builtin/rebase.c:461 msgid "continue rebase" msgstr "fortsätt ombasering" -#: builtin/rebase--helper.c:32 -msgid "abort rebase" -msgstr "avbryt ombasering" +#: builtin/rebase.c:463 +msgid "skip commit" +msgstr "hoppa över incheckning" + +#: builtin/rebase.c:464 +msgid "edit the todo list" +msgstr "redigera attgöra-listan" -#: builtin/rebase--helper.c:35 -msgid "make rebase script" -msgstr "skapa ombaseringsskript" +#: builtin/rebase.c:466 +msgid "show the current patch" +msgstr "visa nuvarande patch" -#: builtin/rebase--helper.c:37 +#: builtin/rebase.c:469 msgid "shorten commit ids in the todo list" msgstr "förkorta inchecknings-id i todo-listan" -#: builtin/rebase--helper.c:39 +#: builtin/rebase.c:471 msgid "expand commit ids in the todo list" msgstr "utöka inchecknings-id i todo-listan" -#: builtin/rebase--helper.c:41 +#: builtin/rebase.c:473 msgid "check the todo list" msgstr "kontrollera todo-listan" -#: builtin/rebase--helper.c:43 -msgid "skip unnecessary picks" -msgstr "hoppa över onödiga \"pick\"-kommandon" - -#: builtin/rebase--helper.c:45 +#: builtin/rebase.c:475 msgid "rearrange fixup/squash lines" msgstr "ordna om fixup-/squash-rader" -#: builtin/rebase--helper.c:47 +#: builtin/rebase.c:477 msgid "insert exec commands in todo list" msgstr "lägg in exec-kommandon i todo-listan" -#: builtin/rebase--helper.c:68 +#: builtin/rebase.c:478 +msgid "onto" +msgstr "ovanpå" + +#: builtin/rebase.c:481 +msgid "restrict-revision" +msgstr "restrict-revision" + +#: builtin/rebase.c:481 +msgid "restrict revision" +msgstr "begränsa revision" + +#: builtin/rebase.c:483 +msgid "squash-onto" +msgstr "squash-onto" + +#: builtin/rebase.c:484 +msgid "squash onto" +msgstr "tryck ihop ovanpå" + +#: builtin/rebase.c:486 +msgid "the upstream commit" +msgstr "uppströmsincheckningen" + +#: builtin/rebase.c:488 +msgid "head-name" +msgstr "head-name" + +#: builtin/rebase.c:488 +msgid "head name" +msgstr "namn på huvud" + +#: builtin/rebase.c:493 +msgid "rebase strategy" +msgstr "sammanslagningsstrategi" + +#: builtin/rebase.c:494 +msgid "strategy-opts" +msgstr "strategy-opts" + +#: builtin/rebase.c:495 +msgid "strategy options" +msgstr "strategiflaggor" + +#: builtin/rebase.c:496 +msgid "switch-to" +msgstr "switch-to" + +#: builtin/rebase.c:497 +msgid "the branch or commit to checkout" +msgstr "gren eller inchecking att checka ut" + +#: builtin/rebase.c:498 +msgid "onto-name" +msgstr "onto-name" + +#: builtin/rebase.c:498 +msgid "onto name" +msgstr "på-namn" + +#: builtin/rebase.c:499 +msgid "cmd" +msgstr "kmd" + +#: builtin/rebase.c:499 +msgid "the command to run" +msgstr "kommando att köra" + +#: builtin/rebase.c:502 builtin/rebase.c:1480 +msgid "automatically re-schedule any `exec` that fails" +msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt" + +#: builtin/rebase.c:518 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges" -#: builtin/receive-pack.c:31 +#: builtin/rebase.c:534 builtin/rebase.c:1787 +#, c-format +msgid "%s requires an interactive rebase" +msgstr "%s kräver en interaktiv ombasering" + +#: builtin/rebase.c:586 +#, c-format +msgid "could not get 'onto': '%s'" +msgstr "kunde inte hämta \"onto\": \"%s\"" + +#: builtin/rebase.c:601 +#, c-format +msgid "invalid orig-head: '%s'" +msgstr "ogiltigt orig-head: \"%s\"" + +#: builtin/rebase.c:626 +#, c-format +msgid "ignoring invalid allow_rerere_autoupdate: '%s'" +msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\"" + +#: builtin/rebase.c:702 +#, c-format +msgid "Could not read '%s'" +msgstr "Kunde inte läsa \"%s\"" + +#: builtin/rebase.c:720 +#, c-format +msgid "Cannot store %s" +msgstr "Kan inte spara %s" + +#: builtin/rebase.c:817 +msgid "could not determine HEAD revision" +msgstr "kunde inte bestämma HEAD-revision" + +#: builtin/rebase.c:940 +msgid "" +"Resolve all conflicts manually, mark them as resolved with\n" +"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" +"You can instead skip this commit: run \"git rebase --skip\".\n" +"To abort and get back to the state before \"git rebase\", run \"git rebase --" +"abort\"." +msgstr "" +"Lös alla konflikter manuellt, märk dem som lösta med\n" +"\"git add/rm <filer_i_konflikt>\", kör sedan \"git rebase --continue\".\n" +"Du kan hoppa över incheckningen istället: kör \"git rebase --skip\".\n" +"För att avbryta och återgå till där du var före ombaseringen, kör \"git " +"rebase --abort\"." + +#: builtin/rebase.c:1021 +#, c-format +msgid "" +"\n" +"git encountered an error while preparing the patches to replay\n" +"these revisions:\n" +"\n" +" %s\n" +"\n" +"As a result, git cannot rebase them." +msgstr "" +"\n" +"git upptäckte ett fel när det skulle förbereda patchar för att\n" +"återskapa dessa revisioner:\n" +"\n" +" %s\n" +"\n" +"Därför kan inte git ombasera dessa." + +#: builtin/rebase.c:1313 +#, c-format +msgid "" +"%s\n" +"Please specify which branch you want to rebase against.\n" +"See git-rebase(1) for details.\n" +"\n" +" git rebase '<branch>'\n" +"\n" +msgstr "" +"%s\n" +"Ange vilken gren du vill ombasera mot.\n" +"Se git-rebase(1) för detaljer.\n" +"\n" +" git rebase '<gren>'\n" +"\n" + +#: builtin/rebase.c:1329 +#, c-format +msgid "" +"If you wish to set tracking information for this branch you can do so with:\n" +"\n" +" git branch --set-upstream-to=%s/<branch> %s\n" +"\n" +msgstr "" +"Om du vill ange spårningsinformation för grenen kan du göra det med:\n" +"\n" +" git branch --set-upstream-to=%s/<gren> %s\n" +"\n" + +#: builtin/rebase.c:1359 +msgid "exec commands cannot contain newlines" +msgstr "exec-kommandon kan inte innehålla nyradstecken" + +#: builtin/rebase.c:1363 +msgid "empty exec command" +msgstr "tomt exec-kommando" + +#: builtin/rebase.c:1390 +msgid "rebase onto given branch instead of upstream" +msgstr "ombasera mot given grenen istället för uppström" + +#: builtin/rebase.c:1392 +msgid "allow pre-rebase hook to run" +msgstr "tillåt pre-rebase-krok att köra" + +#: builtin/rebase.c:1394 +msgid "be quiet. implies --no-stat" +msgstr "var tyst. implicerar --no-stat" + +#: builtin/rebase.c:1400 +msgid "do not show diffstat of what changed upstream" +msgstr "visa inte en diffstat för vad som ändrats uppströms" + +#: builtin/rebase.c:1403 +msgid "add a Signed-off-by: line to each commit" +msgstr "lägg \"Signed-off-by:\"-rad till varje incheckning" + +#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411 +msgid "passed to 'git am'" +msgstr "sänds till \"git am\"" + +#: builtin/rebase.c:1413 builtin/rebase.c:1415 +msgid "passed to 'git apply'" +msgstr "sänds till \"git apply\"" + +#: builtin/rebase.c:1417 builtin/rebase.c:1420 +msgid "cherry-pick all commits, even if unchanged" +msgstr "utför cherry-pick på alla incheckningar, även om oändrad" + +#: builtin/rebase.c:1422 +msgid "continue" +msgstr "fortsätt" + +#: builtin/rebase.c:1425 +msgid "skip current patch and continue" +msgstr "hoppa över nuvarande patch och fortsätt" + +#: builtin/rebase.c:1427 +msgid "abort and check out the original branch" +msgstr "avbryt och checka ut ursprungsgrenen" + +#: builtin/rebase.c:1430 +msgid "abort but keep HEAD where it is" +msgstr "avbryt men behåll HEAD där det är" + +#: builtin/rebase.c:1431 +msgid "edit the todo list during an interactive rebase" +msgstr "redigera attgöra-listan under interaktiv ombasering." + +#: builtin/rebase.c:1434 +msgid "show the patch file being applied or merged" +msgstr "visa patchen som tillämpas eller slås samman" + +#: builtin/rebase.c:1437 +msgid "use merging strategies to rebase" +msgstr "använd sammanslagningsstrategier för sammanslagning" + +#: builtin/rebase.c:1441 +msgid "let the user edit the list of commits to rebase" +msgstr "låt användaren redigera listan över incheckningar att ombasera" + +#: builtin/rebase.c:1445 +msgid "(DEPRECATED) try to recreate merges instead of ignoring them" +msgstr "" +"(AVRÅDS) försök återskapa sammanslagningar istället för att ignorera dem" + +#: builtin/rebase.c:1449 +msgid "preserve empty commits during rebase" +msgstr "behåll tomma incheckningar under ombasering" + +#: builtin/rebase.c:1451 +msgid "move commits that begin with squash!/fixup! under -i" +msgstr "flytta incheckningar som börjar med squash!/fixup! under -i" + +#: builtin/rebase.c:1457 +msgid "automatically stash/stash pop before and after" +msgstr "utför automatiskt stash/stash pop före och efter" + +#: builtin/rebase.c:1459 +msgid "add exec lines after each commit of the editable list" +msgstr "lägg till exec-rader efter varje incheckning i den redigerbara listan" + +#: builtin/rebase.c:1463 +msgid "allow rebasing commits with empty messages" +msgstr "tillåt ombasering av incheckningar med tomt meddelande" + +#: builtin/rebase.c:1466 +msgid "try to rebase merges instead of skipping them" +msgstr "försök ombasera sammanslagningar istället för att ignorera dem" + +#: builtin/rebase.c:1469 +msgid "use 'merge-base --fork-point' to refine upstream" +msgstr "använd \"merge-base --fork-point\" för att förfina uppström" + +#: builtin/rebase.c:1471 +msgid "use the given merge strategy" +msgstr "använd angiven sammanslagningsstrategi" + +#: builtin/rebase.c:1473 builtin/revert.c:114 +msgid "option" +msgstr "alternativ" + +#: builtin/rebase.c:1474 +msgid "pass the argument through to the merge strategy" +msgstr "sänd flaggan till sammanslagningsstrategin" + +#: builtin/rebase.c:1477 +msgid "rebase all reachable commits up to the root(s)" +msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna" + +#: builtin/rebase.c:1498 +msgid "" +"the rebase.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"stödet för rebase.useBuiltin har tagits bort!\n" +"Se posten för det i \"git help config\" för detaljer." + +#: builtin/rebase.c:1504 +msgid "It looks like 'git am' is in progress. Cannot rebase." +msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera." + +#: builtin/rebase.c:1545 +msgid "" +"git rebase --preserve-merges is deprecated. Use --rebase-merges instead." +msgstr "" +"git rebase --preserve-merges avråds från. Använd --rebase-merges istället." + +#: builtin/rebase.c:1549 +msgid "No rebase in progress?" +msgstr "Ingen ombasering pågår?" + +#: builtin/rebase.c:1553 +msgid "The --edit-todo action can only be used during interactive rebase." +msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering." + +#: builtin/rebase.c:1576 +msgid "Cannot read HEAD" +msgstr "Kan inte läsa HEAD" + +#: builtin/rebase.c:1588 +msgid "" +"You must edit all merge conflicts and then\n" +"mark them as resolved using git add" +msgstr "" +"Du måste redigera alla sammanslagningskonflikter och\n" +"därefter markera dem som lösta med git add" + +#: builtin/rebase.c:1607 +msgid "could not discard worktree changes" +msgstr "kunde inte kasta ändringar i arbetskatalogen" + +#: builtin/rebase.c:1626 +#, c-format +msgid "could not move back to %s" +msgstr "kunde inte flytta tillbaka till %s" + +#: builtin/rebase.c:1637 builtin/rm.c:369 +#, c-format +msgid "could not remove '%s'" +msgstr "kunde inte ta bort \"%s\"" + +#: builtin/rebase.c:1663 +#, c-format +msgid "" +"It seems that there is already a %s directory, and\n" +"I wonder if you are in the middle of another rebase. If that is the\n" +"case, please try\n" +"\t%s\n" +"If that is not the case, please\n" +"\t%s\n" +"and run me again. I am stopping in case you still have something\n" +"valuable there.\n" +msgstr "" +"Det verkar som katalogen %s redan existerar, och\n" +"jag undrar om du redan är mitt i en annan ombasering. Om så är\n" +"fallet, försök\n" +"\t%s\n" +"Om så inte är fallet, kör\n" +"\t%s\n" +"och kör programmet igen. Jag avslutar ifall du fortfarande har\n" +"något av värde där.\n" + +#: builtin/rebase.c:1684 +msgid "switch `C' expects a numerical value" +msgstr "flaggan \"C\" förväntar ett numeriskt värde" + +#: builtin/rebase.c:1725 +#, c-format +msgid "Unknown mode: %s" +msgstr "Okänt läge: %s" + +#: builtin/rebase.c:1747 +msgid "--strategy requires --merge or --interactive" +msgstr "--strategy kräver --merge eller --interactive" + +#: builtin/rebase.c:1796 +msgid "cannot combine am options with either interactive or merge options" +msgstr "" +"kan inte kombinera am-flaggor med varken interaktiv- eller " +"sammanslagningsflaggor" + +#: builtin/rebase.c:1815 +msgid "cannot combine '--preserve-merges' with '--rebase-merges'" +msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\"" + +#: builtin/rebase.c:1819 +msgid "" +"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" +msgstr "" +"fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec" +"\"" + +#: builtin/rebase.c:1825 +msgid "cannot combine '--rebase-merges' with '--strategy-option'" +msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy-option\"" + +#: builtin/rebase.c:1828 +msgid "cannot combine '--rebase-merges' with '--strategy'" +msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy\"" + +#: builtin/rebase.c:1852 +#, c-format +msgid "invalid upstream '%s'" +msgstr "felaktig uppström ”%s”" + +#: builtin/rebase.c:1858 +msgid "Could not create new root commit" +msgstr "kunde inte skapa ny rotincheckning" + +#: builtin/rebase.c:1876 +#, c-format +msgid "'%s': need exactly one merge base" +msgstr "\"%s\": behöver precis en sammanslagningsbas" + +#: builtin/rebase.c:1883 +#, c-format +msgid "Does not point to a valid commit '%s'" +msgstr "Pekar inte på en giltig incheckning: \"%s\"" + +#: builtin/rebase.c:1908 +#, c-format +msgid "fatal: no such branch/commit '%s'" +msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\"" + +#: builtin/rebase.c:1916 builtin/submodule--helper.c:38 +#: builtin/submodule--helper.c:1933 +#, c-format +msgid "No such ref: %s" +msgstr "Ingen sådan referens: %s" + +#: builtin/rebase.c:1927 +msgid "Could not resolve HEAD to a revision" +msgstr "Kunde inte bestämma HEAD:s incheckning" + +#: builtin/rebase.c:1968 +msgid "Cannot autostash" +msgstr "Kan inte utföra \"autostash\"" + +#: builtin/rebase.c:1971 +#, c-format +msgid "Unexpected stash response: '%s'" +msgstr "Oväntat svar från stash: \"%s\"" + +#: builtin/rebase.c:1977 +#, c-format +msgid "Could not create directory for '%s'" +msgstr "Kunde inte skapa katalog för \"%s\"" + +#: builtin/rebase.c:1980 +#, c-format +msgid "Created autostash: %s\n" +msgstr "Skapade autostash: %s\n" + +#: builtin/rebase.c:1983 +msgid "could not reset --hard" +msgstr "kunde inte utföra \"reset --hard\"" + +#: builtin/rebase.c:1984 builtin/reset.c:114 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD är nu på %s" + +#: builtin/rebase.c:2000 +msgid "Please commit or stash them." +msgstr "Checka in eller använd \"stash\" på dem." + +#: builtin/rebase.c:2027 +#, c-format +msgid "could not parse '%s'" +msgstr "kunde inte tolka \"%s\"" + +#: builtin/rebase.c:2040 +#, c-format +msgid "could not switch to %s" +msgstr "kunde inte växla till %s" + +#: builtin/rebase.c:2051 +msgid "HEAD is up to date." +msgstr "HEAD är à jour." + +#: builtin/rebase.c:2053 +#, c-format +msgid "Current branch %s is up to date.\n" +msgstr "Aktuell gren %s är à jour.\n" + +#: builtin/rebase.c:2061 +msgid "HEAD is up to date, rebase forced." +msgstr "HEAD är à jour, ombasering framtvingad." + +#: builtin/rebase.c:2063 +#, c-format +msgid "Current branch %s is up to date, rebase forced.\n" +msgstr "Aktuell gren %s är à jour, ombasering framtvingad.\n" + +#: builtin/rebase.c:2071 +msgid "The pre-rebase hook refused to rebase." +msgstr "Kroken pre-rebase vägrade ombaseringen." + +#: builtin/rebase.c:2078 +#, c-format +msgid "Changes to %s:\n" +msgstr "Ändringar till %s:\n" + +#: builtin/rebase.c:2081 +#, c-format +msgid "Changes from %s to %s:\n" +msgstr "Ändringar från %s till %s:\n" + +#: builtin/rebase.c:2106 +#, c-format +msgid "First, rewinding head to replay your work on top of it...\n" +msgstr "" +"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det...\n" + +#: builtin/rebase.c:2115 +msgid "Could not detach HEAD" +msgstr "Kunde inte koppla från HEAD" + +#: builtin/rebase.c:2124 +#, c-format +msgid "Fast-forwarded %s to %s.\n" +msgstr "Snabbspolade %s till %s.\n" + +#: builtin/receive-pack.c:33 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-katalog>" -#: builtin/receive-pack.c:842 +#: builtin/receive-pack.c:833 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" @@ -12733,7 +17164,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:862 +#: builtin/receive-pack.c:853 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" @@ -12754,24 +17185,79 @@ msgstr "" "\n" "För att undvika detta meddelande kan du sätta det till \"refuse\"." -#: builtin/receive-pack.c:1935 +#: builtin/receive-pack.c:1940 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:1949 +#: builtin/receive-pack.c:1954 msgid "You must specify a directory." msgstr "Du måste ange en katalog." -#: builtin/reflog.c:532 builtin/reflog.c:537 +#: builtin/reflog.c:17 +msgid "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--" +"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " +"<refs>..." +msgstr "" +"git reflog expire [--expire=<tid>] [--expire-unreachable=<tid>] [--rewrite] " +"[--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " +"<referenser>..." + +#: builtin/reflog.c:22 +msgid "" +"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " +"<refs>..." +msgstr "" +"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " +"<referenser>..." + +#: builtin/reflog.c:25 +msgid "git reflog exists <ref>" +msgstr "git reflog exists <referens>" + +#: builtin/reflog.c:567 builtin/reflog.c:572 #, c-format msgid "'%s' is not a valid timestamp" msgstr "\"%s\" är inte en giltig tidsstämpel" -#: builtin/remote.c:14 +#: builtin/reflog.c:605 +#, c-format +msgid "Marking reachable objects..." +msgstr "Markerar nåbara objekt..." + +#: builtin/reflog.c:643 +#, c-format +msgid "%s points nowhere!" +msgstr "%s pekar ingenstans!" + +#: builtin/reflog.c:695 +msgid "no reflog specified to delete" +msgstr "ingen referenslogg att ta bort angavs" + +#: builtin/reflog.c:704 +#, c-format +msgid "not a reflog: %s" +msgstr "inte en referenslogg: %s" + +#: builtin/reflog.c:709 +#, c-format +msgid "no reflog for '%s'" +msgstr "ingen referenslogg för \"%s\"" + +#: builtin/reflog.c:755 +#, c-format +msgid "invalid ref format: %s" +msgstr "felaktigt referensformat: %s" + +#: builtin/reflog.c:764 +msgid "git reflog [ show | expire | delete | exists ]" +msgstr "git reflog [ show | expire | delete | exists ]" + +#: builtin/remote.c:16 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:15 +#: builtin/remote.c:17 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -12779,82 +17265,82 @@ msgstr "" "git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <namn> <url>" -#: builtin/remote.c:16 builtin/remote.c:36 +#: builtin/remote.c:18 builtin/remote.c:38 msgid "git remote rename <old> <new>" msgstr "git remote rename <gammal> <ny>" -#: builtin/remote.c:17 builtin/remote.c:41 +#: builtin/remote.c:19 builtin/remote.c:43 msgid "git remote remove <name>" msgstr "git remote remove <namn>" -#: builtin/remote.c:18 builtin/remote.c:46 +#: builtin/remote.c:20 builtin/remote.c:48 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)" -#: builtin/remote.c:19 +#: builtin/remote.c:21 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <namn>" -#: builtin/remote.c:20 +#: builtin/remote.c:22 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <namn>" -#: builtin/remote.c:21 +#: builtin/remote.c:23 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<grupp> | <fjärr>)...]" -#: builtin/remote.c:22 +#: builtin/remote.c:24 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <namn> <gren>..." -#: builtin/remote.c:23 builtin/remote.c:72 +#: builtin/remote.c:25 builtin/remote.c:74 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <namn>" -#: builtin/remote.c:24 builtin/remote.c:77 +#: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]" -#: builtin/remote.c:25 builtin/remote.c:78 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <namn> <nyurl>" -#: builtin/remote.c:26 builtin/remote.c:79 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <namn> <url>" -#: builtin/remote.c:31 +#: builtin/remote.c:33 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<flaggor>] <namn> <url>" -#: builtin/remote.c:51 +#: builtin/remote.c:53 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <namn> <gren>..." -#: builtin/remote.c:52 +#: builtin/remote.c:54 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <namn> <gren>..." -#: builtin/remote.c:57 +#: builtin/remote.c:59 msgid "git remote show [<options>] <name>" msgstr "git remote show [<flaggor>] <namn>" -#: builtin/remote.c:62 +#: builtin/remote.c:64 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<flaggor>] <namn>" -#: builtin/remote.c:67 +#: builtin/remote.c:69 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..." -#: builtin/remote.c:96 +#: builtin/remote.c:98 #, c-format msgid "Updating %s" msgstr "Uppdaterar %s" -#: builtin/remote.c:128 +#: builtin/remote.c:130 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -12862,86 +17348,82 @@ msgstr "" "--mirror är farlig och föråldrad; använd\n" "\t --mirror=fetch eller --mirror=push istället" -#: builtin/remote.c:145 +#: builtin/remote.c:147 #, c-format msgid "unknown mirror argument: %s" msgstr "okänt argument till mirror: %s" -#: builtin/remote.c:161 +#: builtin/remote.c:163 msgid "fetch the remote branches" msgstr "hämta fjärrgrenarna" -#: builtin/remote.c:163 +#: builtin/remote.c:165 msgid "import all tags and associated objects when fetching" msgstr "importera alla taggar och associerade objekt vid hämtning" -#: builtin/remote.c:166 +#: builtin/remote.c:168 msgid "or do not fetch any tag at all (--no-tags)" msgstr "eller hämta inte några taggar alls (--no-tags)" -#: builtin/remote.c:168 +#: builtin/remote.c:170 msgid "branch(es) to track" msgstr "gren(ar) att spåra" -#: builtin/remote.c:169 +#: builtin/remote.c:171 msgid "master branch" msgstr "huvudgren" -#: builtin/remote.c:170 -msgid "push|fetch" -msgstr "push|fetch" - -#: builtin/remote.c:171 +#: builtin/remote.c:173 msgid "set up remote as a mirror to push to or fetch from" msgstr "ställ in arkiv som spegel att sända eller ta emot från" -#: builtin/remote.c:183 +#: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" msgstr "att ange en master-gren ger ingen mening med --mirror" -#: builtin/remote.c:185 +#: builtin/remote.c:187 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar" -#: builtin/remote.c:192 builtin/remote.c:634 +#: builtin/remote.c:194 builtin/remote.c:636 #, c-format msgid "remote %s already exists." msgstr "fjärrarkivet %s finns redan." -#: builtin/remote.c:196 builtin/remote.c:638 +#: builtin/remote.c:198 builtin/remote.c:640 #, c-format msgid "'%s' is not a valid remote name" msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" -#: builtin/remote.c:236 +#: builtin/remote.c:238 #, c-format msgid "Could not setup master '%s'" msgstr "Kunde inte skapa master \"%s\"" -#: builtin/remote.c:342 +#: builtin/remote.c:344 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Kunde inte hämta mappning för referensspecifikation %s" -#: builtin/remote.c:441 builtin/remote.c:449 +#: builtin/remote.c:443 builtin/remote.c:451 msgid "(matching)" msgstr "(matchande)" -#: builtin/remote.c:453 +#: builtin/remote.c:455 msgid "(delete)" msgstr "(ta bort)" -#: builtin/remote.c:627 builtin/remote.c:762 builtin/remote.c:861 +#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 #, c-format -msgid "No such remote: %s" -msgstr "Inget sådant fjärrarkiv: %s" +msgid "No such remote: '%s'" +msgstr "Ingen sådan fjärr: \"%s\"" -#: builtin/remote.c:644 +#: builtin/remote.c:646 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\"" -#: builtin/remote.c:664 +#: builtin/remote.c:666 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -12952,17 +17434,17 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nödvändigt." -#: builtin/remote.c:700 +#: builtin/remote.c:702 #, c-format msgid "deleting '%s' failed" msgstr "misslyckades ta bort \"%s\"" -#: builtin/remote.c:734 +#: builtin/remote.c:736 #, c-format msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:799 +#: builtin/remote.c:802 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -12976,118 +17458,118 @@ msgstr[1] "" "Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n" "för att ta bort dem, använd:" -#: builtin/remote.c:813 +#: builtin/remote.c:816 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:914 +#: builtin/remote.c:917 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ny (nästa hämtning sparar i remotes/%s)" -#: builtin/remote.c:917 +#: builtin/remote.c:920 msgid " tracked" msgstr " spårad" -#: builtin/remote.c:919 +#: builtin/remote.c:922 msgid " stale (use 'git remote prune' to remove)" msgstr " förlegad (använd \"git remote prune\" för att ta bort)" -#: builtin/remote.c:921 +#: builtin/remote.c:924 msgid " ???" msgstr " ???" -#: builtin/remote.c:962 +#: builtin/remote.c:965 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren" -#: builtin/remote.c:971 +#: builtin/remote.c:974 #, c-format msgid "rebases interactively onto remote %s" msgstr "ombaseras interaktivt på fjärren %s" -#: builtin/remote.c:973 +#: builtin/remote.c:976 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "ombaseras interaktivt (med sammanslagningar) på fjärren %s" -#: builtin/remote.c:976 +#: builtin/remote.c:979 #, c-format msgid "rebases onto remote %s" msgstr "ombaseras på fjärren %s" -#: builtin/remote.c:980 +#: builtin/remote.c:983 #, c-format msgid " merges with remote %s" msgstr " sammanslås med fjärren %s" -#: builtin/remote.c:983 +#: builtin/remote.c:986 #, c-format msgid "merges with remote %s" msgstr "sammanslås med fjärren %s" -#: builtin/remote.c:986 +#: builtin/remote.c:989 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s och med fjärren %s\n" -#: builtin/remote.c:1029 +#: builtin/remote.c:1032 msgid "create" msgstr "skapa" -#: builtin/remote.c:1032 +#: builtin/remote.c:1035 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1036 +#: builtin/remote.c:1039 msgid "up to date" msgstr "àjour" -#: builtin/remote.c:1039 +#: builtin/remote.c:1042 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1042 +#: builtin/remote.c:1045 msgid "local out of date" msgstr "lokal föråldrad" -#: builtin/remote.c:1049 +#: builtin/remote.c:1052 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1052 +#: builtin/remote.c:1055 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sänder till %-*s (%s)" -#: builtin/remote.c:1056 +#: builtin/remote.c:1059 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1059 +#: builtin/remote.c:1062 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" -#: builtin/remote.c:1127 +#: builtin/remote.c:1130 msgid "do not query remotes" msgstr "fråga inte fjärrar" -#: builtin/remote.c:1154 +#: builtin/remote.c:1157 #, c-format msgid "* remote %s" msgstr "* fjärr %s" -#: builtin/remote.c:1155 +#: builtin/remote.c:1158 #, c-format msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1156 builtin/remote.c:1172 builtin/remote.c:1311 +#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 msgid "(no URL)" msgstr "(ingen URL)" @@ -13095,193 +17577,193 @@ msgstr "(ingen URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1170 builtin/remote.c:1172 +#: builtin/remote.c:1173 builtin/remote.c:1175 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1174 builtin/remote.c:1176 builtin/remote.c:1178 +#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1174 +#: builtin/remote.c:1177 msgid "(not queried)" msgstr "(inte förfrågad)" -#: builtin/remote.c:1176 +#: builtin/remote.c:1179 msgid "(unknown)" msgstr "(okänd)" -#: builtin/remote.c:1180 +#: builtin/remote.c:1183 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n" -#: builtin/remote.c:1192 +#: builtin/remote.c:1195 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Fjärrgren:%s" msgstr[1] " Fjärrgrenar:%s" -#: builtin/remote.c:1195 builtin/remote.c:1221 +#: builtin/remote.c:1198 builtin/remote.c:1224 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1204 +#: builtin/remote.c:1207 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Lokal gren konfigurerad för \"git pull\":" msgstr[1] " Lokala grenar konfigurerade för \"git pull\":" -#: builtin/remote.c:1212 +#: builtin/remote.c:1215 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1218 +#: builtin/remote.c:1221 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:" msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:" -#: builtin/remote.c:1239 +#: builtin/remote.c:1242 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" -#: builtin/remote.c:1241 +#: builtin/remote.c:1244 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1256 +#: builtin/remote.c:1259 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1258 +#: builtin/remote.c:1261 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:" -#: builtin/remote.c:1268 +#: builtin/remote.c:1271 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1276 +#: builtin/remote.c:1279 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1278 +#: builtin/remote.c:1281 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1296 +#: builtin/remote.c:1299 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1297 +#: builtin/remote.c:1300 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1307 +#: builtin/remote.c:1310 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1308 +#: builtin/remote.c:1311 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1324 +#: builtin/remote.c:1327 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1330 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1372 +#: builtin/remote.c:1375 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1435 builtin/remote.c:1489 builtin/remote.c:1557 +#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" -#: builtin/remote.c:1451 +#: builtin/remote.c:1454 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1458 +#: builtin/remote.c:1461 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1475 +#: builtin/remote.c:1478 msgid "query push URLs rather than fetch URLs" msgstr "fråga sänd-URL:er istället för hämta-URL:er" -#: builtin/remote.c:1477 +#: builtin/remote.c:1480 msgid "return all URLs" msgstr "returnera alla URL:er" -#: builtin/remote.c:1505 +#: builtin/remote.c:1508 #, c-format msgid "no URLs configured for remote '%s'" msgstr "ingen URL:er angivna för fjärren \"%s\"" -#: builtin/remote.c:1531 +#: builtin/remote.c:1534 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1533 +#: builtin/remote.c:1536 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1535 +#: builtin/remote.c:1538 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1542 +#: builtin/remote.c:1545 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1581 +#: builtin/remote.c:1584 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1589 +#: builtin/remote.c:1592 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1591 +#: builtin/remote.c:1594 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" -#: builtin/remote.c:1607 +#: builtin/remote.c:1610 msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; måste skrivas före ett underkommando" -#: builtin/remote.c:1638 +#: builtin/remote.c:1641 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" -#: builtin/repack.c:18 +#: builtin/repack.c:22 msgid "git repack [<options>]" msgstr "git repack [<flaggor>]" -#: builtin/repack.c:23 +#: builtin/repack.c:27 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -13290,91 +17772,131 @@ msgstr "" "Använd --no-write-bitmap-index eller inaktivera inställningen\n" "pack.writebitmaps" -#: builtin/repack.c:180 +#: builtin/repack.c:200 +msgid "could not start pack-objects to repack promisor objects" +msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt" + +#: builtin/repack.c:239 builtin/repack.c:414 +msgid "repack: Expecting full hex object ID lines only from pack-objects." +msgstr "" +"repack: Förväntar kompletta hex-objekt-ID-rader endast från pack-objects." + +#: builtin/repack.c:256 +msgid "could not finish pack-objects to repack promisor objects" +msgstr "kunde inte avsluta pack-objects för att packa om kontraktsobjekt" + +#: builtin/repack.c:294 msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" -#: builtin/repack.c:182 +#: builtin/repack.c:296 msgid "same as -a, and turn unreachable objects loose" msgstr "samma som -a, och gör onåbara objekt lösa" -#: builtin/repack.c:185 +#: builtin/repack.c:299 msgid "remove redundant packs, and run git-prune-packed" msgstr "ta bort överflödiga paket, och kör git-prune-packed" -#: builtin/repack.c:187 +#: builtin/repack.c:301 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "sänd --no-reuse-delta till git-pack-objects" -#: builtin/repack.c:189 +#: builtin/repack.c:303 msgid "pass --no-reuse-object to git-pack-objects" msgstr "sänd --no-reuse-object till git-pack-objects" -#: builtin/repack.c:191 +#: builtin/repack.c:305 msgid "do not run git-update-server-info" msgstr "kör inte git-update-server-info" -#: builtin/repack.c:194 +#: builtin/repack.c:308 msgid "pass --local to git-pack-objects" msgstr "sänd --local till git-pack-objects" -#: builtin/repack.c:196 +#: builtin/repack.c:310 msgid "write bitmap index" msgstr "skriv bitkartindex" -#: builtin/repack.c:197 +#: builtin/repack.c:312 +msgid "pass --delta-islands to git-pack-objects" +msgstr "sänd --delta-islands till git-pack-objects" + +#: builtin/repack.c:313 msgid "approxidate" msgstr "cirkadatum" -#: builtin/repack.c:198 +#: builtin/repack.c:314 msgid "with -A, do not loosen objects older than this" msgstr "med -A, lös inte upp objekt äldre än detta" -#: builtin/repack.c:200 +#: builtin/repack.c:316 msgid "with -a, repack unreachable objects" msgstr "med -a, packa om onåbara objekt" -#: builtin/repack.c:202 +#: builtin/repack.c:318 msgid "size of the window used for delta compression" msgstr "storlek på fönster använt för deltakomprimering" -#: builtin/repack.c:203 builtin/repack.c:209 +#: builtin/repack.c:319 builtin/repack.c:325 msgid "bytes" msgstr "byte" -#: builtin/repack.c:204 +#: builtin/repack.c:320 msgid "same as the above, but limit memory size instead of entries count" msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal" -#: builtin/repack.c:206 +#: builtin/repack.c:322 msgid "limits the maximum delta depth" msgstr "begränsa maximalt deltadjup" -#: builtin/repack.c:208 +#: builtin/repack.c:324 msgid "limits the maximum number of threads" msgstr "begränsar maximalt antal trådar" -#: builtin/repack.c:210 +#: builtin/repack.c:326 msgid "maximum size of each packfile" msgstr "maximal storlek på varje paketfil" -#: builtin/repack.c:212 +#: builtin/repack.c:328 msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:214 +#: builtin/repack.c:330 msgid "do not repack this pack" msgstr "packa inte om detta paket" -#: builtin/repack.c:224 +#: builtin/repack.c:340 msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" -#: builtin/repack.c:228 +#: builtin/repack.c:344 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable och -A kan inte användas samtidigt" -#: builtin/repack.c:425 builtin/worktree.c:139 +#: builtin/repack.c:423 +msgid "Nothing new to pack." +msgstr "Inget nytt att packa." + +#: builtin/repack.c:484 +#, c-format +msgid "" +"WARNING: Some packs in use have been renamed by\n" +"WARNING: prefixing old- to their name, in order to\n" +"WARNING: replace them with the new version of the\n" +"WARNING: file. But the operation failed, and the\n" +"WARNING: attempt to rename them back to their\n" +"WARNING: original names also failed.\n" +"WARNING: Please rename them in %s manually:\n" +msgstr "" +"VARNING: Namnen på några paket har bytts genom att\n" +"VARNING: lägga till old- före namnen, för att byta\n" +"VARNING: dem mot den nya versionen av filen. Men\n" +"VARNING: operationen misslyckades, och försöket att\n" +"VARNING: byta tillbaka till det ursprungliga\n" +"VARNING: namnet misslyckades också.\n" +"VARNING: Byt namn på dem i %s manuellt:\n" + +#: builtin/repack.c:532 #, c-format msgid "failed to remove '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -13403,22 +17925,121 @@ msgstr "git replace -d <objekt>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<format>] [-l [<mönster>]]" -#: builtin/replace.c:371 builtin/replace.c:415 builtin/replace.c:445 +#: builtin/replace.c:90 +#, c-format +msgid "" +"invalid replace format '%s'\n" +"valid formats are 'short', 'medium' and 'long'" +msgstr "" +"ogiltigt ersättningsformat \"%s\"\n" +"giltiga format är \"short\", \"medium\" och \"long\"" + +#: builtin/replace.c:125 +#, c-format +msgid "replace ref '%s' not found" +msgstr "ersättningsreferensen \"%s\" hittades inte" + +#: builtin/replace.c:141 +#, c-format +msgid "Deleted replace ref '%s'" +msgstr "Tog bort ersättningsreferensen \"%s\"" + +#: builtin/replace.c:153 +#, c-format +msgid "'%s' is not a valid ref name" +msgstr "\"%s\" är inte ett giltigt referensnamn" + +#: builtin/replace.c:158 #, c-format -msgid "Not a valid object name: '%s'" -msgstr "Objektnamnet är inte giltigt: \"%s\"" +msgid "replace ref '%s' already exists" +msgstr "ersättningsreferensen \"%s\" finns redan" -#: builtin/replace.c:407 +#: builtin/replace.c:178 +#, c-format +msgid "" +"Objects must be of the same type.\n" +"'%s' points to a replaced object of type '%s'\n" +"while '%s' points to a replacement object of type '%s'." +msgstr "" +"Objekt måste vara av samma typ.\n" +"\"%s\" pekar på ett ersatt objekt med typen \"%s\"\n" +"medan \"%s\" pekar på ett ersättningsobjekt av typen \"%s\"." + +#: builtin/replace.c:229 +#, c-format +msgid "unable to open %s for writing" +msgstr "kan inte öppna %s för skrivning" + +#: builtin/replace.c:242 +msgid "cat-file reported failure" +msgstr "cat-file rapporterade misslyckande" + +#: builtin/replace.c:258 +#, c-format +msgid "unable to open %s for reading" +msgstr "kan inte öppna %s för läsning" + +#: builtin/replace.c:272 +msgid "unable to spawn mktree" +msgstr "kan inte starta mktree" + +#: builtin/replace.c:276 +msgid "unable to read from mktree" +msgstr "kan inte läsa från mktree" + +#: builtin/replace.c:285 +msgid "mktree reported failure" +msgstr "mktree rapporterade misslyckande" + +#: builtin/replace.c:289 +msgid "mktree did not return an object name" +msgstr "mktree returnerade inte ett objektnamn" + +#: builtin/replace.c:298 +#, c-format +msgid "unable to fstat %s" +msgstr "kan inte utföra \"fstat\" på %s" + +#: builtin/replace.c:303 +msgid "unable to write object to database" +msgstr "kan inte skriva objektet till databasen" + +#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 +#: builtin/replace.c:452 +#, c-format +msgid "not a valid object name: '%s'" +msgstr "objektnamnet är inte giltigt: \"%s\"" + +#: builtin/replace.c:326 +#, c-format +msgid "unable to get object type for %s" +msgstr "kan inte läsa objekttyp för %s" + +#: builtin/replace.c:342 +msgid "editing object file failed" +msgstr "misslyckades redigera objektfilen" + +#: builtin/replace.c:351 +#, c-format +msgid "new object is the same as the old one: '%s'" +msgstr "nytt objekt är samma som det gamla: \"%s\"" + +#: builtin/replace.c:383 +#, c-format +msgid "could not parse %s as a commit" +msgstr "kunde inte tolka %s som incheckning" + +#: builtin/replace.c:414 #, c-format msgid "bad mergetag in commit '%s'" msgstr "felaktig sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:409 +#: builtin/replace.c:416 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "felformad sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:421 +#: builtin/replace.c:428 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -13427,21 +18048,31 @@ msgstr "" "den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s" "\" som har förkastats; använd --edit istället för --graft" -#: builtin/replace.c:460 +#: builtin/replace.c:467 #, c-format -msgid "the original commit '%s' has a gpg signature." -msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur." +msgid "the original commit '%s' has a gpg signature" +msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur" -#: builtin/replace.c:461 +#: builtin/replace.c:468 msgid "the signature will be removed in the replacement commit!" msgstr "signaturen kommer att tas bort i ersättningsincheckningen!" -#: builtin/replace.c:471 +#: builtin/replace.c:478 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "kunde inte skriva ersättningsincheckning för: \"%s\"" -#: builtin/replace.c:514 +#: builtin/replace.c:486 +#, c-format +msgid "graft for '%s' unnecessary" +msgstr "ympning för \"%s\" behövs inte" + +#: builtin/replace.c:490 +#, c-format +msgid "new commit is the same as the old one: '%s'" +msgstr "ny incheckning är samma som den gamla: \"%s\"" + +#: builtin/replace.c:525 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -13450,211 +18081,266 @@ msgstr "" "kunde inte konvertera följande ympning(ar):\n" "%s" -#: builtin/replace.c:535 +#: builtin/replace.c:546 msgid "list replace refs" msgstr "visa ersättningsreferenser" -#: builtin/replace.c:536 +#: builtin/replace.c:547 msgid "delete replace refs" msgstr "ta bort ersättningsreferenser" -#: builtin/replace.c:537 +#: builtin/replace.c:548 msgid "edit existing object" msgstr "redigera befintligt objekt" -#: builtin/replace.c:538 +#: builtin/replace.c:549 msgid "change a commit's parents" msgstr "ändra en inchecknings föräldrar" -#: builtin/replace.c:539 +#: builtin/replace.c:550 msgid "convert existing graft file" msgstr "konvertera befintlig ympningsfil" -#: builtin/replace.c:540 +#: builtin/replace.c:551 msgid "replace the ref if it exists" msgstr "ersätt referensen om den finns" -#: builtin/replace.c:542 +#: builtin/replace.c:553 msgid "do not pretty-print contents for --edit" msgstr "använd inte snygg visning av innehåll för --edit" -#: builtin/replace.c:543 +#: builtin/replace.c:554 msgid "use this format" msgstr "använd detta format" +#: builtin/replace.c:567 +msgid "--format cannot be used when not listing" +msgstr "--format kan inte användas utanför listning" + +#: builtin/replace.c:575 +msgid "-f only makes sense when writing a replacement" +msgstr "-f kan endast användas vid skrivning av ersättning" + +#: builtin/replace.c:579 +msgid "--raw only makes sense with --edit" +msgstr "--raw kan bara användas med --edit" + +#: builtin/replace.c:585 +msgid "-d needs at least one argument" +msgstr "-d behöver minst ett argument" + +#: builtin/replace.c:591 +msgid "bad number of arguments" +msgstr "fel antal argument" + +#: builtin/replace.c:597 +msgid "-e needs exactly one argument" +msgstr "-e tar exakt ett argument" + +#: builtin/replace.c:603 +msgid "-g needs at least one argument" +msgstr "-g tar minst ett argument" + +#: builtin/replace.c:609 +msgid "--convert-graft-file takes no argument" +msgstr "--convert-graft-file tar inga argument" + +#: builtin/replace.c:615 +msgid "only one pattern can be given with -l" +msgstr "endast ett mönster kan anges med -l" + #: builtin/rerere.c:13 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget <path>... | status | remaining | diff | gc]" -#: builtin/rerere.c:59 +#: builtin/rerere.c:60 msgid "register clean resolutions in index" msgstr "registrera rena lösningar i indexet" -#: builtin/reset.c:29 +#: builtin/rerere.c:79 +msgid "'git rerere forget' without paths is deprecated" +msgstr "\"git rerere forget\" utan sökvägar är föråldrat" + +#: builtin/rerere.c:113 +#, c-format +msgid "unable to generate diff for '%s'" +msgstr "misslyckades skapa diff för \"%s\"" + +#: builtin/reset.c:32 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]" -#: builtin/reset.c:30 +#: builtin/reset.c:33 msgid "git reset [-q] [<tree-ish>] [--] <paths>..." msgstr "git reset [-q] [<träd-igt>] [--] <sökvägar>..." -#: builtin/reset.c:31 +#: builtin/reset.c:34 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<träd-igt>] [--] [<sökvägar>...]" -#: builtin/reset.c:37 +#: builtin/reset.c:40 msgid "mixed" msgstr "blandad" -#: builtin/reset.c:37 +#: builtin/reset.c:40 msgid "soft" msgstr "mjuk" -#: builtin/reset.c:37 +#: builtin/reset.c:40 msgid "hard" msgstr "hård" -#: builtin/reset.c:37 +#: builtin/reset.c:40 msgid "merge" msgstr "sammanslagning" -#: builtin/reset.c:37 +#: builtin/reset.c:40 msgid "keep" msgstr "behåll" -#: builtin/reset.c:78 +#: builtin/reset.c:81 msgid "You do not have a valid HEAD." msgstr "Du har inte en giltig HEAD." -#: builtin/reset.c:80 +#: builtin/reset.c:83 msgid "Failed to find tree of HEAD." msgstr "Kunde inte hitta trädet för HEAD." -#: builtin/reset.c:86 +#: builtin/reset.c:89 #, c-format msgid "Failed to find tree of %s." msgstr "Kunde inte hitta trädet för %s." -#: builtin/reset.c:111 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD är nu på %s" - -#: builtin/reset.c:189 +#: builtin/reset.c:193 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." -#: builtin/reset.c:289 +#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 +#: builtin/stash.c:613 msgid "be quiet, only report errors" msgstr "var tyst, rapportera endast fel" -#: builtin/reset.c:291 +#: builtin/reset.c:295 msgid "reset HEAD and index" msgstr "återställ HEAD och index" -#: builtin/reset.c:292 +#: builtin/reset.c:296 msgid "reset only HEAD" msgstr "återställ endast HEAD" -#: builtin/reset.c:294 builtin/reset.c:296 +#: builtin/reset.c:298 builtin/reset.c:300 msgid "reset HEAD, index and working tree" msgstr "återställ HEAD, index och arbetskatalog" -#: builtin/reset.c:298 +#: builtin/reset.c:302 msgid "reset HEAD but keep local changes" msgstr "återställ HEAD men behåll lokala ändringar" -#: builtin/reset.c:304 +#: builtin/reset.c:308 msgid "record only the fact that removed paths will be added later" msgstr "registrera endast att borttagna sökvägar kommer läggas till senare" -#: builtin/reset.c:321 +#: builtin/reset.c:326 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Kunde inte slå upp \"%s\" som en giltig revision." -#: builtin/reset.c:329 +#: builtin/reset.c:334 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd." -#: builtin/reset.c:338 +#: builtin/reset.c:343 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch är inkompatibel med --{hard,mixed,soft}" -#: builtin/reset.c:347 +#: builtin/reset.c:353 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"." -#: builtin/reset.c:349 +#: builtin/reset.c:355 #, c-format msgid "Cannot do %s reset with paths." msgstr "Kan inte göra %s återställning med sökvägar." -#: builtin/reset.c:359 +#: builtin/reset.c:370 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s återställning tillåts inte i ett naket arkiv" -#: builtin/reset.c:363 +#: builtin/reset.c:374 msgid "-N can only be used with --mixed" msgstr "-N kan endast användas med --mixed" -#: builtin/reset.c:380 +#: builtin/reset.c:395 msgid "Unstaged changes after reset:" msgstr "Oköade ändringar efter återställning:" -#: builtin/reset.c:386 +#: builtin/reset.c:398 +#, c-format +msgid "" +"\n" +"It took %.2f seconds to enumerate unstaged changes after reset. You can\n" +"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n" +"to make this the default.\n" +msgstr "" +"\n" +"Det tog %.2f sekunder att räkna upp oköade ändringar efter återställning.\n" +"Du kan använda \"--quiet\" för att förhindra detta. Ställ " +"konfigurationsvariabeln\n" +"reset.quiet till true för att göra detta till förval.\n" + +#: builtin/reset.c:408 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." -#: builtin/reset.c:390 +#: builtin/reset.c:412 msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-list.c:397 +#: builtin/rev-list.c:405 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "kan inte kombinera --exclude-promisor-objects och --missing" -#: builtin/rev-list.c:455 +#: builtin/rev-list.c:466 msgid "object filtering requires --objects" msgstr "objektfiltrering kräver --objects" -#: builtin/rev-list.c:458 +#: builtin/rev-list.c:469 #, c-format msgid "invalid sparse value '%s'" msgstr "ogiltigt värde för sparse: \"%s\"" -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:510 msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" -#: builtin/rev-list.c:502 +#: builtin/rev-list.c:513 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering" -#: builtin/rev-parse.c:406 +#: builtin/rev-parse.c:408 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]" -#: builtin/rev-parse.c:411 +#: builtin/rev-parse.c:413 msgid "keep the `--` passed as an arg" msgstr "behåll \"--\" sänt som argument" -#: builtin/rev-parse.c:413 +#: builtin/rev-parse.c:415 msgid "stop parsing after the first non-option argument" msgstr "sluta tolka efter första argument som inte är flagga" -#: builtin/rev-parse.c:416 +#: builtin/rev-parse.c:418 msgid "output in stuck long form" msgstr "utdata fast i lång form" -#: builtin/rev-parse.c:549 +#: builtin/rev-parse.c:551 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -13669,92 +18355,93 @@ msgstr "" "Kör \"git rev-parse --parseopt -h\" för mer information om den första " "varianten." -#: builtin/revert.c:23 +#: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<flaggor>] <incheckning-igt>..." -#: builtin/revert.c:24 +#: builtin/revert.c:25 msgid "git revert <subcommand>" msgstr "git revert <underkommando>" -#: builtin/revert.c:29 +#: builtin/revert.c:30 msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "git cherry-pick [<flaggor>] <incheckning-igt>..." -#: builtin/revert.c:30 +#: builtin/revert.c:31 msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <underkommando>" -#: builtin/revert.c:90 +#: builtin/revert.c:72 +#, c-format +msgid "option `%s' expects a number greater than zero" +msgstr "flaggan \"%s\" antar ett numeriskt värde större än noll" + +#: builtin/revert.c:92 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s kan inte användas med %s" -#: builtin/revert.c:99 +#: builtin/revert.c:102 msgid "end revert or cherry-pick sequence" msgstr "avsluta revert- eller cherry-pick-sekvens" -#: builtin/revert.c:100 +#: builtin/revert.c:103 msgid "resume revert or cherry-pick sequence" msgstr "återuppta revert- eller cherry-pick-sekvens" -#: builtin/revert.c:101 +#: builtin/revert.c:104 msgid "cancel revert or cherry-pick sequence" msgstr "avbryt revert- eller cherry-pick-sekvens" -#: builtin/revert.c:102 +#: builtin/revert.c:106 msgid "don't automatically commit" msgstr "checka inte in automatiskt" -#: builtin/revert.c:103 +#: builtin/revert.c:107 msgid "edit the commit message" msgstr "redigera incheckningsmeddelandet" -#: builtin/revert.c:106 +#: builtin/revert.c:110 msgid "parent-number" msgstr "nummer-på-förälder" -#: builtin/revert.c:107 +#: builtin/revert.c:111 msgid "select mainline parent" msgstr "välj förälder för huvudlinje" -#: builtin/revert.c:109 +#: builtin/revert.c:113 msgid "merge strategy" msgstr "sammanslagningsstrategi" -#: builtin/revert.c:110 -msgid "option" -msgstr "alternativ" - -#: builtin/revert.c:111 +#: builtin/revert.c:115 msgid "option for merge strategy" msgstr "alternativ för sammanslagningsstrategi" -#: builtin/revert.c:120 +#: builtin/revert.c:124 msgid "append commit name" msgstr "lägg till incheckningsnamn" -#: builtin/revert.c:122 +#: builtin/revert.c:126 msgid "preserve initially empty commits" msgstr "behåll incheckningar som börjar som tomma" -#: builtin/revert.c:124 +#: builtin/revert.c:128 msgid "keep redundant, empty commits" msgstr "behåll redundanta, tomma incheckningar" -#: builtin/revert.c:214 +#: builtin/revert.c:227 msgid "revert failed" msgstr "\"revert\" misslyckades" -#: builtin/revert.c:227 +#: builtin/revert.c:240 msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" -#: builtin/rm.c:18 +#: builtin/rm.c:19 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<flaggor>] [--] <fil>..." -#: builtin/rm.c:206 +#: builtin/rm.c:207 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -13766,7 +18453,7 @@ msgstr[0] "" msgstr[1] "" "följande filer har köat innehåll som skiljer sig både från filen och HEAD:" -#: builtin/rm.c:211 +#: builtin/rm.c:212 msgid "" "\n" "(use -f to force removal)" @@ -13774,13 +18461,13 @@ msgstr "" "\n" "(använd -f för att tvinga borttagning)" -#: builtin/rm.c:215 +#: builtin/rm.c:216 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "följande fil har ändringar köade i indexet:" msgstr[1] "följande filer har ändringar köade i indexet:" -#: builtin/rm.c:219 builtin/rm.c:228 +#: builtin/rm.c:220 builtin/rm.c:229 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -13788,47 +18475,47 @@ msgstr "" "\n" "(använd --cached för att behålla filen eller -f för att tvinga borttagning)" -#: builtin/rm.c:225 +#: builtin/rm.c:226 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "följande fil har lokala ändringar:" msgstr[1] "följande filer har lokala ändringar:" -#: builtin/rm.c:241 +#: builtin/rm.c:242 msgid "do not list removed files" msgstr "lista inte borttagna filer" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "only remove from the index" msgstr "ta bara bort från indexet" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "override the up-to-date check" msgstr "överstyr àjour-testet" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "allow recursive removal" msgstr "tillåt rekursiv borttagning" -#: builtin/rm.c:246 +#: builtin/rm.c:247 msgid "exit with a zero status even if nothing matched" msgstr "avsluta med nollstatus även om inget träffades" -#: builtin/rm.c:306 +#: builtin/rm.c:289 +msgid "please stage your changes to .gitmodules or stash them to proceed" +msgstr "" +"löa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta" + +#: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" msgstr "tar inte bort \"%s\" rekursivt utan -r" -#: builtin/rm.c:345 +#: builtin/rm.c:346 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: kan inte ta bort %s" -#: builtin/rm.c:368 -#, c-format -msgid "could not remove '%s'" -msgstr "kunde inte ta bort \"%s\"" - #: builtin/send-pack.c:20 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" @@ -13857,18 +18544,6 @@ msgstr "läs referenser från standard in" msgid "print status from remote helper" msgstr "visa status från fjärrhjälpare" -#: builtin/serve.c:7 -msgid "git serve [<options>]" -msgstr "git serve [<flaggor>]" - -#: builtin/serve.c:17 builtin/upload-pack.c:23 -msgid "quit after a single request/response exchange" -msgstr "avsluta omedelbart efter första anrop/svar-utväxling" - -#: builtin/serve.c:19 -msgid "exit immediately after advertising capabilities" -msgstr "avsluta omedelbart efter kungörelse av kapabiliteter" - #: builtin/shortlog.c:14 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" @@ -13894,18 +18569,18 @@ msgid "Show the email address of each author" msgstr "Visa e-postadress för varje författare" #: builtin/shortlog.c:271 -msgid "w[,i1[,i2]]" -msgstr "w[,i1[,i2]]" +msgid "<w>[,<i1>[,<i2>]]" +msgstr "<w>[,<i1>[,<i2>]]" #: builtin/shortlog.c:272 msgid "Linewrap output" msgstr "Radbryt utdata" -#: builtin/shortlog.c:298 +#: builtin/shortlog.c:301 msgid "too many arguments given outside repository" msgstr "för många flaggor givna utanför arkivet" -#: builtin/show-branch.c:12 +#: builtin/show-branch.c:13 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -13917,131 +18592,131 @@ msgstr "" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]" -#: builtin/show-branch.c:16 +#: builtin/show-branch.c:17 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]" -#: builtin/show-branch.c:376 +#: builtin/show-branch.c:395 #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "ignorerar %s; kan inte hantera mer än %d referens" msgstr[1] "ignorerar %s; kan inte hantera mer än %d referenser" -#: builtin/show-branch.c:530 +#: builtin/show-branch.c:549 #, c-format msgid "no matching refs with %s" msgstr "inga motsvarande referenser med %s" -#: builtin/show-branch.c:626 +#: builtin/show-branch.c:646 msgid "show remote-tracking and local branches" msgstr "visa fjärrspårande och lokala grenar" -#: builtin/show-branch.c:628 +#: builtin/show-branch.c:648 msgid "show remote-tracking branches" msgstr "visa fjärrspårande grenar" -#: builtin/show-branch.c:630 +#: builtin/show-branch.c:650 msgid "color '*!+-' corresponding to the branch" msgstr "färga \"*!+-\" enligt grenen" -#: builtin/show-branch.c:632 +#: builtin/show-branch.c:652 msgid "show <n> more commits after the common ancestor" msgstr "visa <n> ytterligare incheckningar efter gemensam anfader" -#: builtin/show-branch.c:634 +#: builtin/show-branch.c:654 msgid "synonym to more=-1" msgstr "synonym till more=-1" -#: builtin/show-branch.c:635 +#: builtin/show-branch.c:655 msgid "suppress naming strings" msgstr "undertyck namnsträngar" -#: builtin/show-branch.c:637 +#: builtin/show-branch.c:657 msgid "include the current branch" msgstr "inkludera aktuell gren" -#: builtin/show-branch.c:639 +#: builtin/show-branch.c:659 msgid "name commits with their object names" msgstr "namnge incheckningar med deras objektnamn" -#: builtin/show-branch.c:641 +#: builtin/show-branch.c:661 msgid "show possible merge bases" msgstr "visa möjliga sammanslagningsbaser" -#: builtin/show-branch.c:643 +#: builtin/show-branch.c:663 msgid "show refs unreachable from any other ref" msgstr "visa referenser som inte kan nås från någon annan referens" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:665 msgid "show commits in topological order" msgstr "visa incheckningar i topologisk ordning" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:668 msgid "show only commits not on the first branch" msgstr "visa endast incheckningar inte på den första grenen" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:670 msgid "show merges reachable from only one tip" msgstr "visa sammanslagningar som endast kan nås från en spets" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:672 msgid "topologically sort, maintaining date order where possible" msgstr "sortera topologiskt, behåll datumordning när möjligt" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:675 msgid "<n>[,<base>]" msgstr "<n>[,<bas>]" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:676 msgid "show <n> most recent ref-log entries starting at base" msgstr "visa <n> nyaste refloggposter med början på bas" -#: builtin/show-branch.c:690 +#: builtin/show-branch.c:712 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "" "--reflog är inkompatibel med --all, --remotes, --independent eller --merge-" "base" -#: builtin/show-branch.c:714 +#: builtin/show-branch.c:736 msgid "no branches given, and HEAD is not valid" msgstr "inga grenar angavs, och HEAD är inte giltigt" -#: builtin/show-branch.c:717 +#: builtin/show-branch.c:739 msgid "--reflog option needs one branch name" msgstr "--reflog behöver ett namn på en gren" -#: builtin/show-branch.c:720 +#: builtin/show-branch.c:742 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "maximalt %d poster kan visas samtidigt." msgstr[1] "maximalt %d poster kan visas samtidigt." -#: builtin/show-branch.c:724 +#: builtin/show-branch.c:746 #, c-format msgid "no such ref %s" msgstr "ingen sådan referens %s" -#: builtin/show-branch.c:808 +#: builtin/show-branch.c:832 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "kan inte hantera mer än %d revision." msgstr[1] "kan inte hantera mer än %d revisioner." -#: builtin/show-branch.c:812 +#: builtin/show-branch.c:836 #, c-format msgid "'%s' is not a valid ref." msgstr "\"%s\" är inte en giltig referens." -#: builtin/show-branch.c:815 +#: builtin/show-branch.c:839 #, c-format msgid "cannot find commit %s (%s)" msgstr "hittar inte incheckning %s (%s)" -#: builtin/show-ref.c:10 +#: builtin/show-ref.c:11 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" @@ -14049,42 +18724,268 @@ msgstr "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mönster>...]" -#: builtin/show-ref.c:11 +#: builtin/show-ref.c:12 msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<mönster>]" -#: builtin/show-ref.c:159 +#: builtin/show-ref.c:161 msgid "only show tags (can be combined with heads)" msgstr "visa endast taggar (kan kombineras med huvuden)" -#: builtin/show-ref.c:160 +#: builtin/show-ref.c:162 msgid "only show heads (can be combined with tags)" msgstr "visa endast huvuden (kan kombineras med taggar)" -#: builtin/show-ref.c:161 +#: builtin/show-ref.c:163 msgid "stricter reference checking, requires exact ref path" msgstr "striktare referenskontroll, kräver exakt referenssökväg" -#: builtin/show-ref.c:164 builtin/show-ref.c:166 +#: builtin/show-ref.c:166 builtin/show-ref.c:168 msgid "show the HEAD reference, even if it would be filtered out" msgstr "visa HEAD-refrens, även när den skulle filtreras ut" -#: builtin/show-ref.c:168 +#: builtin/show-ref.c:170 msgid "dereference tags into object IDs" msgstr "avreferera taggar till objekt-id" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:172 msgid "only show SHA1 hash using <n> digits" msgstr "visa SHA1-hash endast med <n> siffror" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:176 msgid "do not print results to stdout (useful with --verify)" msgstr "visa inte resultat på standard ut (användbart med --verify)" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:178 msgid "show refs from stdin that aren't in local repository" msgstr "visa referenser från standard in som inte finns i lokalt arkiv" +#: builtin/stash.c:22 builtin/stash.c:37 +msgid "git stash list [<options>]" +msgstr "git stash list [<flaggor>]" + +#: builtin/stash.c:23 builtin/stash.c:42 +msgid "git stash show [<options>] [<stash>]" +msgstr "git stash show [<flaggor>] [<stash>]" + +#: builtin/stash.c:24 builtin/stash.c:47 +msgid "git stash drop [-q|--quiet] [<stash>]" +msgstr "git stash drop [-q|--quiet] [<stash>]" + +#: builtin/stash.c:25 +msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" +msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" + +#: builtin/stash.c:26 builtin/stash.c:62 +msgid "git stash branch <branchname> [<stash>]" +msgstr "git stash branch <grennamn> [<stash>]" + +#: builtin/stash.c:27 builtin/stash.c:67 +msgid "git stash clear" +msgstr "git stash clear" + +#: builtin/stash.c:28 builtin/stash.c:77 +msgid "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +" [--] [<pathspec>...]]" +msgstr "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n" +" [--] [<sökväg>...]]" + +#: builtin/stash.c:31 builtin/stash.c:84 +msgid "" +"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [<message>]" +msgstr "" +"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [<meddelande>]" + +#: builtin/stash.c:52 +msgid "git stash pop [--index] [-q|--quiet] [<stash>]" +msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" + +#: builtin/stash.c:57 +msgid "git stash apply [--index] [-q|--quiet] [<stash>]" +msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" + +#: builtin/stash.c:72 +msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" +msgstr "git stash store [-m|--message <meddelande>] [-q|--quiet] <incheckning>" + +#: builtin/stash.c:127 +#, c-format +msgid "'%s' is not a stash-like commit" +msgstr "\"%s\" är inte en \"stash\"-liknande incheckning" + +#: builtin/stash.c:147 +#, c-format +msgid "Too many revisions specified:%s" +msgstr "För många revisioner angivna:%s" + +#: builtin/stash.c:161 git-legacy-stash.sh:548 +msgid "No stash entries found." +msgstr "Inga ”stash”-poster hittades." + +#: builtin/stash.c:175 +#, c-format +msgid "%s is not a valid reference" +msgstr "%s är inte en giltigt referens" + +#: builtin/stash.c:224 git-legacy-stash.sh:75 +msgid "git stash clear with parameters is unimplemented" +msgstr "\"git stash clear\" med parametrar har inte implementerats" + +#: builtin/stash.c:403 +msgid "cannot apply a stash in the middle of a merge" +msgstr "kan inte tillämpa en \"stash\" mitt i en sammanslagning" + +#: builtin/stash.c:414 +#, c-format +msgid "could not generate diff %s^!." +msgstr "kunde inte skapa diff %s^!." + +#: builtin/stash.c:421 +msgid "conflicts in index.Try without --index." +msgstr "konflikter i indexet. Testa utan --index." + +#: builtin/stash.c:427 +msgid "could not save index tree" +msgstr "kunde inte spara indexträd" + +#: builtin/stash.c:434 +msgid "could not restore untracked files from stash" +msgstr "kunde inte återställa ospårade filer från stash-post" + +#: builtin/stash.c:448 +#, c-format +msgid "Merging %s with %s" +msgstr "Slår ihop %s med %s" + +#: builtin/stash.c:458 git-legacy-stash.sh:680 +msgid "Index was not unstashed." +msgstr "Indexet har inte tagits upp ur \"stash\":en" + +#: builtin/stash.c:516 builtin/stash.c:615 +msgid "attempt to recreate the index" +msgstr "försök återskapa indexet" + +#: builtin/stash.c:549 +#, c-format +msgid "Dropped %s (%s)" +msgstr "Kastade %s (%s)" + +#: builtin/stash.c:552 +#, c-format +msgid "%s: Could not drop stash entry" +msgstr "%s: Kunde inte kasta \"stash\"-post" + +#: builtin/stash.c:577 +#, c-format +msgid "'%s' is not a stash reference" +msgstr "\"%s\" är inte en \"stash\"-referens" + +#: builtin/stash.c:627 git-legacy-stash.sh:694 +msgid "The stash entry is kept in case you need it again." +msgstr "Stash-posten behålls ifall du behöver den igen." + +#: builtin/stash.c:650 git-legacy-stash.sh:712 +msgid "No branch name specified" +msgstr "Inget grennamn angavs" + +#: builtin/stash.c:789 builtin/stash.c:826 +#, c-format +msgid "Cannot update %s with %s" +msgstr "Kan inte uppdatera %s med %s" + +#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510 +msgid "stash message" +msgstr "\"stash\"-meddelande" + +#: builtin/stash.c:817 +msgid "\"git stash store\" requires one <commit> argument" +msgstr "\"git stash store\" kräver ett <incheckning>-argument" + +#: builtin/stash.c:1039 git-legacy-stash.sh:217 +msgid "No changes selected" +msgstr "Inga ändringar valda" + +#: builtin/stash.c:1135 git-legacy-stash.sh:150 +msgid "You do not have the initial commit yet" +msgstr "Du har inte den första incheckningen ännu" + +#: builtin/stash.c:1162 git-legacy-stash.sh:165 +msgid "Cannot save the current index state" +msgstr "Kan inte spara aktuellt tillstånd för indexet" + +#: builtin/stash.c:1171 git-legacy-stash.sh:180 +msgid "Cannot save the untracked files" +msgstr "Kan inte spara ospårade filer" + +#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200 +#: git-legacy-stash.sh:213 +msgid "Cannot save the current worktree state" +msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" + +#: builtin/stash.c:1219 git-legacy-stash.sh:233 +msgid "Cannot record working tree state" +msgstr "Kan inte registrera tillstånd för arbetskatalog" + +#: builtin/stash.c:1268 git-legacy-stash.sh:337 +msgid "Can't use --patch and --include-untracked or --all at the same time" +msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt" + +#: builtin/stash.c:1284 +msgid "Did you forget to 'git add'?" +msgstr "Glömde du använda \"git add\"?" + +#: builtin/stash.c:1299 git-legacy-stash.sh:345 +msgid "No local changes to save" +msgstr "Inga lokala ändringar att spara" + +#: builtin/stash.c:1306 git-legacy-stash.sh:350 +msgid "Cannot initialize stash" +msgstr "Kan inte initiera \"stash\"" + +#: builtin/stash.c:1321 git-legacy-stash.sh:354 +msgid "Cannot save the current status" +msgstr "Kan inte spara aktuell status" + +#: builtin/stash.c:1326 +#, c-format +msgid "Saved working directory and index state %s" +msgstr "Sparade arbetskatalogen och indexstatus %s" + +#: builtin/stash.c:1430 git-legacy-stash.sh:384 +msgid "Cannot remove worktree changes" +msgstr "Kan inte ta bort ändringar i arbetskatalogen" + +#: builtin/stash.c:1465 builtin/stash.c:1501 +msgid "keep index" +msgstr "behåll indexet" + +#: builtin/stash.c:1467 builtin/stash.c:1503 +msgid "stash in patch mode" +msgstr "\"stash\" i \"patch\"-läge" + +#: builtin/stash.c:1468 builtin/stash.c:1504 +msgid "quiet mode" +msgstr "tyst läge" + +#: builtin/stash.c:1470 builtin/stash.c:1506 +msgid "include untracked files in stash" +msgstr "ta med ospårade filer i \"stash\"" + +#: builtin/stash.c:1472 builtin/stash.c:1508 +msgid "include ignore files" +msgstr "ta med ignorerade filer" + +#: builtin/stash.c:1568 +#, c-format +msgid "could not exec %s" +msgstr "kunde inte köra %s" + #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" msgstr "git stripspace [-s | --strip-comments]" @@ -14093,103 +18994,136 @@ msgstr "git stripspace [-s | --strip-comments]" msgid "git stripspace [-c | --comment-lines]" msgstr "git stripspace [-c | --comment-lines]" -#: builtin/stripspace.c:36 +#: builtin/stripspace.c:37 msgid "skip and remove all lines starting with comment character" msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken" -#: builtin/stripspace.c:39 +#: builtin/stripspace.c:40 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:37 builtin/submodule--helper.c:1688 -#, c-format -msgid "No such ref: %s" -msgstr "Ingen sådan referens: %s" - -#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1697 +#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" -#: builtin/submodule--helper.c:61 +#: builtin/submodule--helper.c:62 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote tar inga argument" -#: builtin/submodule--helper.c:98 +#: builtin/submodule--helper.c:100 #, 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:406 builtin/submodule--helper.c:1211 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" -#: builtin/submodule--helper.c:411 +#: builtin/submodule--helper.c:413 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:462 builtin/submodule--helper.c:485 +#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627 +#: builtin/submodule--helper.c:650 #, 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:500 +#: builtin/submodule--helper.c:522 +#, c-format +msgid "Entering '%s'\n" +msgstr "Går in i \"%s\"\n" + +#: builtin/submodule--helper.c:525 +#, c-format +msgid "" +"run_command returned non-zero status for %s\n" +"." +msgstr "" +"run_command returnerade icke-nollstatus för %s\n" +"." + +#: builtin/submodule--helper.c:546 +#, c-format +msgid "" +"run_command returned non-zero status while recursing in the nested " +"submodules of %s\n" +"." +msgstr "" +"run_command returnerade icke-nollstatus vid rekursering in i nästlade " +"undermoduler för %s\n" +"." + +#: builtin/submodule--helper.c:562 +msgid "Suppress output of entering each submodule command" +msgstr "Dölj utdata från för varje undermodulskommando som startas" + +#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049 +msgid "Recurse into nested submodules" +msgstr "Rekursera in i nästlade undermoduler" + +#: builtin/submodule--helper.c:569 +msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" +msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]" + +#: builtin/submodule--helper.c:596 #, c-format msgid "" -"could not lookup configuration '%s'. Assuming this repository is its own " +"could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "" -"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sn eget " +"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget " "officiella uppström." -#: builtin/submodule--helper.c:511 +#: builtin/submodule--helper.c:664 #, 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:515 +#: builtin/submodule--helper.c:668 #, 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:525 +#: builtin/submodule--helper.c:678 #, 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:532 +#: builtin/submodule--helper.c:685 #, 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:554 +#: builtin/submodule--helper.c:707 msgid "Suppress output for initializing a submodule" msgstr "Dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:559 -msgid "git submodule--helper init [<path>]" -msgstr "git submodule--helper init [<sökväg>]" +#: builtin/submodule--helper.c:712 +msgid "git submodule--helper init [<options>] [<path>]" +msgstr "git submodule--helper init [<flaggor>] [<sökväg>]" -#: builtin/submodule--helper.c:631 builtin/submodule--helper.c:757 +#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910 #, 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:670 +#: builtin/submodule--helper.c:823 #, 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:697 builtin/submodule--helper.c:866 +#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "misslyckades rekursera in i undermodulen \"%s\"" -#: builtin/submodule--helper.c:721 builtin/submodule--helper.c:1031 +#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185 msgid "Suppress submodule status output" msgstr "Hindra statusutskrift för undermodul" -#: builtin/submodule--helper.c:722 +#: builtin/submodule--helper.c:875 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -14197,51 +19131,47 @@ msgstr "" "Visa incheckning från indexet istället för den som lagrats i undermodulens " "HEAD" -#: builtin/submodule--helper.c:723 +#: builtin/submodule--helper.c:876 msgid "recurse into nested submodules" msgstr "rekursera in i nästlade undermoduler" -#: builtin/submodule--helper.c:728 +#: builtin/submodule--helper.c:881 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]" -#: builtin/submodule--helper.c:752 +#: builtin/submodule--helper.c:905 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sökväg>" -#: builtin/submodule--helper.c:816 +#: builtin/submodule--helper.c:969 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synkroniserar undermodul-url för \"%s\"\n" -#: builtin/submodule--helper.c:822 +#: builtin/submodule--helper.c:975 #, 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:836 +#: builtin/submodule--helper.c:989 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "misslyckades hämta standardfjärr för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:847 +#: builtin/submodule--helper.c:1000 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "misslyckades uppdatera fjärr för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:895 +#: builtin/submodule--helper.c:1047 msgid "Suppress output of synchronizing submodule url" msgstr "Dölj utdata från synkroniering av undermodul-url" -#: builtin/submodule--helper.c:897 -msgid "Recurse into nested submodules" -msgstr "Rekursera in i nästlade undermoduler" - -#: builtin/submodule--helper.c:902 +#: builtin/submodule--helper.c:1054 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]" -#: builtin/submodule--helper.c:956 +#: builtin/submodule--helper.c:1108 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -14250,7 +19180,7 @@ msgstr "" "Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog (använd \"rm -rf" "\" om du verkligen vill ta bort den och all dess historik)" -#: builtin/submodule--helper.c:968 +#: builtin/submodule--helper.c:1120 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -14259,81 +19189,81 @@ msgstr "" "Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort " "dem" -#: builtin/submodule--helper.c:976 +#: builtin/submodule--helper.c:1128 #, c-format msgid "Cleared directory '%s'\n" msgstr "Rensade katalogen \"%s\"\n" -#: builtin/submodule--helper.c:978 +#: builtin/submodule--helper.c:1130 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n" -#: builtin/submodule--helper.c:987 +#: builtin/submodule--helper.c:1141 #, c-format msgid "could not create empty submodule directory %s" msgstr "kunde inte skapa tom undermodulskatalog %s" -#: builtin/submodule--helper.c:1003 +#: builtin/submodule--helper.c:1157 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n" -#: builtin/submodule--helper.c:1032 +#: builtin/submodule--helper.c:1186 msgid "Remove submodule working trees even if they contain local changes" msgstr "" "Ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar" -#: builtin/submodule--helper.c:1033 +#: builtin/submodule--helper.c:1187 msgid "Unregister all submodules" msgstr "Avregistrera alla undermoduler" -#: builtin/submodule--helper.c:1038 +#: builtin/submodule--helper.c:1192 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]" -#: builtin/submodule--helper.c:1052 +#: builtin/submodule--helper.c:1206 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler" -#: builtin/submodule--helper.c:1145 builtin/submodule--helper.c:1148 +#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s" -#: builtin/submodule--helper.c:1184 +#: builtin/submodule--helper.c:1340 #, 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:1191 +#: builtin/submodule--helper.c:1347 #, 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:1214 +#: builtin/submodule--helper.c:1370 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen skall klonas till" -#: builtin/submodule--helper.c:1217 +#: builtin/submodule--helper.c:1373 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1376 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:1228 +#: builtin/submodule--helper.c:1384 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1606 +#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871 msgid "force cloning progress" msgstr "tvinga kloningsförlopp" -#: builtin/submodule--helper.c:1236 +#: builtin/submodule--helper.c:1392 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -14341,82 +19271,93 @@ 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:1267 +#: builtin/submodule--helper.c:1423 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsökvägen ”%s”" -#: builtin/submodule--helper.c:1281 +#: builtin/submodule--helper.c:1437 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" -#: builtin/submodule--helper.c:1347 +#: builtin/submodule--helper.c:1473 +#, c-format +msgid "Invalid update mode '%s' for submodule path '%s'" +msgstr "Ogiltigt uppdateringsläge \"%s\" för undermodulsökväg \"%s\"" + +#: builtin/submodule--helper.c:1477 +#, c-format +msgid "Invalid update mode '%s' configured for submodule path '%s'" +msgstr "" +"Ogiltigt uppdateringsläge \"%s\" konfigurerat för undermodulsökväg \"%s\"" + +#: builtin/submodule--helper.c:1570 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:1351 +#: builtin/submodule--helper.c:1574 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:1604 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:1409 +#: builtin/submodule--helper.c:1633 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" -#: builtin/submodule--helper.c:1544 +#: builtin/submodule--helper.c:1777 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" -#: builtin/submodule--helper.c:1555 +#: builtin/submodule--helper.c:1788 #, 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:1585 builtin/submodule--helper.c:1808 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:1588 +#: builtin/submodule--helper.c:1853 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:1592 +#: builtin/submodule--helper.c:1857 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:1598 +#: builtin/submodule--helper.c:1863 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:1601 +#: builtin/submodule--helper.c:1866 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:1603 +#: builtin/submodule--helper.c:1868 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:1604 +#: builtin/submodule--helper.c:1869 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:1611 +#: builtin/submodule--helper.c:1876 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:1624 +#: builtin/submodule--helper.c:1889 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:1692 +#: builtin/submodule--helper.c:1937 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -14425,20 +19366,50 @@ 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:1809 +#: builtin/submodule--helper.c:2060 +#, c-format +msgid "could not get a repository handle for submodule '%s'" +msgstr "kunde inte få tag i arkivhandtag för undermodulen \"%s\"" + +#: builtin/submodule--helper.c:2093 msgid "recurse into submodules" msgstr "rekursera ner i undermoduler" -#: builtin/submodule--helper.c:1815 -msgid "git submodule--helper embed-git-dir [<path>...]" -msgstr "git submodule--helper embed-git-dir [<sökväg>...]" +#: builtin/submodule--helper.c:2099 +msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" +msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]" + +#: builtin/submodule--helper.c:2156 +msgid "check if it is safe to write to the .gitmodules file" +msgstr "se om det är säkert att skriva till .gitmodules-filen" + +#: builtin/submodule--helper.c:2159 +msgid "unset the config in the .gitmodules file" +msgstr "ta bort konfigurationen från .gitmodules-filen" + +#: builtin/submodule--helper.c:2164 +msgid "git submodule--helper config <name> [<value>]" +msgstr "git submodule--helper config <namn> [<värde>]" + +#: builtin/submodule--helper.c:2165 +msgid "git submodule--helper config --unset <name>" +msgstr "git submodule--helper config --unset <namn>" + +#: builtin/submodule--helper.c:2166 +msgid "git submodule--helper config --check-writeable" +msgstr "git submodule--helper config --check-writeable" + +#: builtin/submodule--helper.c:2185 git-submodule.sh:171 +#, sh-format +msgid "please make sure that the .gitmodules file is in the working tree" +msgstr "se till att .gitmodules finns i arbetskatalogen" -#: builtin/submodule--helper.c:1901 +#: builtin/submodule--helper.c:2235 git.c:433 git.c:685 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" -#: builtin/submodule--helper.c:1907 +#: builtin/submodule--helper.c:2241 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -14464,27 +19435,27 @@ msgstr "ta bort symbolisk referens" msgid "shorten ref output" msgstr "förkorta ref-utdata" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 msgid "reason" msgstr "skäl" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 msgid "reason of the update" msgstr "skäl till uppdateringen" -#: builtin/tag.c:24 +#: builtin/tag.c:25 msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " -"[<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" +"\t\t<tagname> [<head>]" msgstr "" -"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>] <taggnamn> " -"[<huvud>]" +"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>]\n" +"\t\t<taggnamn> [<huvud>]" -#: builtin/tag.c:25 +#: builtin/tag.c:27 msgid "git tag -d <tagname>..." msgstr "git tag -d <taggnamn>..." -#: builtin/tag.c:26 +#: builtin/tag.c:28 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" @@ -14494,21 +19465,21 @@ msgstr "" "<incheckning>] [--points-at <objekt>]\n" "\t\t[--format=<format>] [--[no-]merged [<incheckning>]] [<mönster>...]" -#: builtin/tag.c:28 +#: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<format>] <taggnamn>..." -#: builtin/tag.c:86 +#: builtin/tag.c:88 #, c-format msgid "tag '%s' not found." msgstr "taggen \"%s\" hittades inte." -#: builtin/tag.c:102 +#: builtin/tag.c:104 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tog bort tagg \"%s\" (var %s)\n" -#: builtin/tag.c:132 +#: builtin/tag.c:134 #, c-format msgid "" "\n" @@ -14521,7 +19492,7 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/tag.c:136 +#: builtin/tag.c:138 #, c-format msgid "" "\n" @@ -14536,212 +19507,220 @@ msgstr "" "Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n" "du vill.\n" -#: builtin/tag.c:190 +#: builtin/tag.c:192 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:192 +#: builtin/tag.c:194 msgid "unable to write tag file" msgstr "kunde inte skriva tagg-filen" -#: builtin/tag.c:217 +#: builtin/tag.c:210 +#, c-format +msgid "" +"You have created a nested tag. The object referred to by your new is\n" +"already a tag. If you meant to tag the object that it points to, use:\n" +"\n" +"\tgit tag -f %s %s^{}" +msgstr "" +"Du har skapat en nästlad tagg. Objektet som refereras av din nya är\n" +"redan en tagg. Om du skulle tagga objektet den pekar på, använd:\n" +"\n" +"\tgit tag -f %s %s^{}" + +#: builtin/tag.c:226 msgid "bad object type." msgstr "felaktig objekttyp." -#: builtin/tag.c:266 +#: builtin/tag.c:278 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:273 +#: builtin/tag.c:285 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:382 +#: builtin/tag.c:396 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:384 +#: builtin/tag.c:398 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:386 +#: builtin/tag.c:400 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:387 +#: builtin/tag.c:401 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:389 +#: builtin/tag.c:403 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:391 +#: builtin/tag.c:405 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:393 +#: builtin/tag.c:407 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:395 +#: builtin/tag.c:409 msgid "force edit of tag message" msgstr "tvinga redigering av incheckningsmeddelande" -#: builtin/tag.c:396 +#: builtin/tag.c:410 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:400 +#: builtin/tag.c:413 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:401 +#: builtin/tag.c:414 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:402 builtin/update-ref.c:368 +#: builtin/tag.c:415 builtin/update-ref.c:369 msgid "create a reflog" msgstr "skapa en reflog" -#: builtin/tag.c:404 +#: builtin/tag.c:417 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:405 +#: builtin/tag.c:418 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:406 builtin/tag.c:408 +#: builtin/tag.c:419 builtin/tag.c:421 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:407 builtin/tag.c:409 +#: builtin/tag.c:420 builtin/tag.c:422 msgid "print only tags that don't contain the commit" msgstr "visa endast taggar som inte innehåller incheckningen" -#: builtin/tag.c:410 +#: builtin/tag.c:423 msgid "print only tags that are merged" msgstr "visa endast taggar som slagits samman" -#: builtin/tag.c:411 +#: builtin/tag.c:424 msgid "print only tags that are not merged" msgstr "visa endast taggar som ej slagits samman" -#: builtin/tag.c:416 +#: builtin/tag.c:428 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:460 +#: builtin/tag.c:472 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" -#: builtin/tag.c:482 +#: builtin/tag.c:494 msgid "-n option is only allowed in list mode" msgstr "Flaggan -n är endast tillåten i listläge" -#: builtin/tag.c:484 +#: builtin/tag.c:496 msgid "--contains option is only allowed in list mode" msgstr "Flaggan --contains är endast tillåten i listläge" -#: builtin/tag.c:486 +#: builtin/tag.c:498 msgid "--no-contains option is only allowed in list mode" msgstr "Flaggan --no-contains är endast tillåten i listläge" -#: builtin/tag.c:488 +#: builtin/tag.c:500 msgid "--points-at option is only allowed in list mode" msgstr "Flaggan --points-at är endast tillåten i listläge" -#: builtin/tag.c:490 +#: builtin/tag.c:502 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "Flaggorna --merged och --no-merged är endast tillåtna i listläge" -#: builtin/tag.c:501 +#: builtin/tag.c:513 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:520 +#: builtin/tag.c:532 msgid "too many params" msgstr "för många parametrar" -#: builtin/tag.c:526 +#: builtin/tag.c:538 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:531 +#: builtin/tag.c:543 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:562 +#: builtin/tag.c:574 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" -#: builtin/unpack-objects.c:498 +#: builtin/unpack-objects.c:500 msgid "Unpacking objects" msgstr "Packar upp objekt" -#: builtin/update-index.c:82 +#: builtin/update-index.c:83 #, c-format msgid "failed to create directory %s" msgstr "misslyckades skapa katalogen %s" -#: builtin/update-index.c:88 -#, c-format -msgid "failed to stat %s" -msgstr "misslyckades ta status på %s" - -#: builtin/update-index.c:98 +#: builtin/update-index.c:99 #, c-format msgid "failed to create file %s" msgstr "misslyckades skapa filen %s" -#: builtin/update-index.c:106 +#: builtin/update-index.c:107 #, c-format msgid "failed to delete file %s" msgstr "misslyckades ta bort filen %s" -#: builtin/update-index.c:113 builtin/update-index.c:219 +#: builtin/update-index.c:114 builtin/update-index.c:220 #, c-format msgid "failed to delete directory %s" msgstr "misslyckades ta bort katalogen %s" -#: builtin/update-index.c:138 +#: builtin/update-index.c:139 #, c-format msgid "Testing mtime in '%s' " msgstr "Testar mtime i \"%s\" " -#: builtin/update-index.c:152 +#: builtin/update-index.c:153 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:165 +#: builtin/update-index.c:166 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:178 +#: builtin/update-index.c:179 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:189 +#: builtin/update-index.c:190 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:200 +#: builtin/update-index.c:201 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:213 +#: builtin/update-index.c:214 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:220 +#: builtin/update-index.c:221 msgid " OK" msgstr " OK" @@ -14749,139 +19728,139 @@ msgstr " OK" msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<flaggor>] [--] [<fil>...]" -#: builtin/update-index.c:946 +#: builtin/update-index.c:971 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är àjour" -#: builtin/update-index.c:949 +#: builtin/update-index.c:974 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:952 +#: builtin/update-index.c:977 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:954 +#: builtin/update-index.c:979 msgid "let files replace directories and vice-versa" msgstr "låt filer ersätta kataloger och omvänt" -#: builtin/update-index.c:956 +#: builtin/update-index.c:981 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:958 +#: builtin/update-index.c:983 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" -#: builtin/update-index.c:961 +#: builtin/update-index.c:986 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:965 +#: builtin/update-index.c:990 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:969 +#: builtin/update-index.c:994 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:970 +#: builtin/update-index.c:995 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:979 +#: builtin/update-index.c:1005 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:982 +#: builtin/update-index.c:1008 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:985 +#: builtin/update-index.c:1011 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:988 +#: builtin/update-index.c:1014 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:991 +#: builtin/update-index.c:1017 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:993 +#: builtin/update-index.c:1019 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:995 +#: builtin/update-index.c:1021 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:997 +#: builtin/update-index.c:1023 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:1001 +#: builtin/update-index.c:1027 msgid "add entries from standard input to the index" msgstr "lägg poster från standard in till indexet" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1031 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:1009 +#: builtin/update-index.c:1035 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: builtin/update-index.c:1013 +#: builtin/update-index.c:1039 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:1016 +#: builtin/update-index.c:1042 msgid "report actions to standard output" msgstr "rapportera åtgärder på standard ut" -#: builtin/update-index.c:1018 +#: builtin/update-index.c:1044 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1048 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1050 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1052 msgid "enable/disable untracked cache" msgstr "aktivera/inaktivera ospårad cache" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1054 msgid "test if the filesystem supports untracked cache" msgstr "testa om filsystemet stöder ospårad cache" -#: builtin/update-index.c:1030 +#: builtin/update-index.c:1056 msgid "enable untracked cache without testing the filesystem" msgstr "aktivera ospårad cache utan att testa filsystemet" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1058 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:1034 +#: builtin/update-index.c:1060 msgid "enable or disable file system monitor" msgstr "aktivera eller inaktivera filsystemsövervakning" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1062 msgid "mark files as fsmonitor valid" msgstr "markera filer som \"fsmonitor valid\"" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1065 msgid "clear fsmonitor valid bit" msgstr "töm \"fsmonitor valid\"-bit" -#: builtin/update-index.c:1138 +#: builtin/update-index.c:1168 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -14889,7 +19868,7 @@ msgstr "" "core.splitIndex är satt till false; ta bort eller ändra det om du verkligen " "vill aktivera delat index" -#: builtin/update-index.c:1147 +#: builtin/update-index.c:1177 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -14897,7 +19876,7 @@ msgstr "" "core.splitIndex är satt till true; ta bort eller ändra det om du verkligen " "vill inaktivera delat index" -#: builtin/update-index.c:1158 +#: builtin/update-index.c:1188 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -14905,11 +19884,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:1162 +#: builtin/update-index.c:1192 msgid "Untracked cache disabled" msgstr "Ospårad cache är inaktiverad" -#: builtin/update-index.c:1170 +#: builtin/update-index.c:1200 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -14917,26 +19896,26 @@ msgstr "" "core.untrackedCache är satt till false; ta bort eller ändra det om du " "verkligen vill aktivera den ospårade cachen" -#: builtin/update-index.c:1174 +#: builtin/update-index.c:1204 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Ospårad cache är aktiverad för \"%s\"" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1212 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:1186 +#: builtin/update-index.c:1216 msgid "fsmonitor enabled" msgstr "fsmonitor aktiverat" -#: builtin/update-index.c:1189 +#: builtin/update-index.c:1219 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:1193 +#: builtin/update-index.c:1223 msgid "fsmonitor disabled" msgstr "fsmonitor inaktiverat" @@ -14952,19 +19931,19 @@ msgstr "git update-ref [<flaggor>] <refnamn> <gammaltvärde> [<nyttvärde>]" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<flaggor>] --stdin [-z]" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:364 msgid "delete the reference" msgstr "ta bort referensen" -#: builtin/update-ref.c:365 +#: builtin/update-ref.c:366 msgid "update <refname> not the one it points to" msgstr "uppdatera <refnamn> inte det den pekar på" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:367 msgid "stdin has NUL-terminated arguments" msgstr "standard in har NUL-terminerade argument" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:368 msgid "read updates from stdin" msgstr "läs uppdateringar från standard in" @@ -14980,6 +19959,10 @@ msgstr "uppdatera informationsfilerna från grunden" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<flaggor>] <katalog>" +#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17 +msgid "quit after a single request/response exchange" +msgstr "avsluta omedelbart efter första anrop/svar-utväxling" + #: builtin/upload-pack.c:25 msgid "exit immediately after initial ref advertisement" msgstr "avsluta omedelbart efter inledande kungörelse av referenser" @@ -14992,15 +19975,15 @@ msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "avbryt överföringen efter <n> sekunders inaktivitet" -#: builtin/verify-commit.c:18 +#: builtin/verify-commit.c:20 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <incheckning>..." -#: builtin/verify-commit.c:73 +#: builtin/verify-commit.c:76 msgid "print commit contents" msgstr "visa innehåll för incheckning" -#: builtin/verify-commit.c:74 builtin/verify-tag.c:38 +#: builtin/verify-commit.c:77 builtin/verify-tag.c:38 msgid "print raw gpg status output" msgstr "visa råa gpg-statusdata" @@ -15024,50 +20007,55 @@ msgstr "git verify-tag [-v | --verbose] [--format=<format] <tagg>..." msgid "print tag contents" msgstr "visa innehåll för tag" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<flaggor>] <sökväg> [<incheckning-igt>]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree list [<options>]" msgstr "git worktree list [<flaggor>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<flaggor>] <sökväg>" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <arbetskatalog> <ny-sökväg>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<flaggor>]" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<flaggor>] <arbetskatalog>" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree unlock <path>" msgstr "git worktree unlock <sökväg>" -#: builtin/worktree.c:58 +#: builtin/worktree.c:61 builtin/worktree.c:891 +#, c-format +msgid "failed to delete '%s'" +msgstr "misslyckades ta bort \"%s\"" + +#: builtin/worktree.c:80 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Tar bort worktrees/%s: inte en giltig katalog" -#: builtin/worktree.c:64 +#: builtin/worktree.c:86 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte" -#: builtin/worktree.c:69 builtin/worktree.c:78 +#: builtin/worktree.c:91 builtin/worktree.c:100 #, 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:88 +#: builtin/worktree.c:110 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -15076,205 +20064,245 @@ msgstr "" "Tar bort worktrees/%s: kort läsning (förväntade %<PRIuMAX> byte, läste " "%<PRIuMAX>)" -#: builtin/worktree.c:96 +#: builtin/worktree.c:118 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" -#: builtin/worktree.c:105 +#: builtin/worktree.c:127 #, 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:152 +#: builtin/worktree.c:166 msgid "report pruned working trees" msgstr "rapportera borttagna arbetskataloger" -#: builtin/worktree.c:154 +#: builtin/worktree.c:168 msgid "expire working trees older than <time>" msgstr "låt tid gå ut för arbetskataloger äldre än <tid>" -#: builtin/worktree.c:229 +#: builtin/worktree.c:235 #, c-format msgid "'%s' already exists" msgstr "\"%s\" finns redan" -#: builtin/worktree.c:260 +#: builtin/worktree.c:252 +#, c-format +msgid "unable to re-add worktree '%s'" +msgstr "kunde inte lägga in arbetskatalogen \"%s\" igen" + +#: builtin/worktree.c:257 +#, c-format +msgid "" +"'%s' is a missing but locked worktree;\n" +"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" +msgstr "" +"\"%s\" är en saknad men låst arbetskatalog;\n" +"använd \"add -f -f\" för att överstyra, eller \"unlock\" och \"prune\" eller " +"\"remove\" för att rensa" + +#: builtin/worktree.c:259 +#, c-format +msgid "" +"'%s' is a missing but already registered worktree;\n" +"use 'add -f' to override, or 'prune' or 'remove' to clear" +msgstr "" +"\"%s\" är en saknad men redan registrerad arbetskatalog;\n" +"använd \"add -f\" för att överstyra, eller \"prune\" eller \"remove\" för " +"att rensa" + +#: builtin/worktree.c:302 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:373 builtin/worktree.c:379 +#: builtin/worktree.c:432 builtin/worktree.c:438 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Förbereder arbetskatalog (ny gren \"%s\")" -#: builtin/worktree.c:375 +#: builtin/worktree.c:434 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Förbereder arbetskatalog (återställer gren \"%s\"; var på %s)" -#: builtin/worktree.c:384 +#: builtin/worktree.c:443 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Förbereder arbetskatalog (checkar ut \"%s\")" -#: builtin/worktree.c:390 +#: builtin/worktree.c:449 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)" -#: builtin/worktree.c:431 +#: builtin/worktree.c:490 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:434 +#: builtin/worktree.c:493 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:436 +#: builtin/worktree.c:495 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:438 +#: builtin/worktree.c:497 msgid "populate the new working tree" msgstr "befolka den nya arbetskatalogen" -#: builtin/worktree.c:439 +#: builtin/worktree.c:498 msgid "keep the new working tree locked" msgstr "låt arbetskatalogen förbli låst" -#: builtin/worktree.c:441 +#: builtin/worktree.c:501 msgid "set up tracking mode (see git-branch(1))" msgstr "ställ in spårningsläge (se git-branch(1))" -#: builtin/worktree.c:444 +#: builtin/worktree.c:504 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:452 +#: builtin/worktree.c:512 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" -#: builtin/worktree.c:511 +#: builtin/worktree.c:573 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:611 +#: builtin/worktree.c:673 msgid "reason for locking" msgstr "orsak till lås" -#: builtin/worktree.c:623 builtin/worktree.c:656 builtin/worktree.c:710 -#: builtin/worktree.c:850 +#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 +#: builtin/worktree.c:919 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:625 builtin/worktree.c:658 +#: builtin/worktree.c:687 builtin/worktree.c:720 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:630 +#: builtin/worktree.c:692 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:632 +#: builtin/worktree.c:694 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:660 +#: builtin/worktree.c:722 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" -#: builtin/worktree.c:685 +#: builtin/worktree.c:763 msgid "working trees containing submodules cannot be moved or removed" msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort" -#: builtin/worktree.c:712 builtin/worktree.c:852 +#: builtin/worktree.c:771 +msgid "force move even if worktree is dirty or locked" +msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst" + +#: builtin/worktree.c:794 builtin/worktree.c:921 #, c-format msgid "'%s' is a main working tree" msgstr "\"%s\" är inte en huvudarbetskatalog" -#: builtin/worktree.c:717 +#: builtin/worktree.c:799 #, c-format msgid "could not figure out destination name from '%s'" msgstr "kunde inte lista ut målnamn från \"%s\"" -#: builtin/worktree.c:723 +#: builtin/worktree.c:805 #, c-format msgid "target '%s' already exists" msgstr "målet \"%s\" finns redan" -#: builtin/worktree.c:730 +#: builtin/worktree.c:813 #, c-format -msgid "cannot move a locked working tree, lock reason: %s" -msgstr "kan inte flytta en låst arbetskatalog, orsak till lås: %s" +msgid "" +"cannot move a locked working tree, lock reason: %s\n" +"use 'move -f -f' to override or unlock first" +msgstr "" +"kan inte flytta en låst arbetskatalog, orsak till lås: %s\n" +"använd \"move -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:732 -msgid "cannot move a locked working tree" -msgstr "kan inte flytta en låst arbetskatalog" +#: builtin/worktree.c:815 +msgid "" +"cannot move a locked working tree;\n" +"use 'move -f -f' to override or unlock first" +msgstr "" +"kan inte flytta en låst arbetskatalog;\n" +"använd \"move -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:735 +#: builtin/worktree.c:818 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s" -#: builtin/worktree.c:740 +#: builtin/worktree.c:823 #, c-format msgid "failed to move '%s' to '%s'" msgstr "misslyckades flytta \"%s\" till \"%s\"" -#: builtin/worktree.c:788 +#: builtin/worktree.c:871 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "misslyckades köra \"git status\" på \"%s\"" -#: builtin/worktree.c:792 +#: builtin/worktree.c:875 #, c-format msgid "'%s' is dirty, use --force to delete it" msgstr "\"%s\" är smutsigt, använd --force för att ta bort det" -#: builtin/worktree.c:797 +#: builtin/worktree.c:880 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "misslyckades köra \"git status\" på \"%s\", kod %d" -#: builtin/worktree.c:808 builtin/worktree.c:822 -#, c-format -msgid "failed to delete '%s'" -msgstr "misslyckades ta bort \"%s\"" - -#: builtin/worktree.c:834 -msgid "force removing even if the worktree is dirty" -msgstr "tvinga ta bort även om arbetskatalogen är smutsig" +#: builtin/worktree.c:903 +msgid "force removal even if worktree is dirty or locked" +msgstr "tvinga ta bort även om arbetskatalogen är smutsig eller låst" -#: builtin/worktree.c:856 +#: builtin/worktree.c:926 #, c-format -msgid "cannot remove a locked working tree, lock reason: %s" -msgstr "kan inte ta bort en låst arbetskatalog, orsak till låset: %s" +msgid "" +"cannot remove a locked working tree, lock reason: %s\n" +"use 'remove -f -f' to override or unlock first" +msgstr "" +"kan inte ta bort en låst arbetskatalog, orsak till låset: %s\n" +"använd \"remove -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:858 -msgid "cannot remove a locked working tree" -msgstr "kan inte ta bort en låst arbetskatalog" +#: builtin/worktree.c:928 +msgid "" +"cannot remove a locked working tree;\n" +"use 'remove -f -f' to override or unlock first" +msgstr "" +"kan inte ta bort en låst arbetskatalog;\n" +"använd \"remove -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:861 +#: builtin/worktree.c:931 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s" -#: builtin/write-tree.c:14 +#: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]" -#: builtin/write-tree.c:27 +#: builtin/write-tree.c:28 msgid "<prefix>/" msgstr "<prefix>/" -#: builtin/write-tree.c:28 +#: builtin/write-tree.c:29 msgid "write tree object for a subdirectory <prefix>" msgstr "visa trädobjekt för underkatalogen <prefix>" @@ -15282,7 +20310,7 @@ msgstr "visa trädobjekt för underkatalogen <prefix>" msgid "only useful for debugging" msgstr "endast användbart vid felsökning" -#: credential-cache--daemon.c:222 +#: credential-cache--daemon.c:223 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -15295,10 +20323,27 @@ msgstr "" "\n" "\tchmod 0700 %s" -#: credential-cache--daemon.c:271 +#: credential-cache--daemon.c:272 msgid "print debugging messages to stderr" msgstr "skriv felsökningsmeddelanden på standard fel" +#: t/helper/test-reach.c:152 +#, c-format +msgid "commit %s is not marked reachable" +msgstr "incheckning %s är inte märkt nåbar" + +#: t/helper/test-reach.c:162 +msgid "too many commits marked reachable" +msgstr "för många incheckningar markerade nåbara" + +#: t/helper/test-serve-v2.c:7 +msgid "test-tool serve-v2 [<options>]" +msgstr "test-tool serve-v2 [<flaggor>]" + +#: t/helper/test-serve-v2.c:19 +msgid "exit immediately after advertising capabilities" +msgstr "avsluta omedelbart efter kungörelse av kapabiliteter" + #: git.c:27 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" @@ -15326,66 +20371,144 @@ 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." -#: git.c:173 +#: git.c:185 #, c-format msgid "no directory given for --git-dir\n" msgstr "ingen katalog angavs för --git-dir\n" -#: git.c:187 +#: git.c:199 #, c-format msgid "no namespace given for --namespace\n" msgstr "ingen namnrymd angavs för --namespace\n" -#: git.c:201 +#: git.c:213 #, c-format msgid "no directory given for --work-tree\n" msgstr "ingen katalog angavs för --work-tree\n" -#: git.c:215 +#: git.c:227 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "inget prefix angavs för --super-prefix\n" -#: git.c:237 +#: git.c:249 #, c-format msgid "-c expects a configuration string\n" msgstr "-c förväntar en konfigurationssträng\n" -#: git.c:275 +#: git.c:287 #, c-format msgid "no directory given for -C\n" msgstr "ingen katalog angavs för -C\n" -#: git.c:300 +#: git.c:313 #, c-format msgid "unknown option: %s\n" msgstr "okänd flagga: %s\n" -#: git.c:765 +#: git.c:359 +#, c-format +msgid "while expanding alias '%s': '%s'" +msgstr "vid expandering av aliaset \"%s\": \"%s\"" + +#: git.c:368 +#, c-format +msgid "" +"alias '%s' changes environment variables.\n" +"You can use '!git' in the alias to do this" +msgstr "" +"aliaset \"%s\" ändrar miljövariabler.\n" +"Du kan använda \"!git\" i aliaset för att göra det" + +#: git.c:376 +#, c-format +msgid "empty alias for %s" +msgstr "tomt alias för %s" + +#: git.c:379 +#, c-format +msgid "recursive alias: %s" +msgstr "rekursivt alias: %s" + +#: git.c:459 +msgid "write failure on standard output" +msgstr "skrivfel på standard ut" + +#: git.c:461 +msgid "unknown write failure on standard output" +msgstr "okänt skrivfel på standard ut" + +#: git.c:463 +msgid "close failed on standard output" +msgstr "stäng misslyckades på standard ut" + +#: git.c:797 +#, c-format +msgid "alias loop detected: expansion of '%s' does not terminate:%s" +msgstr "alias-slinga detekterades: expansionen av \"%s\" avslutas aldrig:%s" + +#: git.c:847 +#, c-format +msgid "cannot handle %s as a builtin" +msgstr "kan inte hantera %s som inbyggd" + +#: git.c:860 +#, c-format +msgid "" +"usage: %s\n" +"\n" +msgstr "" +"användning: %s\n" +"\n" + +#: git.c:880 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" "expandering av alias \"%s\" misslyckades; \"%s\" är inte ett git-kommando\n" -#: git.c:777 +#: git.c:892 #, c-format msgid "failed to run command '%s': %s\n" msgstr "misslyckades köra kommandot \"%s\": %s\n" -#: http.c:348 +#: http.c:378 #, 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:369 +#: http.c:399 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Delegerad styrning stöds inte av cURL < 7.22.0" -#: http.c:378 +#: http.c:408 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:1854 +#: http.c:876 +msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" +msgstr "CURLSSLOPT_NO_REVOKE stöds inte av cURL < 7.44.0" + +#: http.c:949 +msgid "Protocol restrictions not supported with cURL < 7.19.4" +msgstr "Prtokollbegränsningar stöds inte av cURL < 7.19.4" + +#: http.c:1085 +#, c-format +msgid "Unsupported SSL backend '%s'. Supported SSL backends:" +msgstr "SSL-bakändan \"%s\" stöds inte. Dessa SSL-bakändor stöds:" + +#: http.c:1092 +#, c-format +msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" +msgstr "Kan inte sätta SSL-bakända till \"%s\": cURL byggdes utan SSL-bakändor" + +#: http.c:1096 +#, c-format +msgid "Could not set SSL backend to '%s': already set" +msgstr "Kunde inte sätta SSL-bakända till \"%s\": redan valt" + +#: http.c:1965 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -15396,39 +20519,159 @@ msgstr "" " bad om: %s\n" " omdirigering: %s" -#: remote-curl.c:401 +#: remote-curl.c:157 +#, c-format +msgid "invalid quoting in push-option value: '%s'" +msgstr "felaktig citering på värde för push-option: \"%s\"" + +#: remote-curl.c:254 +#, c-format +msgid "%sinfo/refs not valid: is this a git repository?" +msgstr "%sinfo/refs inte giltig: är detta ett git-arkiv?" + +#: remote-curl.c:355 +msgid "invalid server response; expected service, got flush packet" +msgstr "ogiltigt svar från servern; förväntade tjänst, fick flush-paket" + +#: remote-curl.c:386 +#, c-format +msgid "invalid server response; got '%s'" +msgstr "ogiltigt svar från servern; fick \"%s\"" + +#: remote-curl.c:446 +#, c-format +msgid "repository '%s' not found" +msgstr "arkivet \"%s\" hittades inte" + +#: remote-curl.c:450 +#, c-format +msgid "Authentication failed for '%s'" +msgstr "Autentisering misslyckades \"%s\"" + +#: remote-curl.c:454 +#, c-format +msgid "unable to access '%s': %s" +msgstr "kan inte komma åt \"%s\": %s" + +#: remote-curl.c:460 #, c-format msgid "redirecting to %s" msgstr "omdirigerar till %s" -#: list-objects-filter-options.h:59 +#: remote-curl.c:584 +msgid "shouldn't have EOF when not gentle on EOF" +msgstr "borde inte ha EOF när inte försiktig på EOF" + +#: remote-curl.c:664 +msgid "unable to rewind rpc post data - try increasing http.postBuffer" +msgstr "kunde inte spola tillbaka rpc-postdata - försök öka http.postBuffer" + +#: remote-curl.c:724 +#, c-format +msgid "RPC failed; %s" +msgstr "RPC misslyckades; %s" + +#: remote-curl.c:764 +msgid "cannot handle pushes this big" +msgstr "kan inte hantera så stora sändningar" + +#: remote-curl.c:879 +#, c-format +msgid "cannot deflate request; zlib deflate error %d" +msgstr "kan inte packa upp anrop; zlib-deflate-fel %d" + +#: remote-curl.c:883 +#, c-format +msgid "cannot deflate request; zlib end error %d" +msgstr "kan inte packa upp anrop; zlib-slutfel %d" + +#: remote-curl.c:1014 +msgid "dumb http transport does not support shallow capabilities" +msgstr "dum http-transport stöder inte grunda arkiv" + +#: remote-curl.c:1028 +msgid "fetch failed." +msgstr "mottagning misslyckades." + +#: remote-curl.c:1076 +msgid "cannot fetch by sha1 over smart http" +msgstr "kan inte hämta med sha1 över smart http" + +#: remote-curl.c:1120 remote-curl.c:1126 +#, c-format +msgid "protocol error: expected sha/ref, got %s'" +msgstr "protokollfel: förväntade sha/ref, fick \"%s\"" + +#: remote-curl.c:1138 remote-curl.c:1252 +#, c-format +msgid "http transport does not support %s" +msgstr "http-transporten stöder inte %s" + +#: remote-curl.c:1174 +msgid "git-http-push failed" +msgstr "git-http-push misslyckades" + +#: remote-curl.c:1360 +msgid "remote-curl: usage: git remote-curl <remote> [<url>]" +msgstr "remote-curl: användning: git remote-curl <fjärr> [<url>]" + +#: remote-curl.c:1392 +msgid "remote-curl: error reading command stream from git" +msgstr "remote-curl: fel vid läsning av kommandoström från git" + +#: remote-curl.c:1399 +msgid "remote-curl: fetch attempted without a local repo" +msgstr "remote-curl: försökte ta emot utan lokalt arkiv" + +#: remote-curl.c:1439 +#, c-format +msgid "remote-curl: unknown command '%s' from git" +msgstr "remote-curl: okänt kommando \"%s\" från git" + +#: list-objects-filter-options.h:63 msgid "args" msgstr "argument" -#: list-objects-filter-options.h:60 +#: list-objects-filter-options.h:64 msgid "object filtering" msgstr "objektfiltrering" -#: parse-options.h:157 +#: parse-options.h:169 msgid "expiry-date" msgstr "giltig-till" -#: parse-options.h:172 +#: parse-options.h:183 msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakåtkompatibilitet)" -#: parse-options.h:251 +#: parse-options.h:296 msgid "be more verbose" msgstr "var mer pratsam" -#: parse-options.h:253 +#: parse-options.h:298 msgid "be more quiet" msgstr "var mer tyst" -#: parse-options.h:259 +#: parse-options.h:304 msgid "use <n> digits to display SHA-1s" msgstr "använd <n> siffror för att visa SHA-1:or" +#: parse-options.h:323 +msgid "how to strip spaces and #comments from message" +msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" + +#: ref-filter.h:101 +msgid "key" +msgstr "nyckel" + +#: ref-filter.h:101 +msgid "field name to sort on" +msgstr "fältnamn att sortera på" + +#: rerere.h:44 +msgid "update the index with reused conflict resolution if possible" +msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt" + #: command-list.h:50 msgid "Add file contents to the index" msgstr "Lägg filinnehåll till indexet" @@ -15446,8 +20689,8 @@ msgid "Apply a patch to files and/or to the index" msgstr "Tillämpa en patch på filer och/eller indexet" #: command-list.h:54 -msgid "Import an Arch repository into Git" -msgstr "Importera ett Arch-arkiv till Git" +msgid "Import a GNU Arch repository into Git" +msgstr "Importera ett GNU Arch-arkiv till Git" #: command-list.h:55 msgid "Create an archive of files from a named tree" @@ -15527,7 +20770,7 @@ msgid "Record changes to the repository" msgstr "Protokollför ändringar i arkivet" #: command-list.h:74 -msgid "Write and verify Git commit graph files" +msgid "Write and verify Git commit-graph files" msgstr "Skriv och verifiera Git-incheckningsgraffiler" #: command-list.h:75 @@ -15588,7 +20831,7 @@ msgstr "Jämför en träd med arbetskatalogen eller indexet" #: command-list.h:89 msgid "Compares the content and mode of blobs found via two tree objects" -msgstr "Visar innehåll och läge för blob:ar som hittats via två trädobjekt" +msgstr "Visar innehåll och läge för blobbar som hittats via två trädobjekt" #: command-list.h:90 msgid "Show changes using common diff tools" @@ -15683,9 +20926,9 @@ msgid "Instantly browse your working repository in gitweb" msgstr "Omedelbart bläddra i din arbetskatalog med gitweb" #: command-list.h:113 -msgid "add or parse structured information in commit messages" +msgid "Add or parse structured information in commit messages" msgstr "" -"lägg till eller tolka strukturerad information i incheckningsmeddelanden" +"Lägg till eller tolka strukturerad information i incheckningsmeddelanden" #: command-list.h:114 msgid "The Git repository browser" @@ -15744,326 +20987,330 @@ msgid "Show three-way merge without touching index" msgstr "Visa trevägssammanslagning utan att röra indexet" #: command-list.h:128 +msgid "Write and verify multi-pack-indexes" +msgstr "Skriv och verifiera multi-pack-index" + +#: command-list.h:129 msgid "Creates a tag object" msgstr "Skapar ett taggobjekt" -#: command-list.h:129 +#: command-list.h:130 msgid "Build a tree-object from ls-tree formatted text" msgstr "Bygg ett trädobjekt från ls-tree-formaterad text" -#: command-list.h:130 +#: command-list.h:131 msgid "Move or rename a file, a directory, or a symlink" msgstr "Flytta eller byt namn på en fil, katalog eller symbolisk länk" -#: command-list.h:131 +#: command-list.h:132 msgid "Find symbolic names for given revs" msgstr "Hitta symboliska namn för givna referenser" -#: command-list.h:132 +#: command-list.h:133 msgid "Add or inspect object notes" msgstr "Lägg till eller inspektera objektanteckningar" -#: command-list.h:133 +#: command-list.h:134 msgid "Import from and submit to Perforce repositories" msgstr "Importera från eller sänd till Perforce-arkiv" -#: command-list.h:134 +#: command-list.h:135 msgid "Create a packed archive of objects" msgstr "Skapa ett packat arkiv med objekt" -#: command-list.h:135 +#: command-list.h:136 msgid "Find redundant pack files" msgstr "Hitta redundanta pack-filer" -#: command-list.h:136 +#: command-list.h:137 msgid "Pack heads and tags for efficient repository access" msgstr "Packa huvuden och taggar för effektiv arkivåtkomst" -#: command-list.h:137 +#: command-list.h:138 msgid "Routines to help parsing remote repository access parameters" msgstr "" "Rutiner för att göra det lättare att tolka åtkomstparametrar för fjärrarkiv" -#: command-list.h:138 +#: command-list.h:139 msgid "Compute unique ID for a patch" msgstr "Beräkna unik ID för en patch" -#: command-list.h:139 +#: command-list.h:140 msgid "Prune all unreachable objects from the object database" msgstr "Ta bort alla onåbara objekt från objektdatabasen" -#: command-list.h:140 +#: command-list.h:141 msgid "Remove extra objects that are already in pack files" msgstr "Ta bort extraobjekt som redan finns i pack-filerna" -#: command-list.h:141 +#: command-list.h:142 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Hämta från och integrera med annat arkiv eller en lokal gren" -#: command-list.h:142 +#: command-list.h:143 msgid "Update remote refs along with associated objects" msgstr "Uppdatera fjärr-referenser och tillhörande objekt" -#: command-list.h:143 +#: command-list.h:144 msgid "Applies a quilt patchset onto the current branch" msgstr "Tillämpar en quilt-patchuppsättning på aktiv gren" -#: command-list.h:144 +#: command-list.h:145 +msgid "Compare two commit ranges (e.g. two versions of a branch)" +msgstr "Jämför två incheckningsintervall (dvs. två versioner av en gren)" + +#: command-list.h:146 msgid "Reads tree information into the index" msgstr "Läser trädinformation in i indexet" -#: command-list.h:145 +#: command-list.h:147 msgid "Reapply commits on top of another base tip" msgstr "Applicera incheckningar på nytt ovanpå en annan bastopp" -#: command-list.h:146 +#: command-list.h:148 msgid "Receive what is pushed into the repository" msgstr "Ta emot det som sänds till arkivet" -#: command-list.h:147 +#: command-list.h:149 msgid "Manage reflog information" msgstr "Hantera referenslogg-information" -#: command-list.h:148 +#: command-list.h:150 msgid "Manage set of tracked repositories" msgstr "Hantera uppsättningen spårade arkiv" -#: command-list.h:149 +#: command-list.h:151 msgid "Pack unpacked objects in a repository" msgstr "Packa opackade objekt i ett arkiv" -#: command-list.h:150 +#: command-list.h:152 msgid "Create, list, delete refs to replace objects" msgstr "Skapa, visa, ta bort referenser för att ersätta objekt" -#: command-list.h:151 +#: command-list.h:153 msgid "Generates a summary of pending changes" msgstr "Skapar en sammanfattning av väntande ändringar" -#: command-list.h:152 +#: command-list.h:154 msgid "Reuse recorded resolution of conflicted merges" msgstr "Återanvänd sparad lösning av sammanslagningskonflikter" -#: command-list.h:153 +#: command-list.h:155 msgid "Reset current HEAD to the specified state" msgstr "Återställ aktuell HEAD till angivet tillstånd" -#: command-list.h:154 +#: command-list.h:156 msgid "Revert some existing commits" msgstr "Återställ några befintliga incheckningar" -#: command-list.h:155 +#: command-list.h:157 msgid "Lists commit objects in reverse chronological order" msgstr "Visa incheckningsobjekt i omvänd kronologisk ordning" -#: command-list.h:156 +#: command-list.h:158 msgid "Pick out and massage parameters" msgstr "Plocka ut och massera parametrar" -#: command-list.h:157 +#: command-list.h:159 msgid "Remove files from the working tree and from the index" msgstr "Ta bort filer från arbetskatalogen och från indexet" -#: command-list.h:158 +#: command-list.h:160 msgid "Send a collection of patches as emails" msgstr "Sänd en uppsättning patchar som e-post" -#: command-list.h:159 +#: command-list.h:161 msgid "Push objects over Git protocol to another repository" msgstr "Sänd objekt över Git-protokollet till annat arkiv" -#: command-list.h:160 +#: command-list.h:162 msgid "Restricted login shell for Git-only SSH access" msgstr "Begränsat inloggningsskal för SSH-åtkomst till bara Git" -#: command-list.h:161 +#: command-list.h:163 msgid "Summarize 'git log' output" msgstr "Summera \"git log\"-utdata" -#: command-list.h:162 +#: command-list.h:164 msgid "Show various types of objects" msgstr "Visa olika sorters objekt" -#: command-list.h:163 +#: command-list.h:165 msgid "Show branches and their commits" msgstr "Visa grenar och deras incheckningar" -#: command-list.h:164 +#: command-list.h:166 msgid "Show packed archive index" msgstr "Skapa packat arkivindex" -#: command-list.h:165 +#: command-list.h:167 msgid "List references in a local repository" msgstr "Visa referenser i ett lokalt arkiv" -#: command-list.h:166 +#: command-list.h:168 msgid "Git's i18n setup code for shell scripts" msgstr "Git:s i18n-startkod för skalskript" -#: command-list.h:167 +#: command-list.h:169 msgid "Common Git shell script setup code" msgstr "Gemensam skriptstartkod för Git" -#: command-list.h:168 +#: command-list.h:170 msgid "Stash the changes in a dirty working directory away" msgstr "Spara undan ändringar i en lortig arbetskatalog" -#: command-list.h:169 +#: command-list.h:171 msgid "Add file contents to the staging area" msgstr "Lägg filinnehållet till indexet" -#: command-list.h:170 +#: command-list.h:172 msgid "Show the working tree status" msgstr "Visa status för arbetskatalogen" -#: command-list.h:171 +#: command-list.h:173 msgid "Remove unnecessary whitespace" msgstr "Ta bort onödiga blanksteg" -#: command-list.h:172 +#: command-list.h:174 msgid "Initialize, update or inspect submodules" msgstr "Initiera, uppdatera eller inspektera undermoduler" -#: command-list.h:173 +#: command-list.h:175 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Dubbelriktad verkan mellan ett Subversion-arkiv och Git" -#: command-list.h:174 +#: command-list.h:176 msgid "Read, modify and delete symbolic refs" msgstr "Läs, modifiera eller ta bort symbolisk referens" -#: command-list.h:175 +#: command-list.h:177 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt" -#: command-list.h:176 +#: command-list.h:178 msgid "Creates a temporary file with a blob's contents" msgstr "Skapar temporära filer med innehållet från en blob" -#: command-list.h:177 +#: command-list.h:179 msgid "Unpack objects from a packed archive" msgstr "Packa upp objekt från ett pakat arkiv" -#: command-list.h:178 +#: command-list.h:180 msgid "Register file contents in the working tree to the index" msgstr "Registrera filinnehållet från arbetskatalogen i indexet" -#: command-list.h:179 +#: command-list.h:181 msgid "Update the object name stored in a ref safely" msgstr "Uppdatera objektnamnet i en referens på ett säkert sätt" -#: command-list.h:180 +#: command-list.h:182 msgid "Update auxiliary info file to help dumb servers" msgstr "Uppdatera tilläggsinfofil för att hjälpa dumma servrar" -#: command-list.h:181 +#: command-list.h:183 msgid "Send archive back to git-archive" msgstr "Sänd arkivet tillbaka till git-archive" -#: command-list.h:182 +#: command-list.h:184 msgid "Send objects packed back to git-fetch-pack" msgstr "Sänd packade objekt tillbaka till git-fetch-pack" -#: command-list.h:183 +#: command-list.h:185 msgid "Show a Git logical variable" msgstr "Visa en logisk Git-variabel" -#: command-list.h:184 +#: command-list.h:186 msgid "Check the GPG signature of commits" msgstr "Kontrollera GPG-signaturer för incheckningar" -#: command-list.h:185 +#: command-list.h:187 msgid "Validate packed Git archive files" msgstr "Bekräfta packade Git-arkivfiler" -#: command-list.h:186 +#: command-list.h:188 msgid "Check the GPG signature of tags" msgstr "Kontrollera GPG-signaturer i taggar" -#: command-list.h:187 +#: command-list.h:189 msgid "Git web interface (web frontend to Git repositories)" msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)" -#: command-list.h:188 +#: command-list.h:190 msgid "Show logs with difference each commit introduces" msgstr "Visa loggar med differenser varje incheckning introducerar" -#: command-list.h:189 +#: command-list.h:191 msgid "Manage multiple working trees" msgstr "Hantera ytterligare arbetskataloger" -#: command-list.h:190 +#: command-list.h:192 msgid "Create a tree object from the current index" msgstr "Skapa ett trädobjekt från aktuellt index" -#: command-list.h:191 +#: command-list.h:193 msgid "Defining attributes per path" msgstr "Definierar attribut per sökväg" -#: command-list.h:192 +#: command-list.h:194 msgid "Git command-line interface and conventions" msgstr "Gits kommandoradsgränssnitt och -konventioner" -#: command-list.h:193 +#: command-list.h:195 msgid "A Git core tutorial for developers" msgstr "Grundläggande Git-handledning för utvecklare" -#: command-list.h:194 +#: command-list.h:196 msgid "Git for CVS users" msgstr "Git för CVS-användare" -#: command-list.h:195 +#: command-list.h:197 msgid "Tweaking diff output" msgstr "Justrea diff-utdata" -#: command-list.h:196 +#: command-list.h:198 msgid "A useful minimum set of commands for Everyday Git" msgstr "Ett användbart minsta uppsättning kommandon för vardags-Git" -#: command-list.h:197 +#: command-list.h:199 msgid "A Git Glossary" msgstr "En Git-ordlista" -#: command-list.h:198 +#: command-list.h:200 msgid "Hooks used by Git" msgstr "Krokar som används av Git" -#: command-list.h:199 +#: command-list.h:201 msgid "Specifies intentionally untracked files to ignore" msgstr "Ange avsiktligen ospårade filer att ignorera" -#: command-list.h:200 +#: command-list.h:202 msgid "Defining submodule properties" msgstr "Ange egenskaper för undermoduler" -#: command-list.h:201 +#: command-list.h:203 msgid "Git namespaces" msgstr "Git-namnrymder" -#: command-list.h:202 +#: command-list.h:204 msgid "Git Repository Layout" msgstr "Gits arkivlayout" -#: command-list.h:203 +#: command-list.h:205 msgid "Specifying revisions and ranges for Git" msgstr "Ange versioner och intervall i Git" -#: command-list.h:204 +#: command-list.h:206 msgid "A tutorial introduction to Git: part two" msgstr "Introduktion till Git: del två" -#: command-list.h:205 +#: command-list.h:207 msgid "A tutorial introduction to Git" msgstr "Introduktion till Git" -#: command-list.h:206 +#: command-list.h:208 msgid "An overview of recommended workflows with Git" msgstr "Översikt över rekommenderade arbetsflöden med Git" -#: rerere.h:40 -msgid "update the index with reused conflict resolution if possible" -msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt" - #: git-bisect.sh:54 msgid "You need to start by \"git bisect start\"" msgstr "Du måste starta med \"git bisect start\"" @@ -16075,140 +21322,49 @@ msgstr "Du måste starta med \"git bisect start\"" msgid "Do you want me to do it for you [Y/n]? " msgstr "Vill du att jag ska göra det åt dig [Y=ja/N=nej]? " -#: git-bisect.sh:121 -#, sh-format -msgid "unrecognised option: '$arg'" -msgstr "flaggan känns inte igen: \"$arg\"" - -#: git-bisect.sh:125 -#, sh-format -msgid "'$arg' does not appear to be a valid revision" -msgstr "\"$arg\" verkar inte vara en giltig revision" - -#: git-bisect.sh:154 -msgid "Bad HEAD - I need a HEAD" -msgstr "Felaktigt HEAD - Jag behöver ett HEAD" - -#: git-bisect.sh:167 -#, sh-format -msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." -msgstr "" -"Misslyckades checka ut \"$start_head\". Försök \"git bisect reset " -"<giltig_gren>”." - -# cogito-relaterat -#: git-bisect.sh:177 -msgid "won't bisect on cg-seek'ed tree" -msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts" - -#: git-bisect.sh:181 -msgid "Bad HEAD - strange symbolic ref" -msgstr "Felaktigt HEAD - konstig symbolisk referens" - -#: git-bisect.sh:233 -#, sh-format -msgid "Bad bisect_write argument: $state" -msgstr "Felaktigt argument till bisect_write: $state" - -#: git-bisect.sh:246 +#: git-bisect.sh:101 #, sh-format msgid "Bad rev input: $arg" msgstr "Felaktig rev-indata: $arg" -#: git-bisect.sh:265 +#: git-bisect.sh:121 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "Felaktig rev-indata: $bisected_head" -#: git-bisect.sh:274 +#: git-bisect.sh:130 #, sh-format msgid "Bad rev input: $rev" msgstr "Felaktig rev-indata: $rev" -#: git-bisect.sh:283 +#: git-bisect.sh:139 #, 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:306 -#, sh-format -msgid "Warning: bisecting only with a $TERM_BAD commit." -msgstr "" -"Varning: utför \"bisect\" med endast en dålig (\"$TERM_BAD\") incheckning." - -#. TRANSLATORS: Make sure to include [Y] and [n] in your -#. translation. The program will only accept English input -#. at this point. -#: git-bisect.sh:312 -msgid "Are you sure [Y/n]? " -msgstr "Är du säker [Y=ja/N=nej]? " - -#: git-bisect.sh:324 -#, sh-format -msgid "" -"You need to give me at least one $bad_syn and one $good_syn revision.\n" -"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" -msgstr "" -"Du måste ange åtminstone en dålig (\"$bad_syn\") och en bra (\"$good_syn\") " -"version.\n" -"(Du kan använda \"git bisect $bad_syn\" och \"git bisect $good_syn\" för " -"detta.)" - -#: git-bisect.sh:327 -#, sh-format -msgid "" -"You need to start by \"git bisect start\".\n" -"You then need to give me at least one $good_syn and one $bad_syn revision.\n" -"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" -msgstr "" -"Du måste starta med \"git bisect start\".\n" -"Du måste sedan ange åtminstone en bra (\"$good_syn\") och en dålig " -"(\"$bad_syn\") version.\n" -"(Du kan använda \"git bisect $bad_syn\" och \"git bisect $good_syn\" för " -"detta.)" - -#: 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:405 -#, sh-format -msgid "'$invalid' is not a valid commit" -msgstr "\"$invalid\" är inte en giltig incheckning" - -#: git-bisect.sh:414 -#, sh-format -msgid "" -"Could not check out original HEAD '$branch'.\n" -"Try 'git bisect reset <commit>'." -msgstr "" -"Kunde inte checka ut original-HEAD \"$branch\".\n" -"Försök \"git bisect reset <incheckning>\"." - -#: git-bisect.sh:422 +#: git-bisect.sh:209 msgid "No logfile given" msgstr "Ingen loggfil angiven" -#: git-bisect.sh:423 +#: git-bisect.sh:210 #, sh-format msgid "cannot read $file for replaying" msgstr "kan inte läsa $file för uppspelning" -#: git-bisect.sh:444 +#: git-bisect.sh:232 msgid "?? what are you talking about?" msgstr "?? vad menar du?" -#: git-bisect.sh:453 +#: git-bisect.sh:241 msgid "bisect run failed: no command provided." msgstr "bisect-körning misslyckades: inget kommando gavs." -#: git-bisect.sh:458 +#: git-bisect.sh:246 #, sh-format msgid "running $command" msgstr "kör $command" -#: git-bisect.sh:465 +#: git-bisect.sh:253 #, sh-format msgid "" "bisect run failed:\n" @@ -16217,11 +21373,11 @@ msgstr "" "\"bisect\"-körningen misslyckades:\n" "felkod $res från \"$command\" är < 0 eller >= 128" -#: git-bisect.sh:491 +#: git-bisect.sh:279 msgid "bisect run cannot continue any more" msgstr "\"bisect\"-körningen kan inte fortsätta längre" -#: git-bisect.sh:497 +#: git-bisect.sh:285 #, sh-format msgid "" "bisect run failed:\n" @@ -16230,28 +21386,13 @@ msgstr "" "\"bisect\"-körningen misslyckades:\n" "\"bisect_state $state\" avslutades med felkoden $res" -#: git-bisect.sh:504 +#: git-bisect.sh:292 msgid "bisect run success" msgstr "\"bisect\"-körningen lyckades" -#: 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:567 -msgid "no terms defined" -msgstr "inga termer angivna" - -#: git-bisect.sh:584 -#, sh-format -msgid "" -"invalid argument $arg for 'git bisect terms'.\n" -"Supported options are: --term-good|--term-old and --term-bad|--term-new." -msgstr "" -"ogiltigt argument $arg för \"git bisect terms\".\n" -"Flaggor som stöds är: --term-good|--term-old och --term-bad|--term-new." +#: git-bisect.sh:300 +msgid "We are not bisecting." +msgstr "Vi utför ingen bisect för tillfället." #: git-merge-octopus.sh:46 msgid "" @@ -16293,326 +21434,113 @@ msgstr "Försök enkel sammanslagning med $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning." -#: git-rebase.sh:61 -msgid "" -"Resolve all conflicts manually, mark them as resolved with\n" -"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" -"You can instead skip this commit: run \"git rebase --skip\".\n" -"To abort and get back to the state before \"git rebase\", run \"git rebase --" -"abort\"." -msgstr "" -"Lös alla konflikter manuellt, märk dem som lösta med\n" -"\"git add/rm <filer_i_konflikt>\", kör sedan \"git rebase --continue\".\n" -"Du kan hoppa över incheckningen istället: kör \"git rebase --skip\".\n" -"För att avbryta och återgå till där du var före ombaseringen, kör \"git " -"rebase --abort\"." - -#: git-rebase.sh:173 git-rebase.sh:442 -#, sh-format -msgid "Could not move back to $head_name" -msgstr "Kunde inte flytta tillbaka till $head_name" - -#: git-rebase.sh:184 -msgid "Applied autostash." -msgstr "Tillämpade autostash." - -#: git-rebase.sh:187 -#, sh-format -msgid "Cannot store $stash_sha1" -msgstr "Kan inte spara $stash_sha1" - -#: git-rebase.sh:229 -msgid "The pre-rebase hook refused to rebase." -msgstr "Kroken pre-rebase vägrade ombaseringen." - -#: git-rebase.sh:234 -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:403 -msgid "No rebase in progress?" -msgstr "Ingen ombasering pågår?" - -#: git-rebase.sh:414 -msgid "The --edit-todo action can only be used during interactive rebase." -msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering." - -#: git-rebase.sh:421 -msgid "Cannot read HEAD" -msgstr "Kan inte läsa HEAD" - -#: git-rebase.sh:424 -msgid "" -"You must edit all merge conflicts and then\n" -"mark them as resolved using git add" -msgstr "" -"Du måste redigera alla sammanslagningskonflikter och\n" -"därefter markera dem som lösta med git add" - -#: git-rebase.sh:468 -#, sh-format -msgid "" -"It seems that there is already a $state_dir_base directory, and\n" -"I wonder if you are in the middle of another rebase. If that is the\n" -"case, please try\n" -"\t$cmd_live_rebase\n" -"If that is not the case, please\n" -"\t$cmd_clear_stale_rebase\n" -"and run me again. I am stopping in case you still have something\n" -"valuable there." -msgstr "" -"Det verkar som katalogen $state_dir_base redan existerar, och\n" -"jag undrar om du redan är mitt i en annan ombasering. Om så är\n" -"fallet, försök\n" -"\t$cmd_live_rebase\n" -"Om så inte är fallet, kör\n" -"\t$cmd_clear_stale_rebase\n" -"och kör programmet igen. Jag avslutar ifall du fortfarande har\n" -"något av värde där." - -#: git-rebase.sh:509 -msgid "error: cannot combine '--signoff' with '--preserve-merges'" -msgstr "fel: kan inte kombinera \"--signoff\" med \"--preserve-merges\"" - -#: git-rebase.sh:537 -#, sh-format -msgid "invalid upstream '$upstream_name'" -msgstr "ogiltig uppström \"$upstream_name\"" - -#: git-rebase.sh:561 -#, sh-format -msgid "$onto_name: there are more than one merge bases" -msgstr "$onto_name: mer än en sammanslagningsbas finns" - -#: git-rebase.sh:564 git-rebase.sh:568 -#, sh-format -msgid "$onto_name: there is no merge base" -msgstr "$onto_name: ingen sammanslagningsbas finns" - -#: git-rebase.sh:573 -#, sh-format -msgid "Does not point to a valid commit: $onto_name" -msgstr "Peka på en giltig incheckning: $onto_name" - -#: git-rebase.sh:599 -#, sh-format -msgid "fatal: no such branch/commit '$branch_name'" -msgstr "ödesdigert: ingen sådan gren/incheckning: $branch_name" - -#: git-rebase.sh:632 -msgid "Cannot autostash" -msgstr "Kan inte utföra \"autostash\"" - -#: git-rebase.sh:637 -#, sh-format -msgid "Created autostash: $stash_abbrev" -msgstr "Skapade autostash: $stash_abbrev" - -#: git-rebase.sh:641 -msgid "Please commit or stash them." -msgstr "Checka in eller använd \"stash\" på dem." - -#: git-rebase.sh:664 -#, sh-format -msgid "HEAD is up to date." -msgstr "HEAD är à jour." - -#: git-rebase.sh:666 -#, sh-format -msgid "Current branch $branch_name is up to date." -msgstr "Aktuell gren $branch_name är à jour." - -#: git-rebase.sh:674 -#, sh-format -msgid "HEAD is up to date, rebase forced." -msgstr "HEAD är à jour, ombasering framtvingad." - -#: git-rebase.sh:676 -#, 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:688 -#, sh-format -msgid "Changes from $mb to $onto:" -msgstr "Ändringar från $mb till $onto:" - -#: git-rebase.sh:697 -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:707 -#, sh-format -msgid "Fast-forwarded $branch_name to $onto_name." -msgstr "Snabbspolade $branch_name till $onto_name." - -#: git-stash.sh:61 -msgid "git stash clear with parameters is unimplemented" -msgstr "\"git stash clear\" med parametrar har inte implementerats" - -#: 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:123 -msgid "Cannot save the current index state" -msgstr "Kan inte spara aktuellt tillstånd för indexet" - -#: git-stash.sh:138 -msgid "Cannot save the untracked files" -msgstr "Kan inte spara ospårade filer" - -#: 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:175 -msgid "No changes selected" -msgstr "Inga ändringar valda" - -#: git-stash.sh:178 +#: git-legacy-stash.sh:220 msgid "Cannot remove temporary index (can't happen)" msgstr "Kan inte ta bort temporärt index (kan inte inträffa)" -#: git-stash.sh:191 -msgid "Cannot record working tree state" -msgstr "Kan inte registrera tillstånd för arbetskatalog" - -#: git-stash.sh:229 +#: git-legacy-stash.sh:271 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Kan inte uppdatera $ref_stash med $w_commit" -#: git-stash.sh:281 +#: git-legacy-stash.sh:323 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "fel: okänd flagga för \"stash push\": $option" -#: 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:303 -msgid "No local changes to save" -msgstr "Inga lokala ändringar att spara" - -#: git-stash.sh:308 -msgid "Cannot initialize stash" -msgstr "Kan inte initiera \"stash\"" - -#: git-stash.sh:312 -msgid "Cannot save the current status" -msgstr "Kan inte spara aktuell status" - -#: git-stash.sh:313 +#: git-legacy-stash.sh:355 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Sparade arbetskatalogen och indexstatus $stash_msg" -#: git-stash.sh:342 -msgid "Cannot remove worktree changes" -msgstr "Kan inte ta bort ändringar i arbetskatalogen" - -#: git-stash.sh:490 +#: git-legacy-stash.sh:535 #, sh-format msgid "unknown option: $opt" msgstr "okänd flagga: $opt" -#: git-stash.sh:503 -msgid "No stash entries found." -msgstr "Inga \"stash”-poster hittades." - -#: git-stash.sh:510 +#: git-legacy-stash.sh:555 #, sh-format msgid "Too many revisions specified: $REV" msgstr "För många revisioner angivna: $REV" -#: git-stash.sh:525 +#: git-legacy-stash.sh:570 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference är inte en giltig referens" -#: git-stash.sh:553 +#: git-legacy-stash.sh:598 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "\"$args\" är inte en \"stash\"-liknande incheckning" -#: git-stash.sh:564 +#: git-legacy-stash.sh:609 #, sh-format msgid "'$args' is not a stash reference" msgstr "\"$args\" är inte en \"stash\"-referens" -#: git-stash.sh:572 +#: git-legacy-stash.sh:617 msgid "unable to refresh index" msgstr "kan inte uppdatera indexet" -#: git-stash.sh:576 +#: git-legacy-stash.sh:621 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:584 +#: git-legacy-stash.sh:629 msgid "Conflicts in index. Try without --index." msgstr "Konflikter i indexet. Testa utan --index." -#: git-stash.sh:586 +#: git-legacy-stash.sh:631 msgid "Could not save index tree" msgstr "Kunde inte spara indexträd" -#: git-stash.sh:595 +#: git-legacy-stash.sh:640 msgid "Could not restore untracked files from stash entry" msgstr "Kunde inte återställa ospårade filer från stash-post" -#: git-stash.sh:620 +#: git-legacy-stash.sh:665 msgid "Cannot unstage modified files" msgstr "Kan inte ta bort ändrade filer ur kön" -#: git-stash.sh:635 -msgid "Index was not unstashed." -msgstr "Indexet har inte tagits ur kön." - -#: git-stash.sh:649 -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:658 +#: git-legacy-stash.sh:703 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Kastade ${REV} ($s)" -#: git-stash.sh:659 +#: git-legacy-stash.sh:704 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-stash.sh:667 -msgid "No branch name specified" -msgstr "Inget grennamn angavs" - -#: git-stash.sh:746 +#: git-legacy-stash.sh:791 msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" -#: git-submodule.sh:188 +#: git-submodule.sh:200 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå" -#: git-submodule.sh:198 +#: git-submodule.sh:210 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../" -#: git-submodule.sh:217 +#: git-submodule.sh:229 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:220 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "\"$sm_path\" finns redan i indexet och är inte en undermodul" -#: git-submodule.sh:226 +#: git-submodule.sh:239 +#, sh-format +msgid "'$sm_path' does not have a commit checked out" +msgstr "\"$sm_path\" har inte någon utcheckad incheckning" + +#: git-submodule.sh:245 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -16623,22 +21551,22 @@ msgstr "" "$sm_path\n" "Använd -f om du verkligen vill lägga till den." -#: git-submodule.sh:249 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet" -#: git-submodule.sh:251 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv" -#: git-submodule.sh:259 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):" -#: git-submodule.sh:261 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -16656,48 +21584,37 @@ msgstr "" "arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n" "flaggan \"--name\"." -#: git-submodule.sh:267 +#: git-submodule.sh:286 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt." -#: git-submodule.sh:279 +#: git-submodule.sh:298 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:284 +#: git-submodule.sh:303 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:293 +#: git-submodule.sh:312 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:354 -#, sh-format -msgid "Entering '$displaypath'" -msgstr "Går in i \"$displaypath\"" - -#: git-submodule.sh:374 -#, sh-format -msgid "Stopping at '$displaypath'; script returned non-zero status." -msgstr "" -"Stoppar på \"$displaypath\"; skriptet returnerade en status skild från noll." - -#: git-submodule.sh:600 +#: git-submodule.sh:573 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:610 +#: git-submodule.sh:583 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\"" -#: git-submodule.sh:615 +#: git-submodule.sh:588 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -16706,12 +21623,16 @@ msgstr "" "Kan inte hitta aktuell revision för ${remote_name}/${branch} i " "undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:633 +#: git-submodule.sh:606 #, sh-format -msgid "Unable to fetch in submodule path '$displaypath'" -msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\"" +msgid "" +"Unable to fetch in submodule path '$displaypath'; trying to directly fetch " +"$sha1:" +msgstr "" +"Kan inte hämta i undermodulsökväg \"$displaypath\"; försökte hämta $sha1 " +"direkt:" -#: git-submodule.sh:639 +#: git-submodule.sh:612 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -16720,72 +21641,72 @@ msgstr "" "Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. " "Direkt hämtning av incheckningen misslyckades." -#: git-submodule.sh:646 +#: git-submodule.sh:619 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:647 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:651 +#: git-submodule.sh:624 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:652 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:657 +#: git-submodule.sh:630 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:658 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:663 +#: git-submodule.sh:636 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:664 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" -#: git-submodule.sh:695 +#: git-submodule.sh:668 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:791 +#: git-submodule.sh:830 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" -#: git-submodule.sh:843 +#: git-submodule.sh:882 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:863 +#: git-submodule.sh:902 #, 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:866 +#: git-submodule.sh:905 #, 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:869 +#: git-submodule.sh:908 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -16797,12 +21718,12 @@ msgstr "" msgid "See git-${cmd}(1) for details." msgstr "Se git-${cmd}(1) för detaljer." -#: git-rebase--interactive.sh:142 +#: git-rebase--preserve-merges.sh:136 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "Ombaserar ($new_count/$total)" -#: git-rebase--interactive.sh:158 +#: git-rebase--preserve-merges.sh:152 msgid "" "\n" "Commands:\n" @@ -16811,7 +21732,7 @@ msgid "" "e, edit <commit> = use commit, but stop for amending\n" "s, squash <commit> = use commit, but meld into previous commit\n" "f, fixup <commit> = like \"squash\", but discard this commit's log message\n" -"x, exec <command> = run command (the rest of the line) using shell\n" +"x, exec <commit> = run command (the rest of the line) using shell\n" "d, drop <commit> = remove commit\n" "l, label <label> = label current HEAD with a name\n" "t, reset <label> = reset HEAD to a label\n" @@ -16832,7 +21753,7 @@ msgstr "" "incheckning\n" "f, fixup <incheckning> = som \"squash\", men förkasta " "incheckningsmeddelandet\n" -"x, exec <kommando> = kör kommando (resten av raden) i skalet\n" +"x, exec <incheckning> = kör kommando (resten av raden) i skalet\n" "d, drop <incheckning> = ta bort incheckning\n" "l, label <etikett> = ge aktuellt HEAD ett namn\n" "t, reset <etikett> = återställ HEAD till en etikett\n" @@ -16843,24 +21764,7 @@ msgstr "" "\n" "Du kan byta ordning på raderna; de utförs uppifrån och ned.\n" -#: git-rebase--interactive.sh:179 -msgid "" -"\n" -"Do not remove any line. Use 'drop' explicitly to remove a commit.\n" -msgstr "" -"\n" -"Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en " -"incheckning.\n" - -#: git-rebase--interactive.sh:183 -msgid "" -"\n" -"If you remove a line here THAT COMMIT WILL BE LOST.\n" -msgstr "" -"\n" -"Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n" - -#: git-rebase--interactive.sh:221 +#: git-rebase--preserve-merges.sh:215 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -16879,83 +21783,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:246 +#: git-rebase--preserve-merges.sh:240 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: inte en incheckning som kan väljas" -#: git-rebase--interactive.sh:285 +#: git-rebase--preserve-merges.sh:279 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Felaktigt incheckningsnamn: $sha1" -#: git-rebase--interactive.sh:325 +#: git-rebase--preserve-merges.sh:309 msgid "Cannot write current commit's replacement sha1" msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning" -#: git-rebase--interactive.sh:376 +#: git-rebase--preserve-merges.sh:360 #, sh-format msgid "Fast-forward to $sha1" msgstr "Snabbspolade till $sha1" -#: git-rebase--interactive.sh:378 +#: git-rebase--preserve-merges.sh:362 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Kan inte snabbspola till $sha1" -#: git-rebase--interactive.sh:387 +#: git-rebase--preserve-merges.sh:371 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Kan inte flytta HEAD till $first_parent" -#: git-rebase--interactive.sh:392 +#: git-rebase--preserve-merges.sh:376 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1" -#: git-rebase--interactive.sh:410 +#: git-rebase--preserve-merges.sh:394 #, sh-format msgid "Error redoing merge $sha1" msgstr "Fel när sammanslagningen $sha1 skulle göras om" -#: git-rebase--interactive.sh:419 +#: git-rebase--preserve-merges.sh:403 #, sh-format msgid "Could not pick $sha1" msgstr "Kunde inte välja $sha1" -#: git-rebase--interactive.sh:428 +#: git-rebase--preserve-merges.sh:412 #, sh-format msgid "This is the commit message #${n}:" msgstr "Det här är incheckningsmeddelande ${n}:" -#: git-rebase--interactive.sh:433 +#: git-rebase--preserve-merges.sh:417 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Incheckningsmeddelande ${n} kommer hoppas över:" -#: git-rebase--interactive.sh:444 +#: git-rebase--preserve-merges.sh:428 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Det här är en kombination av $count incheckning." msgstr[1] "Det här är en kombination av $count incheckningar." -#: git-rebase--interactive.sh:453 +#: git-rebase--preserve-merges.sh:437 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Kan inte skriva $fixup_msg" -#: git-rebase--interactive.sh:456 +#: git-rebase--preserve-merges.sh:440 msgid "This is a combination of 2 commits." msgstr "Det här är en kombination av 2 incheckningar." -#: git-rebase--interactive.sh:497 git-rebase--interactive.sh:540 -#: git-rebase--interactive.sh:543 +#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524 +#: git-rebase--preserve-merges.sh:527 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Kunde inte tillämpa $sha1... $rest" -#: git-rebase--interactive.sh:572 +#: git-rebase--preserve-merges.sh:556 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -16969,31 +21873,31 @@ msgstr "" "pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n" "du måste lösa problemet innan du kan skriva om incheckningsmeddelandet." -#: git-rebase--interactive.sh:587 +#: git-rebase--preserve-merges.sh:571 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Stoppade på $sha1_abbrev... $rest" -#: git-rebase--interactive.sh:602 +#: git-rebase--preserve-merges.sh:586 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning" -#: git-rebase--interactive.sh:644 +#: git-rebase--preserve-merges.sh:628 #, sh-format msgid "Executing: $rest" msgstr "Kör: $rest" -#: git-rebase--interactive.sh:652 +#: git-rebase--preserve-merges.sh:636 #, sh-format msgid "Execution failed: $rest" msgstr "Körning misslyckades: $rest" -#: git-rebase--interactive.sh:654 +#: git-rebase--preserve-merges.sh:638 msgid "and made changes to the index and/or the working tree" msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen" -#: git-rebase--interactive.sh:656 +#: git-rebase--preserve-merges.sh:640 msgid "" "You can fix the problem, and then run\n" "\n" @@ -17004,7 +21908,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:669 +#: git-rebase--preserve-merges.sh:653 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -17019,29 +21923,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:680 +#: git-rebase--preserve-merges.sh:664 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Okänt kommando: $command $sha1 $rest" -#: git-rebase--interactive.sh:681 +#: git-rebase--preserve-merges.sh:665 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Rätta det med \"git rebase --edit-todo\"." -#: git-rebase--interactive.sh:716 +#: git-rebase--preserve-merges.sh:700 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Lyckades ombasera och uppdatera $head_name." -#: git-rebase--interactive.sh:740 -msgid "could not detach HEAD" -msgstr "kunde inte koppla från HEAD" - -#: git-rebase--interactive.sh:778 +#: git-rebase--preserve-merges.sh:757 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Kunde inte ta bort CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:783 +#: git-rebase--preserve-merges.sh:762 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -17072,86 +21972,52 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:800 +#: git-rebase--preserve-merges.sh:779 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:805 +#: git-rebase--preserve-merges.sh:784 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." msgstr "" "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" -"först och kör sedan \"git rebase --continute\" igen." +"först och kör sedan \"git rebase --continue\" igen." -#: git-rebase--interactive.sh:810 git-rebase--interactive.sh:814 +#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793 msgid "Could not commit staged changes." msgstr "Kunde inte checka in köade ändringar." -#: git-rebase--interactive.sh:843 -msgid "" -"\n" -"You are editing the todo file of an ongoing interactive rebase.\n" -"To continue rebase after editing, run:\n" -" git rebase --continue\n" -"\n" -msgstr "" -"\n" -"Du redigerar \"todo\"-filen för en pågående interaktiv ombasering.\n" -"För att forsätta ombasera efter redigeringen, kör:\n" -" git rebase --continue\n" -"\n" - -#: git-rebase--interactive.sh:851 git-rebase--interactive.sh:937 +#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910 msgid "Could not execute editor" msgstr "Kunde inte starta textredigerare" -#: git-rebase--interactive.sh:872 +#: git-rebase--preserve-merges.sh:845 #, sh-format msgid "Could not checkout $switch_to" msgstr "Kunde inte checka ut $switch_to" -#: git-rebase--interactive.sh:879 +#: git-rebase--preserve-merges.sh:852 msgid "No HEAD?" msgstr "Inget HEAD?" -#: git-rebase--interactive.sh:880 +#: git-rebase--preserve-merges.sh:853 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Kunde inte skapa temporär $state_dir" -#: git-rebase--interactive.sh:883 +#: git-rebase--preserve-merges.sh:856 msgid "Could not mark as interactive" msgstr "Kunde inte markera som interaktiv" -#: git-rebase--interactive.sh:915 +#: git-rebase--preserve-merges.sh:888 #, 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:920 -msgid "" -"\n" -"\tHowever, if you remove everything, the rebase will be aborted.\n" -"\n" -"\t" -msgstr "" -"\n" -"\tOmbaseringen kommer dock att avbrytas om du tar bort allting.\n" -"\n" -"\t" - -#: git-rebase--interactive.sh:927 -msgid "Note that empty commits are commented out" -msgstr "Observera att tomma incheckningar är utkommenterade" - -#: git-rebase--interactive.sh:980 -msgid "Could not generate todo list" -msgstr "Kunde inte skapa todo-lista" - -#: git-rebase--interactive.sh:1001 git-rebase--interactive.sh:1006 +#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947 msgid "Could not init rewritten commits" msgstr "Kunde inte initiera omskrivna incheckningar" @@ -17160,58 +22026,58 @@ msgstr "Kunde inte initiera omskrivna incheckningar" msgid "usage: $dashless $USAGE" msgstr "använd: $dashless $USAGE" -#: git-sh-setup.sh:190 +#: git-sh-setup.sh:191 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" msgstr "Kunde inte byta katalog till $cdup, toppnivån på arbetskatalogen" -#: git-sh-setup.sh:199 git-sh-setup.sh:206 +#: git-sh-setup.sh:200 git-sh-setup.sh:207 #, sh-format msgid "fatal: $program_name cannot be used without a working tree." msgstr "ödesdigetrt: $program_name kan inte användas utan arbetskatalog." -#: git-sh-setup.sh:220 +#: git-sh-setup.sh:221 msgid "Cannot rebase: You have unstaged changes." msgstr "Kan inte ombasera: Du har oköade ändringar." -#: git-sh-setup.sh:223 +#: git-sh-setup.sh:224 msgid "Cannot rewrite branches: You have unstaged changes." msgstr "Kan inte skriva om grenar: Du har oköade ändringar." -#: git-sh-setup.sh:226 +#: git-sh-setup.sh:227 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "Kan inte hämta med ombasering: Du har oköade ändringar." -#: git-sh-setup.sh:229 +#: git-sh-setup.sh:230 #, sh-format msgid "Cannot $action: You have unstaged changes." msgstr "Kan inte $action: Du har oköade ändringar." -#: git-sh-setup.sh:242 +#: git-sh-setup.sh:243 msgid "Cannot rebase: Your index contains uncommitted changes." msgstr "" "Kan inte ombasera: Ditt index innehåller ändringar som inte checkats in." -#: git-sh-setup.sh:245 +#: git-sh-setup.sh:246 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" "Kan inte hämta med ombasering: Ditt index innehåller oincheckade ändringar." -#: git-sh-setup.sh:248 +#: git-sh-setup.sh:249 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "" "Kan inte $action: Ditt index innehåller ändringar som inte checkats in." -#: git-sh-setup.sh:252 +#: git-sh-setup.sh:253 msgid "Additionally, your index contains uncommitted changes." msgstr "Dessutom innehåller dit index ändringar som inte har checkats in." -#: git-sh-setup.sh:372 +#: git-sh-setup.sh:373 msgid "You need to run this command from the toplevel of the working tree." msgstr "Du måste köra kommandot från arbetskatalogens toppnivå." -#: git-sh-setup.sh:377 +#: git-sh-setup.sh:378 msgid "Unable to determine absolute path of git directory" msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" @@ -17738,39 +22604,39 @@ msgstr "okänt läge för --patch: %s" msgid "invalid argument %s, expecting --" msgstr "felaktigt argument %s, förväntar --" -#: git-send-email.perl:130 +#: git-send-email.perl:138 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "lokal zon skiljer sig från GMT med delar av minuter\n" -#: git-send-email.perl:137 git-send-email.perl:143 +#: git-send-email.perl:145 git-send-email.perl:151 msgid "local time offset greater than or equal to 24 hours\n" msgstr "lokal tidszonförskjutning större än eller lika med 24 timmar\n" -#: git-send-email.perl:211 git-send-email.perl:217 +#: git-send-email.perl:219 git-send-email.perl:225 msgid "the editor exited uncleanly, aborting everything" msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting" -#: git-send-email.perl:294 +#: git-send-email.perl:302 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" "\"%s\" innehåller en mellanliggande version av e-postbrevet du skrev.\n" -#: git-send-email.perl:299 +#: git-send-email.perl:307 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "\"%s.final\" innehåller det skrivna brevet.\n" -#: git-send-email.perl:317 +#: git-send-email.perl:326 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-alias är inkompatibelt med andra flaggor\n" -#: git-send-email.perl:383 git-send-email.perl:638 +#: git-send-email.perl:395 git-send-email.perl:656 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Kan inte köra git format-patch från utanför arkivet\n" -#: git-send-email.perl:386 +#: git-send-email.perl:398 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -17778,37 +22644,37 @@ msgstr "" "\"batch-size\" och \"relogin\" måste anges tillsammans (via kommandorad " "eller konfigurationsflagga)\n" -#: git-send-email.perl:456 +#: git-send-email.perl:470 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Okänt fält i --suppress-cc: \"%s\"\n" -#: git-send-email.perl:485 +#: git-send-email.perl:501 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Okänd inställning i --confirm: \"%s\"\n" -#: git-send-email.perl:513 +#: git-send-email.perl:529 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "varning: sendmail-alias med citationstecken stöds inte. %s\n" -#: git-send-email.perl:515 +#: git-send-email.perl:531 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "varning: \":include:\" stöds inte: %s\n" -#: git-send-email.perl:517 +#: git-send-email.perl:533 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "varning: omdirigering til \"/fil\" eller \"|rör\" stöds inte: %s\n" -#: git-send-email.perl:522 +#: git-send-email.perl:538 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "varning: sendmail-raden känns inte igen: %s\n" -#: git-send-email.perl:604 +#: git-send-email.perl:622 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -17823,12 +22689,12 @@ msgstr "" " * Säga \"./%s\" om du menar en fil; eller\n" " * Ange flaggan --format-patch om du menar ett intervall.\n" -#: git-send-email.perl:625 +#: git-send-email.perl:643 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Misslyckades utföra opendir %s: %s" -#: git-send-email.perl:649 +#: git-send-email.perl:667 #, perl-format msgid "" "fatal: %s: %s\n" @@ -17837,7 +22703,7 @@ msgstr "" "ödesdigert: %s: %s\n" "varning: inga patchar har sänts\n" -#: git-send-email.perl:660 +#: git-send-email.perl:678 msgid "" "\n" "No patch files specified!\n" @@ -17847,17 +22713,17 @@ msgstr "" "Inga patchfiler angavs!\n" "\n" -#: git-send-email.perl:673 +#: git-send-email.perl:691 #, perl-format msgid "No subject line in %s?" msgstr "Ingen ärenderad i %s?" -#: git-send-email.perl:683 +#: git-send-email.perl:701 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Kunde inte öppna för skrivning %s: %s" -#: git-send-email.perl:694 +#: git-send-email.perl:712 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -17871,38 +22737,38 @@ msgstr "" "\n" "Rensa brevkroppen om du inte vill sända någon sammanfattning.\n" -#: git-send-email.perl:718 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open %s: %s" msgstr "Misslyckades öppna %s: %s" -#: git-send-email.perl:735 +#: git-send-email.perl:753 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Misslyckades öppna %s.final: %s" -#: git-send-email.perl:778 +#: git-send-email.perl:796 msgid "Summary email is empty, skipping it\n" msgstr "Sammanfattande brev tomt, hoppar över\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:813 +#: git-send-email.perl:831 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Är du säker på att du vill använda <%s> [Y=ja, N=nej]? " -#: git-send-email.perl:868 +#: git-send-email.perl:886 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" "Följande filer är åttabitars, men anger inte en Content-Transfer-Encoding.\n" -#: git-send-email.perl:873 +#: git-send-email.perl:891 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Vilken åttabitarsteckenkodning skall jag ange [UTF-8]? " -#: git-send-email.perl:881 +#: git-send-email.perl:899 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -17915,21 +22781,21 @@ msgstr "" "har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen " "vill sända.\n" -#: git-send-email.perl:900 +#: git-send-email.perl:918 msgid "To whom should the emails be sent (if anyone)?" msgstr "Till vem skall breven sändas (om någon)?" -#: git-send-email.perl:918 +#: git-send-email.perl:936 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n" -#: git-send-email.perl:930 +#: git-send-email.perl:948 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:988 git-send-email.perl:996 +#: git-send-email.perl:1006 git-send-email.perl:1014 #, 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" @@ -17937,16 +22803,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:1000 +#: git-send-email.perl:1018 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:1317 +#: git-send-email.perl:1335 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA-sökvägen \"%s\" finns inte" -#: git-send-email.perl:1400 +#: git-send-email.perl:1418 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -17973,124 +22839,124 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1415 +#: git-send-email.perl:1433 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "Sända brevet? (y=ja, n=nej, e=redigera, q=avsluta, a=alla): " -#: git-send-email.perl:1418 +#: git-send-email.perl:1436 msgid "Send this email reply required" msgstr "Svar krävs på frågan \"Sända brevet?\"" -#: git-send-email.perl:1446 +#: git-send-email.perl:1464 msgid "The required SMTP server is not properly defined." msgstr "Nödvändig SMTP-server har inte angivits korrekt." -#: git-send-email.perl:1493 +#: git-send-email.perl:1511 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Servern stöder inte SMARTTLS! %s" -#: git-send-email.perl:1498 git-send-email.perl:1502 +#: git-send-email.perl:1516 git-send-email.perl:1520 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS misslyckades! %s" -#: git-send-email.perl:1512 +#: git-send-email.perl:1529 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:1530 +#: git-send-email.perl:1547 #, perl-format msgid "Failed to send %s\n" msgstr "Misslyckades sända %s\n" -#: git-send-email.perl:1533 +#: git-send-email.perl:1550 #, perl-format msgid "Dry-Sent %s\n" msgstr "Test-Sände %s\n" -#: git-send-email.perl:1533 +#: git-send-email.perl:1550 #, perl-format msgid "Sent %s\n" msgstr "Sände %s\n" -#: git-send-email.perl:1535 +#: git-send-email.perl:1552 msgid "Dry-OK. Log says:\n" msgstr "Test-OK. Loggen säger:\n" -#: git-send-email.perl:1535 +#: git-send-email.perl:1552 msgid "OK. Log says:\n" msgstr "OK. Loggen säger:\n" -#: git-send-email.perl:1547 +#: git-send-email.perl:1564 msgid "Result: " msgstr "Resultat: " -#: git-send-email.perl:1550 +#: git-send-email.perl:1567 msgid "Result: OK\n" msgstr "Resultat: OK\n" -#: git-send-email.perl:1568 +#: git-send-email.perl:1585 #, perl-format msgid "can't open file %s" msgstr "kan inte öppna filen %s" -#: git-send-email.perl:1615 git-send-email.perl:1635 +#: git-send-email.perl:1632 git-send-email.perl:1652 #, 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:1621 +#: git-send-email.perl:1638 #, 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:1674 +#: git-send-email.perl:1691 #, 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:1699 +#: git-send-email.perl:1726 #, 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:1817 +#: git-send-email.perl:1837 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Kunde inte köra \"%s\"" -#: git-send-email.perl:1824 +#: git-send-email.perl:1844 #, 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:1828 +#: git-send-email.perl:1848 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) misslyckades stänga röret till \"%s\"" -#: git-send-email.perl:1855 +#: git-send-email.perl:1878 msgid "cannot send message as 7bit" msgstr "kan inte sända brev som sjubitars" -#: git-send-email.perl:1863 +#: git-send-email.perl:1886 msgid "invalid transfer encoding" msgstr "ogiltig överföringskondning" -#: git-send-email.perl:1901 git-send-email.perl:1952 git-send-email.perl:1962 +#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989 #, perl-format msgid "unable to open %s: %s\n" msgstr "kunde inte öppna %s: %s\n" -#: git-send-email.perl:1904 +#: git-send-email.perl:1930 #, 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:1920 +#: git-send-email.perl:1947 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" @@ -18098,11 +22964,228 @@ msgstr "" "säkerhetskopior.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1924 +#: git-send-email.perl:1951 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "hash version %X does not match version %X" +#~ msgstr "hash-versionen %X stämmer inte med versionen %X" + +#~ msgid "option '%s' requires a value" +#~ msgstr "flaggan \"%s\" behöver ett värde" + +#~ msgid "could not transform the todo list" +#~ msgstr "kunde inte transformera att göra-listan" + +#~ msgid "default" +#~ msgstr "standard" + +#~ msgid "Could not create directory '%s'" +#~ msgstr "Kunde inte skapa katalogen \"%s\"" + +#~ msgid "allow rerere to update index with resolved conflict" +#~ msgstr "tillåt rerere att uppdatera index med lösa konflikter" + +#~ msgid "could not open %s" +#~ msgstr "kunde inte öppna %s" + +#~ msgid "Could not move back to $head_name" +#~ msgstr "Kunde inte flytta tillbaka till $head_name" + +#~ msgid "" +#~ "It seems that there is already a $state_dir_base directory, and\n" +#~ "I wonder if you are in the middle of another rebase. If that is the\n" +#~ "case, please try\n" +#~ "\t$cmd_live_rebase\n" +#~ "If that is not the case, please\n" +#~ "\t$cmd_clear_stale_rebase\n" +#~ "and run me again. I am stopping in case you still have something\n" +#~ "valuable there." +#~ msgstr "" +#~ "Det verkar som katalogen $state_dir_base redan existerar, och\n" +#~ "jag undrar om du redan är mitt i en annan ombasering. Om så är\n" +#~ "fallet, försök\n" +#~ "\t$cmd_live_rebase\n" +#~ "Om så inte är fallet, kör\n" +#~ "\t$cmd_clear_stale_rebase\n" +#~ "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" +#~ "något av värde där." + +#~ msgid "" +#~ "fatal: cannot combine am options with either interactive or merge options" +#~ msgstr "" +#~ "ödesdigert: kan inte kombinera am-flaggor med antingen interaktiv- eller " +#~ "sammanslagningsflaggor" + +#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'" +#~ msgstr "" +#~ "ödesdigert: kan inte kombinera \"--signoff\" med \"--preserve-merges\"" + +#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'" +#~ msgstr "" +#~ "ödesdigert: kan inte kombinera \"--preserve-merges\" med \"--rebase-merges" +#~ "\"" + +#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'" +#~ msgstr "" +#~ "ödesdigert: kan inte kombinera \"--rebase-merges\" med \"--strategy-option" +#~ "\"" + +#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'" +#~ msgstr "" +#~ "ödesdigert: kan inte kombinera \"--rebase-merges\" med \"--strategy\"" + +#~ msgid "invalid upstream '$upstream_name'" +#~ msgstr "ogiltig uppström \"$upstream_name\"" + +#~ msgid "$onto_name: there are more than one merge bases" +#~ msgstr "$onto_name: mer än en sammanslagningsbas finns" + +#~ msgid "$onto_name: there is no merge base" +#~ msgstr "$onto_name: ingen sammanslagningsbas finns" + +#~ msgid "Does not point to a valid commit: $onto_name" +#~ msgstr "Peka på en giltig incheckning: $onto_name" + +#~ msgid "fatal: no such branch/commit '$branch_name'" +#~ msgstr "ödesdigert: ingen sådan gren/incheckning: $branch_name" + +#~ msgid "Created autostash: $stash_abbrev" +#~ msgstr "Skapade autostash: $stash_abbrev" + +#~ msgid "Current branch $branch_name is up to date." +#~ msgstr "Aktuell gren $branch_name är à jour." + +#~ msgid "Current branch $branch_name is up to date, rebase forced." +#~ msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad." + +#~ msgid "Changes to $onto:" +#~ msgstr "Ändringar till $onto:" + +#~ msgid "Changes from $mb to $onto:" +#~ msgstr "Ändringar från $mb till $onto:" + +#~ msgid "Fast-forwarded $branch_name to $onto_name." +#~ msgstr "Snabbspolade $branch_name till $onto_name." + +#~ 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..." + +#~ msgid "--reschedule-failed-exec requires an interactive rebase" +#~ msgstr "--reschedule-failed-exec kräver en interaktiv ombasering" + +#~ msgid "ignoring unknown color-moved-ws mode '%s'" +#~ msgstr "ignorerar okänt läge för color-mode-ws \"%s\"" + +#~ msgid "only 'tree:0' is supported" +#~ msgstr "endast \"tree:0\" stöds" + +#~ msgid "Renaming %s to %s and %s to %s instead" +#~ msgstr "Byter namn på %s till %s och %s till %s istället" + +#~ msgid "Adding merged %s" +#~ msgstr "Lägger till sammanslagen %s" + +#~ msgid "Internal error" +#~ msgstr "Internt fel" + +#~ msgid "mainline was specified but commit %s is not a merge." +#~ msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning." + +#~ msgid "unable to write sha1 filename %s" +#~ msgstr "kan inte skriva sha1-filnamn %s" + +#~ msgid "cannot read sha1_file for %s" +#~ msgstr "kan inte läsa sha1_file för %s" + +#~ msgid "" +#~ "error: cannot combine interactive options (--interactive, --exec, --" +#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am " +#~ "options (%s)" +#~ msgstr "" +#~ "fel: kan inte kombinera interaktiva flaggor (--interactive, --exec, --" +#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) med am-" +#~ "flaggor (%s)" + +#~ msgid "" +#~ "error: cannot combine merge options (--merge, --strategy, --strategy-" +#~ "option) with am options (%s)" +#~ msgstr "" +#~ "fel: kan inte kombinera sammanslagningsflaggor (--merge, --strategy, --" +#~ "strategy-option) med am-flaggor (%s)" + +#~ msgid "unrecognised option: '$arg'" +#~ msgstr "flaggan känns inte igen: \"$arg\"" + +#~ msgid "'$invalid' is not a valid commit" +#~ msgstr "\"$invalid\" är inte en giltig incheckning" + +#~ msgid "could not parse '%s' (looking for '%s')" +#~ msgstr "kunde inte tolka \"%s\" (letar efter \"%s\")" + +#~ msgid "deprecated synonym for --create-reflog" +#~ msgstr "avrådd synonym för --create-reflog" + +#~ msgid "Can't stat %s" +#~ msgstr "Kan inte ta status på %s" + +#~ msgid "abort rebase" +#~ msgstr "avbryt ombasering" + +#~ msgid "make rebase script" +#~ msgstr "skapa ombaseringsskript" + +#~ msgid "No such remote: %s" +#~ msgstr "Inget sådant fjärrarkiv: %s" + +#~ msgid "cannot move a locked working tree" +#~ msgstr "kan inte flytta en låst arbetskatalog" + +#~ msgid "cannot remove a locked working tree" +#~ msgstr "kan inte ta bort en låst arbetskatalog" + +#~ msgid "Applied autostash." +#~ msgstr "Tillämpade autostash." + +#~ msgid "Cannot store $stash_sha1" +#~ msgstr "Kan inte spara $stash_sha1" + +#~ msgid "" +#~ "\n" +#~ "\tHowever, if you remove everything, the rebase will be aborted.\n" +#~ "\n" +#~ "\t" +#~ msgstr "" +#~ "\n" +#~ "\tOmbaseringen kommer dock att avbrytas om du tar bort allting.\n" +#~ "\n" +#~ "\t" + +#~ msgid "Dirty index: cannot merge (dirty: %s)" +#~ msgstr "Smutsigt index: kan inte slå ihop (smutsiga: %s)" + +#~ msgid "(+/-)x" +#~ msgstr "(+/-)x" + +#~ msgid "<command>" +#~ msgstr "<kommando>" + +#~ msgid "push|fetch" +#~ msgstr "push|fetch" + +#~ msgid "w[,i1[,i2]]" +#~ msgstr "w[,i1[,i2]]" + +#~ msgid "Entering '$displaypath'" +#~ msgstr "Går in i \"$displaypath\"" + +#~ msgid "Stopping at '$displaypath'; script returned non-zero status." +#~ msgstr "" +#~ "Stoppar på \"$displaypath\"; skriptet returnerade en status skild från " +#~ "noll." + #~ msgid "Everyday Git With 20 Commands Or So" #~ msgstr "Git för dagligt bruk i ungefär 20 kommandon" @@ -18159,18 +23242,9 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ "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" @@ -18183,12 +23257,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ 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" @@ -18242,9 +23310,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "basename" #~ msgstr "basnamn" -#~ msgid "prepend parent project's basename to output" -#~ msgstr "lägg till föräldraprojektets basnamn i utdata" - #~ msgid "" #~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" #~ " - $line" @@ -18262,9 +23327,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "Or you can abort the rebase with 'git rebase --abort'." #~ msgstr "Eller så kan du avbryta ombaseringen med \"git rebase --abort\"." -#~ msgid "Could not open file '%s'" -#~ msgstr "Kunde inte öppna filen \"%s\"" - #~ msgid "in %0.1f seconds automatically..." #~ msgstr "automatiskt om %0.1f sekunder..." @@ -18282,7 +23344,7 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ "Did you forget to use 'git add'?" #~ msgstr "" #~ "Du har fortfarande sökvägar som inte slagits samman i ditt index.\n" -#~ "Glömde du använda \"git add\"?" +#~ "Glömde du att använda \"git add\"?" #~ msgid "" #~ "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -18308,9 +23370,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "tag: tagging " #~ msgstr "tag: taggar" -#~ msgid "object of unknown type" -#~ msgstr "objekt av okänd typ" - #~ msgid "commit object" #~ msgstr "incheckningsobjekt" @@ -18336,9 +23395,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "ref '%s' does not have %ld components to :strip" #~ msgstr "referensen \"%s\" har inte %ld komponenter för :strip" -#~ msgid "unknown %.*s format %s" -#~ msgstr "okänt \"%.*s\"-format %s" - #~ msgid "[%s: gone]" #~ msgstr "[%s: försvunnen]" @@ -18363,12 +23419,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 "cannot open file '%s'" -#~ msgstr "kan inte öppna filen \"%s\"" - -#~ msgid "could not close file %s" -#~ msgstr "kunde inte stänga filen %s" - #~ msgid "tag name too long: %.*s..." #~ msgstr "taggnamnet för långt: %.*s..." @@ -18429,18 +23479,12 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "Could not open %s" #~ msgstr "Kunde inte öppna %s" -#~ msgid "Could not read %s." -#~ msgstr "kunde inte läsa %s." - #~ msgid "Could not format %s." #~ msgstr "Kunde inte formatera %s." #~ msgid "%s: %s" #~ msgstr "%s: %s" -#~ msgid "cannot open %s: %s" -#~ msgstr "kan inte öppna %s: %s" - #~ msgid "You need to set your committer info first" #~ msgstr "Du måste ställa in din incheckarinformation först" @@ -18633,9 +23677,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "removing '%s' failed" #~ msgstr "misslyckades ta bort \"%s\"" -#~ msgid "program error" -#~ msgstr "programfel" - #~ msgid "Please call 'bisect_state' with at least one argument." #~ msgstr "Anropa \"bisect_state\" med minst ett argument." @@ -18673,9 +23714,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "'%s': %s" #~ msgstr "\"%s\": %s" -#~ msgid "unable to access '%s': %s" -#~ msgstr "kan inte komma åt \"%s\": %s" - #~ msgid " git branch -d %s\n" #~ msgstr " git branch -d %s\n" @@ -18692,9 +23730,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "failed to remove: %s" #~ msgstr "misslyckades ta bort: %s" -#~ msgid "The --exec option must be used with the --interactive option" -#~ msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive" - #~ msgid "" #~ "Submodule path '$displaypath' not initialized\n" #~ "Maybe you want to use 'update --init'?" @@ -18708,9 +23743,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "improper format entered align:%s" #~ msgstr "felaktigt format angivet align:%s" -#~ msgid "Could not set core.worktree in %s" -#~ msgstr "Kunde inte sätta core.worktree i %s" - #~ msgid "" #~ "push.default is unset; its implicit value has changed in\n" #~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" @@ -18781,12 +23813,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "branch '%s' does not point at a commit" #~ msgstr "grenen \"%s\" pekar inte på en incheckning" -#~ msgid "object '%s' does not point to a commit" -#~ msgstr "objektet \"%s\" pekar på en incheckning" - -#~ msgid "some refs could not be read" -#~ msgstr "vissa referenser kunde inte läsas" - #~ msgid "print only merged branches" #~ msgstr "visa endast sammanslagna grenar" @@ -18805,9 +23831,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "insanely long template path %s" #~ msgstr "tokigt lång mallsökväg %s" -#~ msgid "insane git directory %s" -#~ msgstr "tokig git-katalog %s" - #~ msgid "false|true|preserve" #~ msgstr "false|true|preserve" @@ -18820,9 +23843,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "switch 'points-at' requires an object" #~ msgstr "flaggan \"points-at\" behöver ett objekt" -#~ msgid "sort tags" -#~ msgstr "sortera taggar" - #~ msgid "--sort and -n are incompatible" #~ msgstr "--sort och -n är inkompatibla" @@ -18941,9 +23961,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "%s: cannot lock the ref" #~ msgstr "%s: kan inte låsa referensen" -#~ msgid "%s: cannot update the ref" -#~ msgstr "%s: kan inte uppdatera referensen" - #~ msgid "commit has empty message" #~ msgstr "incheckningen har ett tomt meddelande" @@ -19124,25 +24141,12 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgstr "" #~ "git shortlog [-n] [-s] [-e] [-w] [rev-flaggor] [--] [<incheckning-id>... ]" -#~ msgid "See 'git help <command>' for more information on a specific command." -#~ msgstr "" -#~ "Se \"git help <kommando>\" för mer information om ett specifikt kommando." - #~ msgid "use any ref in .git/refs" #~ msgstr "använd alla referenser i .git/refs" #~ msgid "use any tag in .git/refs/tags" #~ msgstr "använd alla taggar i .git/refs/tags" -#~ msgid "bad object %s" -#~ msgstr "felaktigt objekt %s" - -#~ msgid "bogus committer info %s" -#~ msgstr "felaktig incheckarinformation %s" - -#~ msgid "can't fdopen 'show' output fd" -#~ msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag" - #~ msgid "failed to close pipe to 'show' for object '%s'" #~ msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\"" @@ -19211,9 +24215,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "'%s': not a documentation directory." #~ msgstr "\"%s\": inte en dokumentationskatalog." -#~ msgid "-d option is no longer supported. Do not use." -#~ msgstr "Flaggan -d stöds inte lägre. Använd inte." - #~ msgid "Could not extract email from committer identity." #~ msgstr "Kunde inte extrahera e-postadress från incheckarens identitet." |