diff options
Diffstat (limited to 'po/sv.po')
| -rw-r--r-- | po/sv.po | 6876 |
1 files changed, 3684 insertions, 3192 deletions
@@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.31.0\n" +"Project-Id-Version: git 2.32.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-03-04 22:41+0800\n" -"PO-Revision-Date: 2021-03-04 19:06+0100\n" +"POT-Creation-Date: 2021-05-17 16:02+0800\n" +"PO-Revision-Date: 2021-05-20 13:31+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -23,9 +23,9 @@ msgstr "" msgid "Huh (%s)?" msgstr "Vadå (%s)?" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292 -#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538 -#: builtin/rebase.c:1963 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 +#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528 +#: builtin/rebase.c:1953 msgid "could not read index" msgstr "kunde inte läsa indexet" @@ -53,7 +53,7 @@ msgstr "Uppdatera" msgid "could not stage '%s'" msgstr "kunde inte köa \"%s\"" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687 msgid "could not write index" msgstr "kunde inte skriva indexet" @@ -69,7 +69,7 @@ msgstr[1] "uppdaterade %d sökvägar\n" msgid "note: %s is untracked now.\n" msgstr "observera: %s spåras inte längre.\n" -#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295 +#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" @@ -209,12 +209,12 @@ msgstr "köad" msgid "unstaged" msgstr "ej köad" -#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 -#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 -#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 -#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 -#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308 +#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128 +#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 +#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327 +#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573 #: git-add--interactive.perl:213 msgid "path" msgstr "sökväg" @@ -736,7 +736,7 @@ msgstr "Beklagar, kan inte redigera stycket" msgid "'git apply' failed" msgstr "\"git apply\" misslyckades" -#: advice.c:143 +#: advice.c:145 #, c-format msgid "" "\n" @@ -745,47 +745,47 @@ msgstr "" "\n" "Slå av meddelandet med \"git config advice.%s false\"" -#: advice.c:159 +#: advice.c:161 #, c-format msgid "%shint: %.*s%s\n" msgstr "%stips: %.*s%s\n" -#: advice.c:250 +#: advice.c:252 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:252 +#: advice.c:254 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:254 +#: advice.c:256 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:256 +#: advice.c:258 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:258 +#: advice.c:260 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:260 +#: advice.c:262 #, 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:268 +#: advice.c:270 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." @@ -793,23 +793,41 @@ 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:276 +#: advice.c:278 msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:281 builtin/merge.c:1370 +#: advice.c:283 builtin/merge.c:1374 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: advice.c:283 +#: advice.c:285 msgid "Please, commit your changes before merging." msgstr "Checka in dina ändringar innan du utför sammanslagningen." -#: advice.c:284 +#: advice.c:286 msgid "Exiting because of unfinished merge." msgstr "Avslutar på grund av ofullbordad sammanslagning." -#: advice.c:290 +#: advice.c:296 +#, c-format +msgid "" +"The following pathspecs didn't match any eligible path, but they do match " +"index\n" +"entries outside the current sparse checkout:\n" +msgstr "" +"Följande sökvägsangivelser motsvarar inte någon kvalificerad sökväg, men " +"motsvarar\n" +"indexposter utanför den nuvarande glesa utcheckningen:\n" + +#: advice.c:303 +msgid "" +"Disable or modify the sparsity rules if you intend to update such entries." +msgstr "" +"Du måste ta bort eller ändra glesningsreglerna för att uppdatera sådana " +"poster." + +#: advice.c:310 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -860,82 +878,78 @@ msgstr "kommandorad avslutas med \\" msgid "unclosed quote" msgstr "citat ej stängt" -#: apply.c:69 +#: apply.c:70 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "okänt alternativ för whitespace: \"%s\"" -#: apply.c:85 +#: apply.c:86 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: apply.c:135 +#: apply.c:136 msgid "--reject and --3way cannot be used together." msgstr "--reject och --3way kan inte användas samtidigt." -#: apply.c:137 -msgid "--cached and --3way cannot be used together." -msgstr "--cached och --3way kan inte användas samtidigt." - -#: apply.c:140 +#: apply.c:139 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: apply.c:151 +#: apply.c:150 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: apply.c:154 +#: apply.c:153 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: apply.c:801 +#: apply.c:800 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: apply.c:810 +#: apply.c:809 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: apply.c:884 +#: apply.c:883 #, c-format msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen på rad %d" -#: apply.c:922 +#: apply.c:921 #, 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:928 +#: apply.c:927 #, 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:929 +#: apply.c:928 #, 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:934 +#: apply.c:933 #, 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:963 +#: apply.c:962 #, c-format msgid "invalid mode on line %d: %s" msgstr "ogiltigt läge på rad %d: %s" -#: apply.c:1282 +#: apply.c:1281 #, c-format msgid "inconsistent header lines %d and %d" msgstr "huvudet är inkonsekvent mellan rad %d och %d" -#: apply.c:1372 +#: apply.c:1371 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -951,92 +965,92 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: apply.c:1385 +#: apply.c:1384 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)" -#: apply.c:1481 +#: apply.c:1480 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: oväntad rad: %.*s" -#: apply.c:1550 +#: apply.c:1549 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: apply.c:1831 +#: apply.c:1830 #, 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:1978 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: apply.c:2015 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: apply.c:2177 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: apply.c:2263 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: apply.c:2267 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: apply.c:2936 +#: apply.c:2935 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: apply.c:3057 +#: apply.c:3056 #, 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:3069 +#: apply.c:3068 #, 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:3075 +#: apply.c:3074 #, c-format msgid "" "while searching for:\n" @@ -1045,25 +1059,25 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: apply.c:3097 +#: apply.c:3096 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: apply.c:3105 +#: apply.c:3104 #, 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:3152 +#: apply.c:3151 #, 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:3163 +#: apply.c:3162 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -1071,413 +1085,419 @@ msgstr "" "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande " "innehållet." -#: apply.c:3171 +#: apply.c:3170 #, 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:3189 +#: apply.c:3188 #, 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:3202 +#: apply.c:3201 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: apply.c:3209 +#: apply.c:3208 #, 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:3230 +#: apply.c:3229 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: apply.c:3353 +#: apply.c:3352 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213 +#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214 #: setup.c:308 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" -#: apply.c:3413 +#: apply.c:3412 #, 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:3442 apply.c:3685 +#: apply.c:3441 apply.c:3687 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: apply.c:3528 apply.c:3700 +#: apply.c:3527 apply.c:3702 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: apply.c:3537 apply.c:3708 apply.c:3952 +#: apply.c:3536 apply.c:3710 apply.c:3954 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: apply.c:3572 -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:3571 +msgid "repository lacks the necessary blob to perform 3-way merge." +msgstr "arkivet saknar objekt som behövs för att utföra 3-vägssammanslagning." -#: apply.c:3575 +#: apply.c:3574 #, c-format -msgid "Falling back to three-way merge...\n" -msgstr "Faller tillbaka på trevägssammanslagning...\n" +msgid "Performing three-way merge...\n" +msgstr "Utför trevägssammanslagning...\n" -#: apply.c:3591 apply.c:3595 +#: apply.c:3590 apply.c:3594 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kunde inte läsa aktuellt innehåll i \"%s\"" -#: apply.c:3607 +#: apply.c:3606 #, c-format -msgid "Failed to fall back on three-way merge...\n" -msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n" +msgid "Failed to perform three-way merge...\n" +msgstr "Misslyckades utföra trevägssammanslagning...\n" -#: apply.c:3621 +#: apply.c:3620 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Applicerade patchen på \"%s\" med konflikter.\n" -#: apply.c:3626 +#: apply.c:3625 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Tillämpade patchen på \"%s\" rent.\n" -#: apply.c:3652 +#: apply.c:3642 +#, c-format +msgid "Falling back to direct application...\n" +msgstr "Faller tillbaka på direkt tillämpning...\n" + +#: apply.c:3654 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: apply.c:3725 +#: apply.c:3727 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: apply.c:3727 +#: apply.c:3729 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 -#: read-cache.c:1313 +#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890 +#: read-cache.c:1351 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg \"%s\"" -#: apply.c:3950 +#: apply.c:3952 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: apply.c:3954 +#: apply.c:3956 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: apply.c:3974 +#: apply.c:3976 #, 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:3979 +#: apply.c:3981 #, 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:3999 +#: apply.c:4001 #, 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:4003 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: apply.c:4018 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: apply.c:4110 +#: apply.c:4112 #, 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:4117 +#: apply.c:4119 #, 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:4120 +#: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller är oanvändbar (%s)." -#: apply.c:4129 +#: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "kunde inte lägga till %s till temporärt index" -#: apply.c:4139 +#: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "kunde inte skriva temporärt index till %s" -#: apply.c:4277 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: apply.c:4311 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: apply.c:4317 +#: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: apply.c:4325 +#: apply.c:4327 #, 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:4331 apply.c:4476 +#: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: apply.c:4374 builtin/bisect--helper.c:523 +#: apply.c:4376 builtin/bisect--helper.c:523 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" -#: apply.c:4378 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: apply.c:4448 +#: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: apply.c:4546 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: apply.c:4554 +#: apply.c:4556 msgid "internal error" msgstr "internt fel" -#: apply.c:4557 +#: apply.c:4559 #, 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:4568 +#: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334 +#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" -#: apply.c:4590 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: apply.c:4594 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4718 +#: apply.c:4725 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4726 +#: apply.c:4733 msgid "unrecognized input" msgstr "indata känns inte igen" -#: apply.c:4746 +#: apply.c:4753 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4903 +#: apply.c:4910 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4930 +#: apply.c:4937 #, 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:4936 apply.c:4951 +#: apply.c:4943 apply.c:4958 #, 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:4944 +#: apply.c:4951 #, 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:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: apply.c:4988 +#: apply.c:4995 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:4991 +#: apply.c:4998 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:4993 builtin/am.c:2266 +#: apply.c:5000 builtin/am.c:2317 msgid "num" msgstr "antal" -#: apply.c:4994 +#: apply.c:5001 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:4997 +#: apply.c:5004 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:4999 +#: apply.c:5006 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:5003 +#: apply.c:5010 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:5005 +#: apply.c:5012 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:5007 +#: apply.c:5014 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:5009 +#: apply.c:5016 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:5011 +#: apply.c:5018 msgid "mark new files with `git add --intent-to-add`" msgstr "markera nya filer med \"git add --intent-to-add\"" -#: apply.c:5013 +#: apply.c:5020 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:5015 +#: apply.c:5022 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:5018 +#: apply.c:5025 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:5020 -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:5027 +msgid "attempt three-way merge, fall back on normal patch if that fails" +msgstr "" +"försök en trevägssammanslagning, fall tillbaka på normal patch om det " +"misslyckas" -#: apply.c:5022 +#: apply.c:5029 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540 +#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: apply.c:5027 +#: apply.c:5034 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 -#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3577 builtin/rebase.c:1352 +#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296 +#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831 +#: builtin/rebase.c:1347 msgid "action" msgstr "åtgärd" -#: apply.c:5029 +#: apply.c:5036 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:5032 apply.c:5035 +#: apply.c:5039 apply.c:5042 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:5038 +#: apply.c:5045 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:5040 +#: apply.c:5047 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:5042 +#: apply.c:5049 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:5044 +#: apply.c:5051 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757 -#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 +#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755 +#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "var pratsam" -#: apply.c:5047 +#: apply.c:5054 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:5050 +#: apply.c:5057 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:5052 builtin/am.c:2254 +#: apply.c:5059 builtin/am.c:2305 msgid "root" msgstr "rot" -#: apply.c:5053 +#: apply.c:5060 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" @@ -1544,141 +1564,141 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:192 +#: archive.c:188 #, c-format msgid "cannot read %s" msgstr "kan inte läsa %s" -#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894 -#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786 -#: builtin/merge.c:1139 +#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 +#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833 +#: builtin/merge.c:1143 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315 +#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" -#: archive.c:454 +#: archive.c:451 #, c-format msgid "no such ref: %.*s" msgstr "ingen sådan referens: %.*s" -#: archive.c:460 +#: archive.c:457 #, c-format msgid "not a valid object name: %s" msgstr "objektnamnet är inte giltigt: %s" -#: archive.c:473 +#: archive.c:470 #, c-format msgid "not a tree object: %s" msgstr "inte ett trädobjekt: %s" -#: archive.c:485 +#: archive.c:482 msgid "current working directory is untracked" msgstr "aktuell arbetskatalog är inte spårad" -#: archive.c:526 +#: archive.c:523 #, c-format msgid "File not found: %s" msgstr "Hittar inte filen: %s" -#: archive.c:528 +#: archive.c:525 #, c-format msgid "Not a regular file: %s" msgstr "Inte en vanlig fil: %s" -#: archive.c:555 +#: archive.c:552 msgid "fmt" msgstr "fmt" -#: archive.c:555 +#: archive.c:552 msgid "archive format" msgstr "arkivformat" -#: archive.c:556 builtin/log.c:1764 +#: archive.c:553 builtin/log.c:1772 msgid "prefix" msgstr "prefix" -#: archive.c:557 +#: archive.c:554 msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888 +#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105 -#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 +#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105 +#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 msgid "file" msgstr "fil" -#: archive.c:559 +#: archive.c:556 msgid "add untracked file to archive" msgstr "ta med ospårade filer i arkivet" -#: archive.c:562 builtin/archive.c:90 +#: archive.c:559 builtin/archive.c:90 msgid "write the archive to this file" msgstr "skriv arkivet till filen" -#: archive.c:564 +#: archive.c:561 msgid "read .gitattributes in working directory" msgstr "läs .gitattributes i arbetskatalogen" -#: archive.c:565 +#: archive.c:562 msgid "report archived files on stderr" msgstr "rapportera arkiverade filer på standard fel" -#: archive.c:567 +#: archive.c:564 msgid "set compression level" msgstr "välj komprimeringsgrad" -#: archive.c:570 +#: archive.c:567 msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 -#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 +#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 +#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336 msgid "repo" msgstr "arkiv" -#: archive.c:573 builtin/archive.c:92 +#: archive.c:570 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718 #: builtin/notes.c:498 msgid "command" msgstr "kommando" -#: archive.c:575 builtin/archive.c:94 +#: archive.c:572 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:582 +#: archive.c:579 msgid "Unexpected option --remote" msgstr "Oväntad flagga --remote" -#: archive.c:584 +#: archive.c:581 msgid "Option --exec can only be used together with --remote" msgstr "Flaggan --exec kan endast användas tillsammans med --remote" -#: archive.c:586 +#: archive.c:583 msgid "Unexpected option --output" msgstr "Oväntad flagga --output" -#: archive.c:588 +#: archive.c:585 msgid "Options --add-file and --remote cannot be used together" msgstr "Flaggorna --add-file och --remote kan inte användas samtidigt" -#: archive.c:610 +#: archive.c:607 #, c-format msgid "Unknown archive format '%s'" msgstr "Okänt arkivformat \"%s\"" -#: archive.c:619 +#: archive.c:616 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumentet stöd inte för formatet \"%s\": -%d" @@ -1688,12 +1708,12 @@ msgstr "Argumentet stöd inte för formatet \"%s\": -%d" msgid "%.*s is not a valid attribute name" msgstr "%-*s är inte ett giltigt namn på attribut" -#: attr.c:359 +#: attr.c:363 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s inte tillåtet: %s:%d" -#: attr.c:399 +#: attr.c:403 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1776,7 +1796,7 @@ msgstr "Bisect: en sammanslagningsbas måste testas\n" msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" @@ -1821,41 +1841,41 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n" msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n" -#: blame.c:2777 +#: blame.c:2776 msgid "--contents and --reverse do not blend well." msgstr "--contents och --reverse fungerar inte så bra tillsammans." -#: blame.c:2791 +#: blame.c:2790 msgid "cannot use --contents with final commit object name" msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt" -#: blame.c:2812 +#: blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146 -#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411 -#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335 -#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410 -#: builtin/shortlog.c:255 +#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 +#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411 +#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344 +#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646 +#: builtin/pack-objects.c:3661 builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" -#: blame.c:2839 +#: blame.c:2838 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent tillsammans kräver ett intervall på första-förälder-" "kedjan" -#: blame.c:2850 +#: blame.c:2849 #, c-format msgid "no such path %s in %s" msgstr "sökvägen %s i %s finns inte" -#: blame.c:2861 +#: blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" msgstr "kan inte läsa objektet %s för sökvägen %s" @@ -1993,12 +2013,12 @@ msgstr "Objektnamnet är tvetydigt: \"%s\"." msgid "Not a valid branch point: '%s'." msgstr "Avgreningspunkten är inte giltig: \"%s\"." -#: branch.c:365 +#: branch.c:366 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "\"%s\" är redan utcheckad på \"%s\"" -#: branch.c:388 +#: branch.c:389 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD i arbetskatalogen %s har inte uppdaterats" @@ -2023,8 +2043,8 @@ msgstr "'%s' ser inte ut som en v2- eller v3-paket-fil (bundle)" msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184 -#: builtin/commit.c:814 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 +#: builtin/commit.c:861 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -2082,7 +2102,7 @@ msgstr "version %d för paket (bundle) stöds ej" msgid "cannot write bundle version %d with algorithm %s" msgstr "kan inte skriva paket (bundle) med version %d med algoritmen %s" -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396 +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -2124,234 +2144,234 @@ msgstr "avslutande stycke har id %<PRIx32> som inte är noll" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit-graph.c:197 midx.c:46 +#: commit-graph.c:204 midx.c:47 msgid "invalid hash version" msgstr "felaktig hashnings-version" -#: commit-graph.c:255 +#: commit-graph.c:262 msgid "commit-graph file is too small" msgstr "incheckningsgraffilen %s är för liten" -#: commit-graph.c:348 +#: commit-graph.c:355 #, 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:355 +#: commit-graph.c:362 #, 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:362 +#: commit-graph.c:369 #, 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:379 +#: commit-graph.c:386 #, c-format msgid "commit-graph file is too small to hold %u chunks" msgstr "incheckningsgraffilen är för liten för att innehålla %u stycken" -#: commit-graph.c:472 +#: commit-graph.c:482 msgid "commit-graph has no base graphs chunk" msgstr "incheckningsgrafen har inga bas-graf-stycken" -#: commit-graph.c:482 +#: commit-graph.c:492 msgid "commit-graph chain does not match" msgstr "incheckningsgrafens kedja stämmer inte" -#: commit-graph.c:530 +#: commit-graph.c:540 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde" -#: commit-graph.c:554 +#: commit-graph.c:564 msgid "unable to find all commit-graph files" msgstr "kan inte hitta alla incheckingsgraffiler" -#: commit-graph.c:735 commit-graph.c:772 +#: commit-graph.c:745 commit-graph.c:782 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig" -#: commit-graph.c:756 +#: commit-graph.c:766 #, c-format msgid "could not find commit %s" msgstr "kunde inte hitta incheckningen %s" -#: commit-graph.c:789 +#: commit-graph.c:799 msgid "commit-graph requires overflow generation data but has none" msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen" -#: commit-graph.c:1065 builtin/am.c:1292 +#: commit-graph.c:1075 builtin/am.c:1340 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: commit-graph.c:1327 builtin/pack-objects.c:2872 +#: commit-graph.c:1337 builtin/pack-objects.c:2897 #, c-format msgid "unable to get type of object %s" msgstr "kunde inte hämta typ för objektet %s" -#: commit-graph.c:1358 +#: commit-graph.c:1368 msgid "Loading known commits in commit graph" msgstr "Läser in kända incheckningar i incheckningsgraf" -#: commit-graph.c:1375 +#: commit-graph.c:1385 msgid "Expanding reachable commits in commit graph" msgstr "Expanderar nåbara incheckningar i incheckningsgraf" -#: commit-graph.c:1395 +#: commit-graph.c:1405 msgid "Clearing commit marks in commit graph" msgstr "Rensar incheckningsmärken i incheckningsgraf" -#: commit-graph.c:1414 +#: commit-graph.c:1424 msgid "Computing commit graph topological levels" msgstr "Beräknar topografiska nivåer för incheckningsgraf" -#: commit-graph.c:1467 +#: commit-graph.c:1477 msgid "Computing commit graph generation numbers" msgstr "Beräknar generationsvärden för incheckningsgraf" -#: commit-graph.c:1548 +#: commit-graph.c:1558 msgid "Computing commit changed paths Bloom filters" msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen" -#: commit-graph.c:1625 +#: commit-graph.c:1635 msgid "Collecting referenced commits" msgstr "Samlar refererade incheckningar" -#: commit-graph.c:1650 +#: commit-graph.c:1660 #, 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:1663 +#: commit-graph.c:1673 #, c-format msgid "error adding pack %s" msgstr "fel vid tillägg av paketet %s" -#: commit-graph.c:1667 +#: commit-graph.c:1677 #, c-format msgid "error opening index for %s" msgstr "fel vid öppning av indexet för %s" -#: commit-graph.c:1704 +#: commit-graph.c:1714 msgid "Finding commits for commit graph among packed objects" msgstr "Söker incheckningar för incheckingsgraf i packade objekt" -#: commit-graph.c:1722 +#: commit-graph.c:1732 msgid "Finding extra edges in commit graph" msgstr "Söker ytterligare kanter i incheckingsgraf" -#: commit-graph.c:1771 +#: commit-graph.c:1781 msgid "failed to write correct number of base graph ids" msgstr "kunde inte skriva korrekt antal bas-graf-id:n" -#: commit-graph.c:1802 midx.c:794 +#: commit-graph.c:1812 midx.c:906 #, c-format msgid "unable to create leading directories of %s" msgstr "kunde inte skapa inledande kataloger för %s" -#: commit-graph.c:1815 +#: commit-graph.c:1825 msgid "unable to create temporary graph layer" msgstr "kan inte skapa temporärt graflager" -#: commit-graph.c:1820 +#: commit-graph.c:1830 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "kan inte justera delade behörigheter för \"%s\"" -#: commit-graph.c:1879 +#: commit-graph.c:1887 #, 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:1915 +#: commit-graph.c:1923 msgid "unable to open commit-graph chain file" msgstr "Kunde inte öppna incheckningsgrafkedjefilen" -#: commit-graph.c:1931 +#: commit-graph.c:1939 msgid "failed to rename base commit-graph file" msgstr "kunde inte byta namn på bas-incheckingsgraffilen" -#: commit-graph.c:1951 +#: commit-graph.c:1959 msgid "failed to rename temporary commit-graph file" msgstr "kunde inte byta namn på temporär incheckningsgraffil" -#: commit-graph.c:2084 +#: commit-graph.c:2092 msgid "Scanning merged commits" msgstr "Söker sammanslagna incheckningar" -#: commit-graph.c:2128 +#: commit-graph.c:2136 msgid "Merging commit-graph" msgstr "Slår ihop incheckningsgraf" -#: commit-graph.c:2235 +#: commit-graph.c:2244 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" "försöker skriva en incheckningsgraf, men \"core.commitGraph\" är inaktiverad" -#: commit-graph.c:2342 +#: commit-graph.c:2351 msgid "too many commits to write graph" msgstr "för många incheckningar för att skriva graf" -#: commit-graph.c:2440 +#: commit-graph.c:2450 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:2450 +#: commit-graph.c:2460 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s" -#: commit-graph.c:2460 commit-graph.c:2475 +#: commit-graph.c:2470 commit-graph.c:2485 #, 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:2467 +#: commit-graph.c:2477 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "kunde inte tolka incheckning %s från incheckningsgraf" -#: commit-graph.c:2485 +#: commit-graph.c:2495 msgid "Verifying commits in commit graph" msgstr "Bekräftar incheckningar i incheckningsgrafen" -#: commit-graph.c:2500 +#: commit-graph.c:2510 #, 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:2507 +#: commit-graph.c:2517 #, 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:2517 +#: commit-graph.c:2527 #, 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:2526 +#: commit-graph.c:2536 #, 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:2540 +#: commit-graph.c:2550 #, 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:2545 +#: commit-graph.c:2555 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2359,7 +2379,7 @@ msgstr "" "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-" "noll på annan plats" -#: commit-graph.c:2549 +#: commit-graph.c:2559 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2367,22 +2387,22 @@ msgstr "" "incheckningsgrafen har generationsnummer skilt från noll för incheckningen " "%s, men noll på annan plats" -#: commit-graph.c:2566 +#: commit-graph.c:2576 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "" "incheckningsgrafens generation för incheckningen %s är %<PRIuMAX> < " "%<PRIuMAX>" -#: commit-graph.c:2572 +#: commit-graph.c:2582 #, 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>" -#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 +#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416 +#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -2412,29 +2432,29 @@ msgstr "" "Slå av detta meddelande genom att skriva\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1223 +#: commit.c:1237 #, 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:1227 +#: commit.c:1241 #, 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:1230 +#: commit.c:1244 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: commit.c:1233 +#: commit.c:1247 #, 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:1487 +#: commit.c:1501 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" @@ -2501,7 +2521,7 @@ msgstr "nyckeln innehåller inte ett stycke: %s" msgid "key does not contain variable name: %s" msgstr "nyckeln innehåller inte variabelnamn: %s" -#: config.c:472 sequencer.c:2588 +#: config.c:472 sequencer.c:2785 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" @@ -2625,70 +2645,70 @@ msgstr "" 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:1194 +#: config.c:1257 #, c-format msgid "bad boolean config value '%s' for '%s'" msgstr "felaktigt booleskt konfigurationsvärde \"%s\" för \"%s\"" -#: config.c:1289 +#: config.c:1275 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:1298 +#: config.c:1284 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" -#: config.c:1391 +#: config.c:1377 #, c-format msgid "abbrev length out of range: %d" msgstr "förkortningslängd utanför intervallet: %d" -#: config.c:1405 config.c:1416 +#: config.c:1391 config.c:1402 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:1508 +#: config.c:1494 msgid "core.commentChar should only be one character" msgstr "core.commentChar kan bara vara ett tecken" -#: config.c:1541 +#: config.c:1527 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1613 +#: config.c:1599 #, c-format msgid "malformed value for %s" msgstr "felformat värde för %s" -#: config.c:1639 +#: config.c:1625 #, c-format msgid "malformed value for %s: %s" msgstr "felformat värde för %s: %s" -#: config.c:1640 +#: config.c:1626 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:1701 builtin/pack-objects.c:3666 +#: config.c:1687 builtin/pack-objects.c:3924 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1823 +#: config.c:1809 #, c-format msgid "unable to load config blob object '%s'" msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\"" -#: config.c:1826 +#: config.c:1812 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referensen \"%s\" pekar inte på en blob" -#: config.c:1843 +#: config.c:1829 #, c-format msgid "unable to resolve config blob '%s'" msgstr "kan inte slå upp konfigurerings-bloben \"%s\"" @@ -2698,105 +2718,105 @@ msgstr "kan inte slå upp konfigurerings-bloben \"%s\"" msgid "failed to parse %s" msgstr "kunde inte tolka %s" -#: config.c:1927 +#: config.c:1929 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:2290 +#: config.c:2293 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2464 +#: config.c:2467 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:2509 +#: config.c:2512 #, 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:2555 +#: config.c:2558 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2557 +#: config.c:2560 #, 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:2641 +#: config.c:2644 #, c-format msgid "invalid section name '%s'" msgstr "felaktigt sektionsnamn \"%s\"" -#: config.c:2673 +#: config.c:2676 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2702 +#: config.c:2705 #, c-format msgid "failed to write new configuration file %s" msgstr "kan inte skriva nya konfigurationsfilen \"%s\"" -#: config.c:2954 config.c:3280 +#: config.c:2957 config.c:3283 #, c-format msgid "could not lock config file %s" msgstr "kunde inte låsa konfigurationsfilen %s" -#: config.c:2965 +#: config.c:2968 #, c-format msgid "opening %s" msgstr "öppnar %s" -#: config.c:3002 builtin/config.c:361 +#: config.c:3005 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "ogiltigt mönster: %s" -#: config.c:3027 +#: config.c:3030 #, c-format msgid "invalid config file %s" msgstr "ogiltig konfigurationsfil: \"%s\"" -#: config.c:3040 config.c:3293 +#: config.c:3043 config.c:3296 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:3051 +#: config.c:3054 #, c-format msgid "unable to mmap '%s'" msgstr "kunde inte utföra mmap på \"%s\"" -#: config.c:3060 config.c:3298 +#: config.c:3063 config.c:3301 #, c-format msgid "chmod on %s failed" msgstr "chmod misslyckades på %s" -#: config.c:3145 config.c:3395 +#: config.c:3148 config.c:3398 #, c-format msgid "could not write config file %s" msgstr "kunde inte skriva konfigurationsfilen %s" -#: config.c:3179 +#: config.c:3182 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" -#: config.c:3271 +#: config.c:3274 #, c-format msgid "invalid section name: %s" msgstr "felaktigt namn på stycke: %s" -#: config.c:3438 +#: config.c:3441 #, c-format msgid "missing value for '%s'" msgstr "värde saknas för \"%s\"" @@ -2975,7 +2995,7 @@ msgstr "kunde inte grena (fork)" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" @@ -2991,17 +3011,17 @@ msgstr "kunde inte skriva till rev-list" msgid "failed to close rev-list's stdin" msgstr "kunde inte stänga rev-list:s standard in" -#: convert.c:194 +#: convert.c:183 #, c-format msgid "illegal crlf_action %d" msgstr "felaktig crlf_action %d" -#: convert.c:207 +#: convert.c:196 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "CRLF skulle ersättas av LF i %s" -#: convert.c:209 +#: convert.c:198 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -3010,12 +3030,12 @@ msgstr "" "CRLF kommer att ersättas av LF i %s.\n" "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog" -#: convert.c:217 +#: convert.c:206 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF skulle ersättas av CRLF i %s" -#: convert.c:219 +#: convert.c:208 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -3024,12 +3044,12 @@ msgstr "" "LF kommer att ersättas av CRLF i %s.\n" "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog" -#: convert.c:284 +#: convert.c:273 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "BOM är förbjudet i \"%s\" om kodat som %s" -#: convert.c:291 +#: convert.c:280 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " @@ -3038,12 +3058,12 @@ msgstr "" "Filen \"%s\" innehåller byte order mark (BOM). Använd UTF-%.*s som " "teckenkodning i arbetskatalogen." -#: convert.c:304 +#: convert.c:293 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "BOM krävs om \"%s\" kodas som %s" -#: convert.c:306 +#: convert.c:295 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" @@ -3052,51 +3072,51 @@ msgstr "" "Filen \"%s\" saknar byte order mark (BOM). Använd UTF-%sBE eller UTF-%sLE " "(beroende på byteordning) som teckenkodning i arbetskatalogen." -#: convert.c:419 convert.c:490 +#: convert.c:408 convert.c:479 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "misslyckades omkoda \"%s\" från %s till %s" -#: convert.c:462 +#: convert.c:451 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" "omkodning av \"%s\" från %s till %s och tillbaka ger inte samma resultat" -#: convert.c:665 +#: convert.c:654 #, 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:685 +#: convert.c:674 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "kunde inte skicka indata till externt filter \"%s\"" -#: convert.c:692 +#: convert.c:681 #, c-format msgid "external filter '%s' failed %d" msgstr "externt filter \"%s\" misslyckades %d" -#: convert.c:727 convert.c:730 +#: convert.c:716 convert.c:719 #, c-format msgid "read from external filter '%s' failed" msgstr "läsning från externt filter \"%s\" misslyckades" -#: convert.c:733 convert.c:788 +#: convert.c:722 convert.c:777 #, c-format msgid "external filter '%s' failed" msgstr "externt filter \"%s\" misslyckades" -#: convert.c:837 +#: convert.c:826 msgid "unexpected filter type" msgstr "oväntad filtertyp" -#: convert.c:848 +#: convert.c:837 msgid "path name too long for external filter" msgstr "sökvägen för lång för externt filter" -#: convert.c:940 +#: convert.c:934 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -3105,16 +3125,16 @@ msgstr "" "externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar " "inte har filtrerats" -#: convert.c:1240 +#: convert.c:1234 msgid "true/false are no valid working-tree-encodings" msgstr "true/false är inte giltig teckenkodning för arbetskatalogen" -#: convert.c:1428 convert.c:1462 +#: convert.c:1414 convert.c:1447 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: \"clean\"-filtret \"%s\" misslyckades" -#: convert.c:1508 +#: convert.c:1490 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades" @@ -3239,28 +3259,28 @@ msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)" msgid "Marked %d islands, done.\n" msgstr "Markerade %d öar, klar.\n" -#: diff-merges.c:70 +#: diff-merges.c:80 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "okänt värde för --diff-merges: %s" -#: diff-lib.c:534 +#: diff-lib.c:538 msgid "--merge-base does not work with ranges" msgstr "--merge-base fungerar inte med intervall" -#: diff-lib.c:536 +#: diff-lib.c:540 msgid "--merge-base only works with commits" msgstr "--merge-base fungerar bara med incheckningar" -#: diff-lib.c:553 +#: diff-lib.c:557 msgid "unable to get HEAD" msgstr "kan inte hämta HEAD" -#: diff-lib.c:560 +#: diff-lib.c:564 msgid "no merge base found" msgstr "ingen sammanslagningsbas hittades" -#: diff-lib.c:562 +#: diff-lib.c:566 msgid "multiple merge bases found" msgstr "flera sammanslagningsbaser hittades" @@ -3326,35 +3346,35 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:4276 +#: diff.c:4278 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:4628 +#: diff.c:4630 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" -#: diff.c:4631 +#: diff.c:4633 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S och --find-object är ömsesidigt uteslutande" -#: diff.c:4710 +#: diff.c:4712 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:4758 +#: diff.c:4760 #, c-format msgid "invalid --stat value: %s" msgstr "ogiltigt värde för --stat: %s" -#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306 +#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s förväntar ett numeriskt värde" -#: diff.c:4795 +#: diff.c:4797 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3363,42 +3383,42 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:4880 +#: diff.c:4882 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s" -#: diff.c:4904 +#: diff.c:4906 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "okänt värde efter ws-error-highlight=%.*s" -#: diff.c:4918 +#: diff.c:4920 #, c-format msgid "unable to resolve '%s'" msgstr "kunde inte slå upp \"%s\"" -#: diff.c:4968 diff.c:4974 +#: diff.c:4970 diff.c:4976 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s förväntar formen <n>/<m>" -#: diff.c:4986 +#: diff.c:4988 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s förväntar ett tecken, fick \"%s\"" -#: diff.c:5007 +#: diff.c:5009 #, c-format msgid "bad --color-moved argument: %s" msgstr "felaktigt argument till --color-moved: %s" -#: diff.c:5026 +#: diff.c:5028 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "ogiltigt läge %s\" i --color-moved-ws" -#: diff.c:5066 +#: diff.c:5068 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3406,154 +3426,154 @@ msgstr "" "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och " "\"histogram\"" -#: diff.c:5102 diff.c:5122 +#: diff.c:5104 diff.c:5124 #, c-format msgid "invalid argument to %s" msgstr "ogiltigt argument för %s" -#: diff.c:5226 +#: diff.c:5228 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\"" -#: diff.c:5275 +#: diff.c:5277 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:5331 +#: diff.c:5333 #, c-format msgid "bad --word-diff argument: %s" msgstr "felaktigt argument --word-diff: %s" -#: diff.c:5367 +#: diff.c:5369 msgid "Diff output format options" msgstr "Formatflaggor för diff-utdata" -#: diff.c:5369 diff.c:5375 +#: diff.c:5371 diff.c:5377 msgid "generate patch" msgstr "skapar patch" -#: diff.c:5372 builtin/log.c:179 +#: diff.c:5374 builtin/log.c:179 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: diff.c:5377 diff.c:5491 diff.c:5498 +#: diff.c:5379 diff.c:5493 diff.c:5500 msgid "<n>" msgstr "<n>" -#: diff.c:5378 diff.c:5381 +#: diff.c:5380 diff.c:5383 msgid "generate diffs with <n> lines context" msgstr "skapa diffar med <n> rader sammanhang" -#: diff.c:5383 +#: diff.c:5385 msgid "generate the diff in raw format" msgstr "generera diff i råformat" -#: diff.c:5386 +#: diff.c:5388 msgid "synonym for '-p --raw'" msgstr "synonym till \"-p --raw\"" -#: diff.c:5390 +#: diff.c:5392 msgid "synonym for '-p --stat'" msgstr "synonym till \"-p --stat\"" -#: diff.c:5394 +#: diff.c:5396 msgid "machine friendly --stat" msgstr "maskinläsbar --stat" -#: diff.c:5397 +#: diff.c:5399 msgid "output only the last line of --stat" msgstr "skriv bara ut den sista raden för --stat" -#: diff.c:5399 diff.c:5407 +#: diff.c:5401 diff.c:5409 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5400 +#: diff.c:5402 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:5404 +#: diff.c:5406 msgid "synonym for --dirstat=cumulative" msgstr "synonym för --dirstat=cumulative" -#: diff.c:5408 +#: diff.c:5410 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonym för --dirstat=filer,param1,param2..." -#: diff.c:5412 +#: diff.c:5414 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel" -#: diff.c:5415 +#: diff.c:5417 msgid "condensed summary such as creations, renames and mode changes" msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen" -#: diff.c:5418 +#: diff.c:5420 msgid "show only names of changed files" msgstr "visa endast namnen på ändrade filer" -#: diff.c:5421 +#: diff.c:5423 msgid "show only names and status of changed files" msgstr "visa endast namn och status för ändrade filer" -#: diff.c:5423 +#: diff.c:5425 msgid "<width>[,<name-width>[,<count>]]" msgstr "<bredd>[,<namn-bredd>[,<antal>]]" -#: diff.c:5424 +#: diff.c:5426 msgid "generate diffstat" msgstr "skapa diffstat" -#: diff.c:5426 diff.c:5429 diff.c:5432 +#: diff.c:5428 diff.c:5431 diff.c:5434 msgid "<width>" msgstr "<bredd>" -#: diff.c:5427 +#: diff.c:5429 msgid "generate diffstat with a given width" msgstr "generera en diffstat med given bredd" -#: diff.c:5430 +#: diff.c:5432 msgid "generate diffstat with a given name width" msgstr "generera en diffstat med given namnbredd" -#: diff.c:5433 +#: diff.c:5435 msgid "generate diffstat with a given graph width" msgstr "generera en diffstat med given grafbredd" -#: diff.c:5435 +#: diff.c:5437 msgid "<count>" msgstr "<antal>" -#: diff.c:5436 +#: diff.c:5438 msgid "generate diffstat with limited lines" msgstr "generera diffstat med begränsade rader" -#: diff.c:5439 +#: diff.c:5441 msgid "generate compact summary in diffstat" msgstr "skapa kompakt översikt i diffstat" -#: diff.c:5442 +#: diff.c:5444 msgid "output a binary diff that can be applied" msgstr "skapa en binärdiff som kan appliceras" -#: diff.c:5445 +#: diff.c:5447 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:5447 +#: diff.c:5449 msgid "show colored diff" msgstr "visa färgad diff" -#: diff.c:5448 +#: diff.c:5450 msgid "<kind>" msgstr "<typ>" -#: diff.c:5449 +#: diff.c:5451 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3561,7 +3581,7 @@ msgstr "" "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller " "\"new\" (nya) rader i diffen" -#: diff.c:5452 +#: diff.c:5454 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3569,87 +3589,87 @@ msgstr "" "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw " "eller --numstat" -#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570 +#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572 msgid "<prefix>" msgstr "<prefix>" -#: diff.c:5456 +#: diff.c:5458 msgid "show the given source prefix instead of \"a/\"" msgstr "visa givet källprefix istället för \"a/\"" -#: diff.c:5459 +#: diff.c:5461 msgid "show the given destination prefix instead of \"b/\"" msgstr "visa givet målprefix istället för \"b/\"" -#: diff.c:5462 +#: diff.c:5464 msgid "prepend an additional prefix to every line of output" msgstr "lägg till ytterligare prefix på alla rader i utdata" -#: diff.c:5465 +#: diff.c:5467 msgid "do not show any source or destination prefix" msgstr "visa inte käll- eller målprefix" -#: diff.c:5468 +#: diff.c:5470 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:5472 diff.c:5477 diff.c:5482 +#: diff.c:5474 diff.c:5479 diff.c:5484 msgid "<char>" msgstr "<tecken>" -#: diff.c:5473 +#: diff.c:5475 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:5478 +#: diff.c:5480 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:5483 +#: diff.c:5485 msgid "specify the character to indicate a context instead of ' '" msgstr "ange tecken för att ange sammanhang istället för \" \"" -#: diff.c:5486 +#: diff.c:5488 msgid "Diff rename options" msgstr "Diff-namnbytesflaggor" -#: diff.c:5487 +#: diff.c:5489 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5488 +#: diff.c:5490 msgid "break complete rewrite changes into pairs of delete and create" msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par" -#: diff.c:5492 +#: diff.c:5494 msgid "detect renames" msgstr "detektera namnändringar" -#: diff.c:5496 +#: diff.c:5498 msgid "omit the preimage for deletes" msgstr "ta bort för-version för borttagningar" -#: diff.c:5499 +#: diff.c:5501 msgid "detect copies" msgstr "detektera kopior" -#: diff.c:5503 +#: diff.c:5505 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:5505 +#: diff.c:5507 msgid "disable rename detection" msgstr "inaktivera detektering av namnbyten" -#: diff.c:5508 +#: diff.c:5510 msgid "use empty blobs as rename source" msgstr "använd tomma blob:ar som namnändringskälla" -#: diff.c:5510 +#: diff.c:5512 msgid "continue listing the history of a file beyond renames" msgstr "fortsätt lista historiken för en fil bortom namnändringar" -#: diff.c:5513 +#: diff.c:5515 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3657,163 +3677,163 @@ msgstr "" "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver " "given gräns" -#: diff.c:5515 +#: diff.c:5517 msgid "Diff algorithm options" msgstr "Alternativ för diff-algoritm" -#: diff.c:5517 +#: diff.c:5519 msgid "produce the smallest possible diff" msgstr "skapa minsta möjliga diff" -#: diff.c:5520 +#: diff.c:5522 msgid "ignore whitespace when comparing lines" msgstr "ignorera blanktecken vid radjämförelse" -#: diff.c:5523 +#: diff.c:5525 msgid "ignore changes in amount of whitespace" msgstr "ignorera ändringar i antal blanktecken vid radjämförelse" -#: diff.c:5526 +#: diff.c:5528 msgid "ignore changes in whitespace at EOL" msgstr "ignorera blanktecken vid radslut" -#: diff.c:5529 +#: diff.c:5531 msgid "ignore carrier-return at the end of line" msgstr "ignorera CR-tecken vid radslut" -#: diff.c:5532 +#: diff.c:5534 msgid "ignore changes whose lines are all blank" msgstr "ignorera ändringar i rader som är helt blanka" -#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604 +#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606 msgid "<regex>" msgstr "<reguttr>" -#: diff.c:5535 +#: diff.c:5537 msgid "ignore changes whose all lines match <regex>" msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>" -#: diff.c:5538 +#: diff.c:5540 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:5541 +#: diff.c:5543 msgid "generate diff using the \"patience diff\" algorithm" msgstr "skapa diffar med algoritmen \"patience diff\"" -#: diff.c:5545 +#: diff.c:5547 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "skapa diffar med algoritmen \"histogram diff\"" -#: diff.c:5547 +#: diff.c:5549 msgid "<algorithm>" msgstr "<algoritm>" -#: diff.c:5548 +#: diff.c:5550 msgid "choose a diff algorithm" msgstr "välj en diff-algoritm" -#: diff.c:5550 +#: diff.c:5552 msgid "<text>" msgstr "<text>" -#: diff.c:5551 +#: diff.c:5553 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "skapa diffar med algoritmen \"anchored diff\"" -#: diff.c:5553 diff.c:5562 diff.c:5565 +#: diff.c:5555 diff.c:5564 diff.c:5567 msgid "<mode>" msgstr "<läge>" -#: diff.c:5554 +#: diff.c:5556 msgid "show word diff, using <mode> to delimit changed words" msgstr "visa orddiff, där <läge> avgränsar ändrade ord" -#: diff.c:5557 +#: diff.c:5559 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:5560 +#: diff.c:5562 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>" -#: diff.c:5563 +#: diff.c:5565 msgid "moved lines of code are colored differently" msgstr "flyttade kodrader färgas på annat sätt" -#: diff.c:5566 +#: diff.c:5568 msgid "how white spaces are ignored in --color-moved" msgstr "hur blanktecken ignoreras i --color-moved" -#: diff.c:5569 +#: diff.c:5571 msgid "Other diff options" msgstr "Andra diff-flaggor" -#: diff.c:5571 +#: diff.c:5573 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:5575 +#: diff.c:5577 msgid "treat all files as text" msgstr "hantera alla filer som text" -#: diff.c:5577 +#: diff.c:5579 msgid "swap two inputs, reverse the diff" msgstr "växla två indatafiler, vänd diffen" -#: diff.c:5579 +#: diff.c:5581 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "avsluta med 1 vid ändringar, annars 0" -#: diff.c:5581 +#: diff.c:5583 msgid "disable all output of the program" msgstr "slå av alla utdata från programmet" -#: diff.c:5583 +#: diff.c:5585 msgid "allow an external diff helper to be executed" msgstr "tillåt köra en extern diff-hjälpare" -#: diff.c:5585 +#: diff.c:5587 msgid "run external text conversion filters when comparing binary files" msgstr "kör externt textkonverteringsfiler när binärfiler jämförs" -#: diff.c:5587 +#: diff.c:5589 msgid "<when>" msgstr "<när>" -#: diff.c:5588 +#: diff.c:5590 msgid "ignore changes to submodules in the diff generation" msgstr "ignorera ändringar i undermoduler när diffen skapas" -#: diff.c:5591 +#: diff.c:5593 msgid "<format>" msgstr "<format>" -#: diff.c:5592 +#: diff.c:5594 msgid "specify how differences in submodules are shown" msgstr "ange hur ändringar i undermoduler visas" -#: diff.c:5596 +#: diff.c:5598 msgid "hide 'git add -N' entries from the index" msgstr "dölj \"git add -N\"-poster från indexet" -#: diff.c:5599 +#: diff.c:5601 msgid "treat 'git add -N' entries as real in the index" msgstr "tolka \"git add -N\"-poster som äkta i indexet" -#: diff.c:5601 +#: diff.c:5603 msgid "<string>" msgstr "<sträng>" -#: diff.c:5602 +#: diff.c:5604 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:5605 +#: diff.c:5607 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3821,66 +3841,66 @@ msgstr "" "se efter ändringar som ändrar antalet förekomster av angivet reguljärt " "uttryck" -#: diff.c:5608 +#: diff.c:5610 msgid "show all changes in the changeset with -S or -G" msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G" -#: diff.c:5611 +#: diff.c:5613 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:5614 +#: diff.c:5616 msgid "control the order in which files appear in the output" msgstr "styr ordningen i vilken filer visas i utdata" -#: diff.c:5615 diff.c:5618 +#: diff.c:5617 diff.c:5620 msgid "<path>" msgstr "<sökväg>" -#: diff.c:5616 +#: diff.c:5618 msgid "show the change in the specified path first" msgstr "visa ändringen i angiven sökväg först" -#: diff.c:5619 +#: diff.c:5621 msgid "skip the output to the specified path" msgstr "hoppa över utdata fram till angiven sökväg" -#: diff.c:5621 +#: diff.c:5623 msgid "<object-id>" msgstr "<objekt-id>" -#: diff.c:5622 +#: diff.c:5624 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:5624 +#: diff.c:5626 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5625 +#: diff.c:5627 msgid "select files by diff type" msgstr "välj filter efter diff-typ" -#: diff.c:5627 +#: diff.c:5629 msgid "<file>" msgstr "<fil>" -#: diff.c:5628 +#: diff.c:5630 msgid "Output to a specific file" msgstr "Skriv utdata till en specifik fil" -#: diff.c:6285 +#: diff.c:6287 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:6288 +#: diff.c:6290 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:6291 +#: diff.c:6293 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3892,7 +3912,7 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "kunde inte läsa orderfilen \"%s\"" -#: diffcore-rename.c:786 +#: diffcore-rename.c:1418 msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" @@ -3927,35 +3947,35 @@ msgstr "" msgid "disabling cone pattern matching" msgstr "inaktiverar konmönstermatchning" -#: dir.c:1198 +#: dir.c:1206 #, c-format msgid "cannot use %s as an exclude file" msgstr "kan inte använda %s som exkluderingsfil" -#: dir.c:2305 +#: dir.c:2314 #, c-format msgid "could not open directory '%s'" msgstr "kunde inte öppna katalogen \"%s\"" -#: dir.c:2605 +#: dir.c:2614 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:2729 +#: dir.c:2738 msgid "untracked cache is disabled on this system or location" msgstr "ospårad cache är inaktiverad på systemet eller platsen" -#: dir.c:3534 +#: dir.c:3543 #, c-format msgid "index file corrupt in repo %s" msgstr "indexfilen trasig i arkivet %s" -#: dir.c:3579 dir.c:3584 +#: dir.c:3590 dir.c:3595 #, c-format msgid "could not create directories for %s" msgstr "kunde inte skapa kataloger för %s" -#: dir.c:3613 +#: dir.c:3624 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" @@ -3965,11 +3985,11 @@ msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" msgid "hint: Waiting for your editor to close the file...%c" msgstr "tips: Väntar på att textredigeringsprogrammet ska stänga filen...%c" -#: entry.c:177 +#: entry.c:179 msgid "Filtering content" msgstr "Filtrerar innehåll" -#: entry.c:478 +#: entry.c:500 #, c-format msgid "could not stat file '%s'" msgstr "kunde inte ta status på filen \"%s\"" @@ -3989,250 +4009,258 @@ msgstr "kunde inte ställa in GIT_DIR till \"%s\"" msgid "too many args to run %s" msgstr "för många flaggor för att köra %s" -#: fetch-pack.c:177 +#: fetch-pack.c:182 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: förväntade grund lista" -#: fetch-pack.c:180 +#: fetch-pack.c:185 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:191 +#: fetch-pack.c:196 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:211 +#: fetch-pack.c:216 #, 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:222 +#: fetch-pack.c:227 msgid "unable to write to remote" msgstr "kunde inte skriva till fjärren" -#: fetch-pack.c:283 +#: fetch-pack.c:288 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc kräver \"multi_ack_detailed\"" -#: fetch-pack.c:378 fetch-pack.c:1457 +#: fetch-pack.c:383 fetch-pack.c:1423 #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" -#: fetch-pack.c:384 fetch-pack.c:1463 +#: fetch-pack.c:389 fetch-pack.c:1429 #, c-format msgid "invalid unshallow line: %s" msgstr "ogiltig \"unshallow\"-rad: %s" -#: fetch-pack.c:386 fetch-pack.c:1465 +#: fetch-pack.c:391 fetch-pack.c:1431 #, c-format msgid "object not found: %s" msgstr "objektet hittades inte: %s" -#: fetch-pack.c:389 fetch-pack.c:1468 +#: fetch-pack.c:394 fetch-pack.c:1434 #, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" -#: fetch-pack.c:391 fetch-pack.c:1470 +#: fetch-pack.c:396 fetch-pack.c:1436 #, c-format msgid "no shallow found: %s" msgstr "ingen \"shallow\" hittades: %s" -#: fetch-pack.c:394 fetch-pack.c:1474 +#: fetch-pack.c:399 fetch-pack.c:1440 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "förväntade shallow/unshallow, fick %s" -#: fetch-pack.c:434 +#: fetch-pack.c:439 #, c-format msgid "got %s %d %s" msgstr "fick %s %d %s" -#: fetch-pack.c:451 +#: fetch-pack.c:456 #, c-format msgid "invalid commit %s" msgstr "ogiltig incheckning %s" -#: fetch-pack.c:482 +#: fetch-pack.c:487 msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:495 progress.c:339 +#: fetch-pack.c:500 progress.c:339 msgid "done" msgstr "klart" -#: fetch-pack.c:507 +#: fetch-pack.c:512 #, c-format msgid "got %s (%d) %s" msgstr "fick %s (%d) %s" -#: fetch-pack.c:543 +#: fetch-pack.c:548 #, c-format msgid "Marking %s as complete" msgstr "Markerar %s som komplett" -#: fetch-pack.c:758 +#: fetch-pack.c:763 #, c-format msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:844 +#: fetch-pack.c:849 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:852 +#: fetch-pack.c:857 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:946 +#: fetch-pack.c:951 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-patch: kunde inte grena av %s" -#: fetch-pack.c:952 +#: fetch-pack.c:957 msgid "fetch-pack: invalid index-pack output" msgstr "fetch-patch: ogiltig utdata från index-pack" -#: fetch-pack.c:969 +#: fetch-pack.c:974 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:971 +#: fetch-pack.c:976 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:1031 +#: fetch-pack.c:1019 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054 -#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 -#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 -#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108 +#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042 +#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 +#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096 #, c-format msgid "Server supports %s" msgstr "Servern stöder %s" -#: fetch-pack.c:1041 +#: fetch-pack.c:1029 msgid "Server does not support shallow clients" msgstr "Servern stöder inte klienter med grunda arkiv" -#: fetch-pack.c:1101 +#: fetch-pack.c:1089 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:1106 +#: fetch-pack.c:1094 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:1110 +#: fetch-pack.c:1098 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:1112 +#: fetch-pack.c:1100 msgid "Server does not support this repository's object format" msgstr "Servern stöder inte det här arkivets objektformat" -#: fetch-pack.c:1125 +#: fetch-pack.c:1113 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:1138 fetch-pack.c:1682 +#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238 +msgid "source repository is shallow, reject to clone." +msgstr "källarkivet är grunt, tillåter inte kloning." + +#: fetch-pack.c:1128 fetch-pack.c:1651 msgid "git fetch-pack: fetch failed." msgstr "git fetch-patch: hämtning misslyckades." -#: fetch-pack.c:1265 +#: fetch-pack.c:1242 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "omaka algoritmer: klient %s; server %s" -#: fetch-pack.c:1269 +#: fetch-pack.c:1246 #, c-format msgid "the server does not support algorithm '%s'" msgstr "servern stöder inte algoritmen \"%s\"" -#: fetch-pack.c:1289 +#: fetch-pack.c:1279 msgid "Server does not support shallow requests" msgstr "Servern stöder inte grunda förfrågningar" -#: fetch-pack.c:1296 +#: fetch-pack.c:1286 msgid "Server supports filter" msgstr "Servern stöder filter" -#: fetch-pack.c:1335 +#: fetch-pack.c:1329 fetch-pack.c:2034 msgid "unable to write request to remote" msgstr "kunde inte skriva anrop till fjärren" -#: fetch-pack.c:1353 +#: fetch-pack.c:1347 #, c-format msgid "error reading section header '%s'" msgstr "fel vid läsning av styckehuvudet \"%s\"" -#: fetch-pack.c:1359 +#: fetch-pack.c:1353 #, c-format msgid "expected '%s', received '%s'" msgstr "förväntade \"%s\", tog emot \"%s\"" -#: fetch-pack.c:1420 +#: fetch-pack.c:1387 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "oväntad bekräftelserad: \"%s\"" -#: fetch-pack.c:1425 +#: fetch-pack.c:1392 #, c-format msgid "error processing acks: %d" msgstr "fel vid hantering av bekräftelser: %d" -#: fetch-pack.c:1435 +#: fetch-pack.c:1402 msgid "expected packfile to be sent after 'ready'" msgstr "väntade att paketfil skulle sändas efter \"ready\"" -#: fetch-pack.c:1437 +#: fetch-pack.c:1404 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:1479 +#: fetch-pack.c:1445 #, c-format msgid "error processing shallow info: %d" msgstr "fel vid hantering av grund (\"shallow\") info: %d" -#: fetch-pack.c:1526 +#: fetch-pack.c:1494 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "förväntade wanted-ref, fick %s" -#: fetch-pack.c:1531 +#: fetch-pack.c:1499 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "oväntad wanted-ref: \"%s\"" -#: fetch-pack.c:1536 +#: fetch-pack.c:1504 #, c-format msgid "error processing wanted refs: %d" msgstr "fel vid hantering av önskade referenser: %d" -#: fetch-pack.c:1566 +#: fetch-pack.c:1534 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: förväntade svarsavslutningspaket" -#: fetch-pack.c:1960 +#: fetch-pack.c:1930 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1983 builtin/clone.c:693 +#: fetch-pack.c:1953 builtin/clone.c:697 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: fetch-pack.c:2010 +#: fetch-pack.c:2056 +msgid "unexpected 'ready' from remote" +msgstr "oväntat \"ready\" från fjärr" + +#: fetch-pack.c:2079 #, c-format msgid "no such remote ref %s" msgstr "ingen sådan fjärreferens: %s" -#: fetch-pack.c:2013 +#: fetch-pack.c:2082 #, 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" @@ -4255,7 +4283,7 @@ msgstr "gpg misslyckades signera data" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors" -#: grep.c:543 +#: grep.c:531 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -4263,18 +4291,18 @@ msgstr "" "angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -" "P under PCRE v2" -#: grep.c:1906 +#: grep.c:1893 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90 -#: builtin/rm.c:135 +#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:1934 +#: grep.c:1921 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" @@ -4498,47 +4526,52 @@ msgstr "tomt ident-namn (för <%s>) ej tillåtet" msgid "name consists only of disallowed characters: %s" msgstr "namnet består enbart av ej tillåtna tecken: %s" -#: ident.c:454 builtin/commit.c:634 +#: ident.c:454 builtin/commit.c:647 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" -#: list-objects-filter-options.c:81 +#: list-objects-filter-options.c:83 msgid "expected 'tree:<depth>'" msgstr "förväntade \"tree:<djup>\"" -#: list-objects-filter-options.c:96 +#: list-objects-filter-options.c:98 msgid "sparse:path filters support has been dropped" msgstr "sparse:sökväg-filter stöds inte längre" -#: list-objects-filter-options.c:109 +#: list-objects-filter-options.c:105 +#, c-format +msgid "'%s' for 'object:type=<type>' isnot a valid object type" +msgstr "\"%s\" för \"object:type=<typ>\" är inte en giltig objekttyp" + +#: list-objects-filter-options.c:124 #, c-format msgid "invalid filter-spec '%s'" msgstr "felaktig filterspecifikation: \"%s\"" -#: list-objects-filter-options.c:125 +#: list-objects-filter-options.c:140 #, c-format msgid "must escape char in sub-filter-spec: '%c'" msgstr "måste använda specialsekvens i delfilter-spec: \"%c\"" -#: list-objects-filter-options.c:167 +#: list-objects-filter-options.c:182 msgid "expected something after combine:" msgstr "förväntade någonting efter combine:" -#: list-objects-filter-options.c:249 +#: list-objects-filter-options.c:264 msgid "multiple filter-specs cannot be combined" msgstr "flera filterspecifikationer kan inte kombineras" -#: list-objects-filter-options.c:361 +#: list-objects-filter-options.c:376 msgid "unable to upgrade repository format to support partial clone" msgstr "kunde inte uppgradera arkivformat till att stöda delvis klon" -#: list-objects-filter.c:492 +#: list-objects-filter.c:532 #, c-format msgid "unable to access sparse blob in '%s'" msgstr "kunde inte nå gles blob på \"%s\"" -#: list-objects-filter.c:495 +#: list-objects-filter.c:535 #, c-format msgid "unable to parse sparse filter data in %s" msgstr "kunde inte tolka gles filterdata i %s" @@ -4553,7 +4586,7 @@ msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd" 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:375 +#: list-objects.c:395 #, c-format msgid "unable to load root tree for commit %s" msgstr "kunde inte läsa in rot-trädet för incheckningen %s" @@ -4592,34 +4625,43 @@ msgstr "ogiltigt värde \"%s\" för lsrefs.unborn" msgid "expected flush after ls-refs arguments" msgstr "förväntade \"flush\" efter ls-refs-argument" -#: merge-ort.c:888 merge-recursive.c:1191 +#: mailinfo.c:1050 +msgid "quoted CRLF detected" +msgstr "citerad CRLF upptäcktes" + +#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46 +#, c-format +msgid "bad action '%s' for '%s'" +msgstr "felaktig funktion \"%s\" för \"%s\"" + +#: merge-ort.c:1116 merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)" -#: merge-ort.c:897 merge-recursive.c:1198 +#: merge-ort.c:1125 merge-recursive.c:1212 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)" -#: merge-ort.c:906 merge-recursive.c:1205 +#: merge-ort.c:1134 merge-recursive.c:1219 #, 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-ort.c:916 merge-ort.c:923 +#: merge-ort.c:1144 merge-ort.c:1151 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "Obs: Snabbspolar undermodulen %s till %s" -#: merge-ort.c:944 +#: merge-ort.c:1172 #, c-format msgid "Failed to merge submodule %s" msgstr "Misslyckades slå ihop undermodulen %s" -#: merge-ort.c:951 +#: merge-ort.c:1179 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4628,7 +4670,7 @@ msgstr "" "Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns:\n" "%s\n" -#: merge-ort.c:955 merge-recursive.c:1259 +#: merge-ort.c:1183 merge-recursive.c:1273 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4645,7 +4687,7 @@ msgstr "" "\n" "vilket godtar lösningen.\n" -#: merge-ort.c:968 +#: merge-ort.c:1196 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4655,21 +4697,21 @@ msgstr "" "finns:\n" "%s" -#: merge-ort.c:1127 merge-recursive.c:1341 +#: merge-ort.c:1415 merge-recursive.c:1362 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-ort.c:1132 merge-recursive.c:1346 +#: merge-ort.c:1420 merge-recursive.c:1367 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-ort.c:1139 merge-recursive.c:1378 +#: merge-ort.c:1427 merge-recursive.c:1400 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-ort.c:1278 merge-recursive.c:2100 +#: merge-ort.c:1566 merge-recursive.c:2122 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4678,7 +4720,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-ort.c:1288 merge-recursive.c:2110 +#: merge-ort.c:1576 merge-recursive.c:2132 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4687,7 +4729,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-ort.c:1471 +#: merge-ort.c:1634 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4698,7 +4740,7 @@ msgstr "" "den har namnbytts till flera andra kataloger, utan att någon destination " "fick en majoritet av filerna." -#: merge-ort.c:1637 merge-recursive.c:2447 +#: merge-ort.c:1788 merge-recursive.c:2468 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4707,7 +4749,7 @@ msgstr "" "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har " "bytt namn." -#: merge-ort.c:1781 merge-recursive.c:3215 +#: merge-ort.c:1932 merge-recursive.c:3244 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4716,7 +4758,7 @@ msgstr "" "Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; " "flyttar den till %s." -#: merge-ort.c:1788 merge-recursive.c:3222 +#: merge-ort.c:1939 merge-recursive.c:3251 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4725,7 +4767,7 @@ msgstr "" "Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte " "namn i %s; flyttar den till %s." -#: merge-ort.c:1801 merge-recursive.c:3218 +#: merge-ort.c:1952 merge-recursive.c:3247 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4734,7 +4776,7 @@ msgstr "" "KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i " "%s, föreslår att den bör flyttas till%s." -#: merge-ort.c:1809 merge-recursive.c:3225 +#: merge-ort.c:1960 merge-recursive.c:3254 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4743,13 +4785,13 @@ msgstr "" "KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som " "bytte namn i %s; flyttar den till %s." -#: merge-ort.c:1952 +#: merge-ort.c:2103 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" "KONFLIKT (namnbyte/namnbyte): %s namnbytt till %s i %s och till %s i %s." -#: merge-ort.c:2047 +#: merge-ort.c:2198 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4760,13 +4802,23 @@ msgstr "" "innehållskonflikter OCH krockar med en annan sökväg; detta kan leda till " "nästlade konfliktmarkörer." -#: merge-ort.c:2066 merge-ort.c:2090 +#: merge-ort.c:2217 merge-ort.c:2241 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" "KONFLIKT (namnbyte/radera): %s namnbytt till %s i %s, men borttagen i %s." -#: merge-ort.c:2735 +#: merge-ort.c:2550 merge-recursive.c:3002 +#, c-format +msgid "cannot read object %s" +msgstr "kan inte läsa objektet %s" + +#: merge-ort.c:2553 merge-recursive.c:3005 +#, c-format +msgid "object %s is not a blob" +msgstr "objektet %s är inte en blob" + +#: merge-ort.c:2981 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " @@ -4775,41 +4827,42 @@ msgstr "" "KONFLIKT (fil/katalog): katalogen är i vägen för %s från %s; flyttar den " "till %s istället." -#: merge-ort.c:2808 +#: merge-ort.c:3055 #, c-format msgid "" -"CONFLICT (distinct types): %s had different types on each side; renamed %s " +"CONFLICT (distinct types): %s had different types on each side; renamed both " "of them so each can be recorded somewhere." msgstr "" -"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte %s så " -"att de kan protokollföras någonstans." +"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte bägge " +"så att de kan protokollföras någonstans." -#: merge-ort.c:2812 -msgid "both" -msgstr "båda" - -#: merge-ort.c:2812 -msgid "one" -msgstr "en" +#: merge-ort.c:3062 +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed one " +"of them so each can be recorded somewhere." +msgstr "" +"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte den ena " +"så att de kan protokollföras någonstans." -#: merge-ort.c:2907 merge-recursive.c:3052 +#: merge-ort.c:3162 merge-recursive.c:3081 msgid "content" msgstr "innehåll" -#: merge-ort.c:2909 merge-recursive.c:3056 +#: merge-ort.c:3164 merge-recursive.c:3085 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-ort.c:2911 merge-recursive.c:3101 +#: merge-ort.c:3166 merge-recursive.c:3130 msgid "submodule" msgstr "undermodul" -#: merge-ort.c:2913 merge-recursive.c:3102 +#: merge-ort.c:3168 merge-recursive.c:3131 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-ort.c:2938 +#: merge-ort.c:3198 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -4818,15 +4871,24 @@ msgstr "" "KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s " "lämnad i trädet." +#: merge-ort.c:3433 +#, c-format +msgid "" +"Note: %s not up to date and in way of checking out conflicted version; old " +"copy renamed to %s" +msgstr "" +"Observera: %s är inte à jour och i vägen för att checka ut version i " +"konflikt; gammal upplaga har nytt namn %s" + #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:3406 +#: merge-ort.c:3730 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "samling av sammanslagningsinfo misslyckades för träden %s, %s, %s" -#: merge-ort-wrappers.c:13 merge-recursive.c:3661 +#: merge-ort-wrappers.c:13 merge-recursive.c:3699 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4836,10 +4898,9 @@ msgstr "" "sammanslagning:\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3436 -#, c-format -msgid "Already up to date!" -msgstr "Redan à jour!" +#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402 +msgid "Already up to date." +msgstr "Redan à jour." #: merge-recursive.c:356 msgid "(bad commit)\n" @@ -4858,88 +4919,88 @@ msgstr "" "add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar " "sammanslagningen." -#: merge-recursive.c:874 +#: merge-recursive.c:876 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:885 +#: merge-recursive.c:887 #, 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:899 merge-recursive.c:918 +#: merge-recursive.c:901 merge-recursive.c:920 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:908 +#: merge-recursive.c:910 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:949 builtin/cat-file.c:41 +#: merge-recursive.c:951 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:954 +#: merge-recursive.c:956 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:979 +#: merge-recursive.c:981 #, c-format msgid "failed to open '%s': %s" msgstr "misslyckades öppna \"%s\": %s" -#: merge-recursive.c:990 +#: merge-recursive.c:992 #, c-format msgid "failed to symlink '%s': %s" msgstr "misslyckades skapa symboliska länken \"%s\": %s" -#: merge-recursive.c:995 +#: merge-recursive.c:997 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "vet inte hur %06o %s \"%s\" ska hanteras" -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1227 merge-recursive.c:1239 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Snabbspolar undermodulen %s till följande incheckning:" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1230 merge-recursive.c:1242 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Snabbspolar undermodulen %s" -#: merge-recursive.c:1251 +#: merge-recursive.c:1265 #, 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:1255 +#: merge-recursive.c:1269 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)" -#: merge-recursive.c:1256 +#: merge-recursive.c:1270 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:1268 +#: merge-recursive.c:1282 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)" -#: merge-recursive.c:1402 +#: merge-recursive.c:1424 #, 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:1474 +#: merge-recursive.c:1496 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4948,7 +5009,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:1479 +#: merge-recursive.c:1501 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4957,7 +5018,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:1486 +#: merge-recursive.c:1508 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4966,7 +5027,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:1491 +#: merge-recursive.c:1513 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4975,40 +5036,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:1548 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1526 +#: merge-recursive.c:1548 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 +#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Vägrar förlora lortig fil vid \"%s\"" -#: merge-recursive.c:1587 +#: merge-recursive.c:1609 #, 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:1645 +#: merge-recursive.c:1667 #, 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:1676 +#: merge-recursive.c:1698 #, 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:1681 +#: merge-recursive.c:1703 #, 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:1708 +#: merge-recursive.c:1730 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5017,17 +5078,17 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1713 +#: merge-recursive.c:1735 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1805 +#: merge-recursive.c:1827 #, 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:2068 +#: merge-recursive.c:2090 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5038,7 +5099,7 @@ msgstr "" "katalogen %s bytte namn till flera andra kataloger, utan att någon " "destination fick en majoritet av filerna." -#: merge-recursive.c:2202 +#: merge-recursive.c:2224 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5047,90 +5108,80 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog " "%s->%s i %s" -#: merge-recursive.c:2973 -#, c-format -msgid "cannot read object %s" -msgstr "kan inte läsa objektet %s" - -#: merge-recursive.c:2976 -#, c-format -msgid "object %s is not a blob" -msgstr "objektet %s är inte en blob" - -#: merge-recursive.c:3040 +#: merge-recursive.c:3069 msgid "modify" msgstr "ändra" -#: merge-recursive.c:3040 +#: merge-recursive.c:3069 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:3079 +#: merge-recursive.c:3108 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:3132 +#: merge-recursive.c:3161 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:3339 +#: merge-recursive.c:3368 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:3362 +#: merge-recursive.c:3391 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:3367 +#: merge-recursive.c:3396 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:3374 +#: merge-recursive.c:3403 #, 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:3383 +#: merge-recursive.c:3412 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:3392 +#: merge-recursive.c:3421 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3445 +#: merge-recursive.c:3474 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:3539 +#: merge-recursive.c:3568 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:3552 +#: merge-recursive.c:3581 #, 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:3602 +#: merge-recursive.c:3631 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:3758 +#: merge-recursive.c:3796 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896 -#: builtin/stash.c:471 +#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900 +#: builtin/stash.c:473 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -5138,177 +5189,196 @@ msgstr "Kunde inte skriva indexet." msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917 -#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817 -#: builtin/stash.c:265 +#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965 +#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 +#: builtin/stash.c:267 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: midx.c:62 +#: midx.c:74 msgid "multi-pack-index OID fanout is of the wrong size" msgstr "multi-pack-indexets OID-utbredning har fel storlek" -#: midx.c:93 +#: midx.c:105 #, c-format msgid "multi-pack-index file %s is too small" msgstr "multi-pack-indexfilen %s är för liten" -#: midx.c:109 +#: midx.c:121 #, 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:114 +#: midx.c:126 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-indexversionen %d stöds inte" -#: midx.c:119 +#: midx.c:131 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "multi-pack-index-hashversionen %u stämmer inte med versionen %u" -#: midx.c:136 +#: midx.c:148 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index saknar krävd paketnamn-stycke" -#: midx.c:138 +#: midx.c:150 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index saknar krävt OID-utbredningsstycke" -#: midx.c:140 +#: midx.c:152 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke" -#: midx.c:142 +#: midx.c:154 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index saknar krävt objekt-offsetstycke" -#: midx.c:158 +#: midx.c:170 #, 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:202 +#: midx.c:214 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "bad pack-int-id: %u (%u paket totalt)" -#: midx.c:252 +#: midx.c:264 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:467 +#: midx.c:490 #, c-format msgid "failed to add packfile '%s'" msgstr "misslyckades läsa paketfilen \"%s\"" -#: midx.c:473 +#: midx.c:496 #, c-format msgid "failed to open pack-index '%s'" msgstr "misslyckades öppna paketindexet \"%s\"" -#: midx.c:533 +#: midx.c:564 #, c-format msgid "failed to locate object %d in packfile" msgstr "misslyckades hitta objekt %d i paketfilen" -#: midx.c:821 +#: midx.c:880 builtin/index-pack.c:1535 +msgid "cannot store reverse index file" +msgstr "kan inte spara reverse-index-fil" + +#: midx.c:933 msgid "Adding packfiles to multi-pack-index" msgstr "Lägger till paketfiler till multi-pack-index" -#: midx.c:855 +#: midx.c:979 #, c-format msgid "did not see pack-file %s to drop" msgstr "såg inte paketfilen %s som skulle kastas" -#: midx.c:904 +#: midx.c:1024 +#, c-format +msgid "unknown preferred pack: '%s'" +msgstr "okänt föredraget paket: %s" + +#: midx.c:1029 +#, c-format +msgid "preferred pack '%s' is expired" +msgstr "föredraget paket \"%s\" har löpt ut" + +#: midx.c:1045 msgid "no pack files to index." msgstr "inga paketfiler att indexera." -#: midx.c:965 +#: midx.c:1125 builtin/clean.c:37 +#, c-format +msgid "failed to remove %s" +msgstr "misslyckades ta bort %s" + +#: midx.c:1156 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "misslyckades städa multi-pack-index på %s" -#: midx.c:1021 +#: midx.c:1214 msgid "multi-pack-index file exists, but failed to parse" msgstr "multi-pack-indexfilen finns, men kunde inte tolkas" -#: midx.c:1029 +#: midx.c:1222 msgid "Looking for referenced packfiles" msgstr "Ser efter refererade packfiler" -#: midx.c:1044 +#: midx.c:1237 #, 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:1049 +#: midx.c:1242 msgid "the midx contains no oid" msgstr "midx saknar oid" -#: midx.c:1058 +#: midx.c:1251 msgid "Verifying OID order in multi-pack-index" msgstr "Bekräftar OID-ordning i multi-pack-index" -#: midx.c:1067 +#: midx.c:1260 #, 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:1087 +#: midx.c:1280 msgid "Sorting objects by packfile" msgstr "Sorterar objekt efter packfil" -#: midx.c:1094 +#: midx.c:1287 msgid "Verifying object offsets" msgstr "Bekräftar offset för objekt" -#: midx.c:1110 +#: midx.c:1303 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "misslyckades läsa paketpost för oid[%d] = %s" -#: midx.c:1116 +#: midx.c:1309 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "misslyckades läsa paketindex för paketfil %s" -#: midx.c:1125 +#: midx.c:1318 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1150 +#: midx.c:1343 msgid "Counting referenced objects" msgstr "Räknar refererade objekt" -#: midx.c:1160 +#: midx.c:1353 msgid "Finding and deleting unreferenced packfiles" msgstr "Ser efter och tar bort orefererade packfiler" -#: midx.c:1351 +#: midx.c:1544 msgid "could not start pack-objects" msgstr "kunde inte starta pack-objects" -#: midx.c:1371 +#: midx.c:1564 msgid "could not finish pack-objects" msgstr "kunde inte avsluta pack-objects" -#: name-hash.c:538 +#: name-hash.c:542 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "misslyckades skapa lazy_dir-tråd: %s" -#: name-hash.c:560 +#: name-hash.c:564 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "misslyckades skapa lazy_name-tråd: %s" -#: name-hash.c:566 +#: name-hash.c:570 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "misslyckades utföra join på lazy_name-tråd: %s" @@ -5353,257 +5423,257 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Felaktigt värde på %s: \"%s\"" -#: object-file.c:480 +#: object-file.c:526 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates" -#: object-file.c:531 +#: object-file.c:577 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "kunde inte normalisera supplerande objektsökväg: %s" -#: object-file.c:603 +#: object-file.c:649 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: ignorerar supplerande objektlager, för djup nästling" -#: object-file.c:610 +#: object-file.c:656 #, c-format msgid "unable to normalize object directory: %s" msgstr "kan inte normalisera objektkatalogen: %s" -#: object-file.c:653 +#: object-file.c:699 msgid "unable to fdopen alternates lockfile" msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil" -#: object-file.c:671 +#: object-file.c:717 msgid "unable to read alternates file" msgstr "kan inte läsa \"alternates\"-filen" -#: object-file.c:678 +#: object-file.c:724 msgid "unable to move new alternates file into place" msgstr "kan inte flytta ny \"alternates\"-fil på plats" -#: object-file.c:713 +#: object-file.c:759 #, c-format msgid "path '%s' does not exist" msgstr "sökvägen \"%s\" finns inte" -#: object-file.c:734 +#: object-file.c:780 #, 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." -#: object-file.c:740 +#: object-file.c:786 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: object-file.c:746 +#: object-file.c:792 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: object-file.c:754 +#: object-file.c:800 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: object-file.c:814 +#: object-file.c:860 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "felaktig rad vid tolkning av supplerande referenser: %s" -#: object-file.c:964 +#: object-file.c:1010 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>" -#: object-file.c:985 +#: object-file.c:1031 msgid "mmap failed" msgstr "mmap misslyckades" -#: object-file.c:1149 +#: object-file.c:1195 #, c-format msgid "object file %s is empty" msgstr "objektfilen %s är tom" -#: object-file.c:1284 object-file.c:2477 +#: object-file.c:1330 object-file.c:2524 #, c-format msgid "corrupt loose object '%s'" msgstr "trasigt löst objekt \"%s\"" -#: object-file.c:1286 object-file.c:2481 +#: object-file.c:1332 object-file.c:2528 #, c-format msgid "garbage at end of loose object '%s'" msgstr "skräp i slutet av löst objekt \"%s\"" -#: object-file.c:1328 +#: object-file.c:1374 msgid "invalid object type" msgstr "felaktig objekttyp" -#: object-file.c:1412 +#: object-file.c:1458 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "kan inte packa upp %s-huvud med --allow-unknown-type" -#: object-file.c:1415 +#: object-file.c:1461 #, c-format msgid "unable to unpack %s header" msgstr "kan inte packa upp %s-huvudet" -#: object-file.c:1421 +#: object-file.c:1467 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "kan inte tolka %s-huvud med --allow-unknown-type" -#: object-file.c:1424 +#: object-file.c:1470 #, c-format msgid "unable to parse %s header" msgstr "kan inte tolka %s-huvud" -#: object-file.c:1651 +#: object-file.c:1697 #, c-format msgid "failed to read object %s" msgstr "misslyckades läsa objektet %s" -#: object-file.c:1655 +#: object-file.c:1701 #, c-format msgid "replacement %s not found for %s" msgstr "ersättningen %s hittades inte för %s" -#: object-file.c:1659 +#: object-file.c:1705 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "löst objekt %s (lagrat i %s) är trasigt" -#: object-file.c:1663 +#: object-file.c:1709 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "packat objekt %s (lagrat i %s) är trasigt" -#: object-file.c:1768 +#: object-file.c:1814 #, c-format msgid "unable to write file %s" msgstr "kunde inte skriva filen %s" -#: object-file.c:1775 +#: object-file.c:1821 #, c-format msgid "unable to set permission to '%s'" msgstr "kan inte sätta behörigheten till \"%s\"" -#: object-file.c:1782 +#: object-file.c:1828 msgid "file write error" msgstr "fel vid skrivning av fil" -#: object-file.c:1802 +#: object-file.c:1848 msgid "error when closing loose object file" msgstr "fel vid stängning av fil för löst objekt" -#: object-file.c:1867 +#: object-file.c:1913 #, 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" -#: object-file.c:1869 +#: object-file.c:1915 msgid "unable to create temporary file" msgstr "kan inte skapa temporär fil" -#: object-file.c:1893 +#: object-file.c:1939 msgid "unable to write loose object file" msgstr "kunde inte skriva fil för löst objekt" -#: object-file.c:1899 +#: object-file.c:1945 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)" -#: object-file.c:1903 +#: object-file.c:1949 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "\"deflateend\" på objektet %s misslyckades (%d)" -#: object-file.c:1907 +#: object-file.c:1953 #, c-format msgid "confused by unstable object source data for %s" msgstr "förvirrad av instabil objektkälldata för %s" -#: object-file.c:1917 builtin/pack-objects.c:1097 +#: object-file.c:1963 builtin/pack-objects.c:1097 #, c-format msgid "failed utime() on %s" msgstr "\"utime()\" misslyckades på %s" -#: object-file.c:1994 +#: object-file.c:2040 #, c-format msgid "cannot read object for %s" msgstr "kan inte läsa objekt för %s" -#: object-file.c:2045 +#: object-file.c:2091 msgid "corrupt commit" msgstr "trasik incheckning" -#: object-file.c:2053 +#: object-file.c:2099 msgid "corrupt tag" msgstr "trasig tagg" -#: object-file.c:2153 +#: object-file.c:2199 #, c-format msgid "read error while indexing %s" msgstr "läsfel vid indexering av %s" -#: object-file.c:2156 +#: object-file.c:2202 #, c-format msgid "short read while indexing %s" msgstr "för lite lästes vid indexering av %s" -#: object-file.c:2229 object-file.c:2239 +#: object-file.c:2275 object-file.c:2285 #, c-format msgid "%s: failed to insert into database" msgstr "%s: misslyckades lägga in i databasen" -#: object-file.c:2245 +#: object-file.c:2291 #, c-format msgid "%s: unsupported file type" msgstr "%s: filtypen stöds ej" -#: object-file.c:2269 +#: object-file.c:2315 #, c-format msgid "%s is not a valid object" msgstr "%s är inte ett giltigt objekt" -#: object-file.c:2271 +#: object-file.c:2317 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt \"%s\"-objekt" -#: object-file.c:2298 builtin/index-pack.c:192 +#: object-file.c:2344 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "kan inte öppna %s" -#: object-file.c:2488 object-file.c:2541 +#: object-file.c:2535 object-file.c:2588 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "hash stämmer inte för %s (förväntade %s)" -#: object-file.c:2512 +#: object-file.c:2559 #, c-format msgid "unable to mmap %s" msgstr "kan inte utföra \"mmap\" för %s" -#: object-file.c:2517 +#: object-file.c:2564 #, c-format msgid "unable to unpack header of %s" msgstr "kan inte packa upp huvud för %s" -#: object-file.c:2523 +#: object-file.c:2570 #, c-format msgid "unable to parse header of %s" msgstr "kan inte tolka huvud för %s" -#: object-file.c:2534 +#: object-file.c:2581 #, c-format msgid "unable to unpack contents of %s" msgstr "kan inte tolka innehåll i %s" @@ -5715,71 +5785,71 @@ msgstr "ogiltig objekttyp \"%s\"" msgid "object %s is a %s, not a %s" msgstr "objektet %s är en %s, inte en %s" -#: object.c:233 +#: object.c:232 #, c-format msgid "object %s has unknown type id %d" msgstr "objektet %s har okänd typ-id %d" -#: object.c:246 +#: object.c:245 #, c-format msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" -#: object.c:266 object.c:278 +#: object.c:265 object.c:277 #, c-format msgid "hash mismatch %s" msgstr "hashvärde stämmer inte överens %s" -#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226 +#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251 #, c-format msgid "unable to get size of %s" msgstr "kan inte hämta storlek på %s" -#: pack-bitmap.c:1489 builtin/rev-list.c:92 +#: pack-bitmap.c:1547 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "kan inte hämta diskanvändning för %s" -#: pack-revindex.c:220 +#: pack-revindex.c:221 #, c-format msgid "reverse-index file %s is too small" msgstr "reverse-index-filen %s är för liten" -#: pack-revindex.c:225 +#: pack-revindex.c:226 #, c-format msgid "reverse-index file %s is corrupt" msgstr "reverse-index-filen %s är trasig" -#: pack-revindex.c:233 +#: pack-revindex.c:234 #, c-format msgid "reverse-index file %s has unknown signature" msgstr "reverse-index-filen %s har okänd signatur" -#: pack-revindex.c:237 +#: pack-revindex.c:238 #, c-format msgid "reverse-index file %s has unsupported version %<PRIu32>" msgstr "reverse-index-filen %s har versionen %<PRIu32> som inte stöds" -#: pack-revindex.c:242 +#: pack-revindex.c:243 #, c-format msgid "reverse-index file %s has unsupported hash id %<PRIu32>" msgstr "reverse-index-filen %s har hash-ID %<PRIu32> som inte stöds" -#: pack-write.c:236 +#: pack-write.c:250 msgid "cannot both write and verify reverse index" msgstr "kan inte både skriva och bekräfta reverse-index" -#: pack-write.c:257 +#: pack-write.c:271 #, c-format msgid "could not stat: %s" msgstr "kunde inte ta status: %s" -#: pack-write.c:269 +#: pack-write.c:283 #, c-format msgid "failed to make %s readable" msgstr "kunde inte göra %s läsbar" -#: pack-write.c:508 +#: pack-write.c:522 #, c-format msgid "could not write '%s' promisor file" msgstr "kunde inte skriva kontraktsfilen \"%s\"" @@ -5788,12 +5858,12 @@ msgstr "kunde inte skriva kontraktsfilen \"%s\"" msgid "offset before end of packfile (broken .idx?)" msgstr "offset före slutet av packfilen (trasig .idx?)" -#: packfile.c:1934 +#: packfile.c:1937 #, 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:1938 +#: packfile.c:1941 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex för %s (trunkerat index?)" @@ -5859,31 +5929,31 @@ msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)" msgid "did you mean `--%s` (with two dashes)?" msgstr "menade du \"--%s\" (med två bindestreck)?" -#: parse-options.c:666 parse-options.c:971 +#: parse-options.c:668 parse-options.c:988 #, c-format msgid "alias of --%s" msgstr "alias för --%s" -#: parse-options.c:862 +#: parse-options.c:879 #, c-format msgid "unknown option `%s'" msgstr "okänd flagga \"%s\"" -#: parse-options.c:864 +#: parse-options.c:881 #, c-format msgid "unknown switch `%c'" msgstr "okänd flagga \"%c\"" -#: parse-options.c:866 +#: parse-options.c:883 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "okänd icke-ascii-flagga i strängen: \"%s\"" -#: parse-options.c:890 +#: parse-options.c:907 msgid "..." msgstr "..." -#: parse-options.c:909 +#: parse-options.c:926 #, c-format msgid "usage: %s" msgstr "användning: %s" @@ -5891,17 +5961,17 @@ msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:915 +#: parse-options.c:932 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:918 +#: parse-options.c:935 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:957 +#: parse-options.c:974 msgid "-NUM" msgstr "-TAL" @@ -5910,29 +5980,29 @@ msgstr "-TAL" msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för gruppen" -#: pathspec.c:130 +#: pathspec.c:151 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "Specialtecknet \"\\\" tillåts inte som sista tecken i attributvärde" -#: pathspec.c:148 +#: pathspec.c:169 msgid "Only one 'attr:' specification is allowed." msgstr "Endast en \"attr:\"-angivelse tillåten." -#: pathspec.c:151 +#: pathspec.c:172 msgid "attr spec must not be empty" msgstr "attr-angivelse kan inte vara tom" -#: pathspec.c:194 +#: pathspec.c:215 #, c-format msgid "invalid attribute name %s" msgstr "ogiltigt attributnamn %s" -#: pathspec.c:259 +#: pathspec.c:280 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla" -#: pathspec.c:266 +#: pathspec.c:287 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -5940,51 +6010,51 @@ msgstr "" "den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra " "globala sökvägsinställningar" -#: pathspec.c:306 +#: pathspec.c:327 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\"" -#: pathspec.c:327 +#: pathspec.c:348 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Felaktigt sökvägsuttryck \"%.*s\" i \"%s\"" -#: pathspec.c:332 +#: pathspec.c:353 #, 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:370 +#: pathspec.c:391 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Ej implementerat sökvägsuttryckmagi \"%c\" i \"%s\"" -#: pathspec.c:429 +#: pathspec.c:450 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: \"literal\" och \"glob\" är inkompatibla" -#: pathspec.c:445 +#: pathspec.c:466 #, c-format msgid "%s: '%s' is outside repository at '%s'" msgstr "%s: \"%s\" är utanför arkivet på \"%s\"" -#: pathspec.c:521 +#: pathspec.c:542 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "\"%s\" (minnesstöd: \"%c\")" -#: pathspec.c:531 +#: pathspec.c:552 #, 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:598 +#: pathspec.c:619 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" -#: pathspec.c:643 +#: pathspec.c:664 #, c-format msgid "line is badly quoted: %s" msgstr "linjen er felaktigt citerad: %s" @@ -6005,7 +6075,7 @@ msgstr "kan inte skriva tillståndslöst avdelarpaket" msgid "flush packet write failed" msgstr "fel vid skrivning av \"flush\"-paket" -#: pkt-line.c:153 pkt-line.c:239 +#: pkt-line.c:153 pkt-line.c:265 msgid "protocol error: impossibly long line" msgstr "protokollfel: omöjligt lång rad" @@ -6013,33 +6083,34 @@ msgstr "protokollfel: omöjligt lång rad" msgid "packet write with format failed" msgstr "paketskrivning med format misslyckades" -#: pkt-line.c:203 +#: pkt-line.c:204 msgid "packet write failed - data exceeds max packet size" msgstr "paketskrivning misslyckades - data överskrider maximal paketstorlek" -#: pkt-line.c:210 pkt-line.c:217 -msgid "packet write failed" -msgstr "paketskrivning misslyckades" +#: pkt-line.c:222 +#, c-format +msgid "packet write failed: %s" +msgstr "paketskrivning misslyckades: %s" -#: pkt-line.c:302 +#: pkt-line.c:328 pkt-line.c:329 msgid "read error" msgstr "läsfel" -#: pkt-line.c:310 +#: pkt-line.c:339 pkt-line.c:340 msgid "the remote end hung up unexpectedly" msgstr "fjärren lade på oväntat" -#: pkt-line.c:338 +#: pkt-line.c:369 pkt-line.c:371 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "protokollfel: felaktig radlängdstecken: %.4s" -#: pkt-line.c:352 pkt-line.c:357 +#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396 #, c-format msgid "protocol error: bad line length %d" msgstr "protokollfel: felaktig radlängd: %d" -#: pkt-line.c:373 sideband.c:165 +#: pkt-line.c:413 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "fjärrfel: %s" @@ -6053,7 +6124,7 @@ msgstr "Uppdaterar indexet" msgid "unable to create threaded lstat: %s" msgstr "kunde inte skapa trådad lstat: %s" -#: pretty.c:984 +#: pretty.c:988 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" @@ -6075,6 +6146,10 @@ msgstr "" msgid "promisor remote name cannot begin with '/': %s" msgstr "kontraktsfjärr kan inte börja med \"/\": %s" +#: protocol-caps.c:103 +msgid "object-info: expected flush after arguments" +msgstr "object-info: förväntade \"flush\" efter argument" + #: prune-packed.c:35 msgid "Removing duplicate objects" msgstr "Tar bort duplicerade objekt" @@ -6087,7 +6162,7 @@ msgstr "kunde inte starta \"log\"" msgid "could not read `log` output" msgstr "kunde inte läsa utdata från \"log\"" -#: range-diff.c:101 sequencer.c:5318 +#: range-diff.c:101 sequencer.c:5551 #, c-format msgid "could not parse commit '%s'" msgstr "kunde inte tolka incheckningen \"%s\"" @@ -6119,51 +6194,51 @@ msgstr "--left-only och --right-only är ömsesidigt uteslutande" msgid "could not parse log for '%s'" msgstr "kunde inte tolka loggen för \"%s\"" -#: read-cache.c:682 +#: read-cache.c:708 #, 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:698 +#: read-cache.c:724 msgid "cannot create an empty blob in the object database" msgstr "kan inte skapa tom blob i objektdatabasen" -#: read-cache.c:720 +#: read-cache.c:746 #, 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:725 +#: read-cache.c:751 #, c-format msgid "'%s' does not have a commit checked out" msgstr "\"%s\" har inte någon utcheckad incheckning" -#: read-cache.c:777 +#: read-cache.c:803 #, c-format msgid "unable to index file '%s'" msgstr "kan inte indexera filen \"%s\"" -#: read-cache.c:796 +#: read-cache.c:822 #, c-format msgid "unable to add '%s' to index" msgstr "kan inte lägga till \"%s\" till indexet" -#: read-cache.c:807 +#: read-cache.c:833 #, c-format msgid "unable to stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: read-cache.c:1318 +#: read-cache.c:1356 #, 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:1532 +#: read-cache.c:1571 msgid "Refresh index" msgstr "Uppdatera indexet" -#: read-cache.c:1657 +#: read-cache.c:1700 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -6172,7 +6247,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1667 +#: read-cache.c:1710 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6181,139 +6256,143 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1723 +#: read-cache.c:1766 #, c-format msgid "bad signature 0x%08x" msgstr "felaktig signatur 0x%08x" -#: read-cache.c:1726 +#: read-cache.c:1769 #, c-format msgid "bad index version %d" msgstr "felaktig indexversion %d" -#: read-cache.c:1735 +#: read-cache.c:1778 msgid "bad index file sha1 signature" msgstr "felaktig sha1-signatur för indexfil" -#: read-cache.c:1765 +#: read-cache.c:1812 #, 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:1767 +#: read-cache.c:1814 #, c-format msgid "ignoring %.4s extension" msgstr "ignorerar filtillägget %.4s" -#: read-cache.c:1804 +#: read-cache.c:1851 #, c-format msgid "unknown index entry format 0x%08x" msgstr "okänt format 0x%08x på indexpost" -#: read-cache.c:1820 +#: read-cache.c:1867 #, 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:1877 +#: read-cache.c:1924 msgid "unordered stage entries in index" msgstr "osorterade köposter i index" -#: read-cache.c:1880 +#: read-cache.c:1927 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "flera köposter för den sammanslagna filen \"%s\"" -#: read-cache.c:1883 +#: read-cache.c:1930 #, c-format msgid "unordered stage entries for '%s'" msgstr "osorterade köposter för \"%s\"" -#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181 -#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505 -#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183 +#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991 +#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 #: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "indexfilen trasig" -#: read-cache.c:2133 +#: read-cache.c:2180 #, 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:2146 +#: read-cache.c:2193 #, 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:2179 +#: read-cache.c:2226 #, c-format msgid "%s: index file open failed" msgstr "%s: öppning av indexfilen misslyckades" -#: read-cache.c:2183 +#: read-cache.c:2230 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: kan inte ta startus på det öppna indexet" -#: read-cache.c:2187 +#: read-cache.c:2234 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: indexfilen mindre än förväntat" -#: read-cache.c:2191 +#: read-cache.c:2238 #, c-format msgid "%s: unable to map index file" msgstr "%s: kan inte koppla indexfilen" -#: read-cache.c:2233 +#: read-cache.c:2280 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "kunde inte skapa load_index_extensions-tråden: %s" -#: read-cache.c:2260 +#: read-cache.c:2307 #, 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:2292 +#: read-cache.c:2345 #, c-format msgid "could not freshen shared index '%s'" msgstr "kunde inte uppdatera delat index \"%s\"" -#: read-cache.c:2339 +#: read-cache.c:2392 #, 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:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141 +#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239 +#: read-cache.c:3138 +msgid "failed to convert to a sparse-index" +msgstr "misslyckades omvandla till glest index" + +#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" -#: read-cache.c:3151 +#: read-cache.c:3222 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte öppna git-katalog: %s" -#: read-cache.c:3163 +#: read-cache.c:3234 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort länken: %s" -#: read-cache.c:3188 +#: read-cache.c:3263 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "kan inte rätta behörighetsbitar på \"%s\"" -#: read-cache.c:3337 +#: read-cache.c:3412 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: kan inte återgå till kö 0" @@ -6343,7 +6422,10 @@ msgid "" "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" +"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n" +" commit's log message, unless -C is used, in which case\n" +" keep only this commit's message; -c is same as -C but\n" +" opens the editor\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" @@ -6352,7 +6434,7 @@ msgid "" "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" +". 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 "" @@ -6364,6 +6446,13 @@ msgstr "" "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 [-C | -c] <incheckning> = som \"squash\" men behåll bara " +"loggmeddelandet\n" +" från föregående incheckning, såvida inte -C används, då " +"används\n" +" istället bara den här incheckningens meddelande; -c är " +"samma\n" +" som -C, men öppnar redigeringsprogrammet\n" "f, fixup <incheckning> = som \"squash\", men förkasta " "incheckningsmeddelandet\n" "x, exec <kommando> = kör kommando (resten av raden) i skalet\n" @@ -6374,19 +6463,19 @@ msgstr "" "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" +". enrads, om inget incheckningsmeddelande angavs); använd\n" +". -c <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:63 +#: rebase-interactive.c:66 #, 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:72 git-rebase--preserve-merges.sh:218 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -6395,7 +6484,7 @@ msgstr "" "Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en " "incheckning.\n" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 +#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -6403,7 +6492,7 @@ msgstr "" "\n" "Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 +#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -6417,7 +6506,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 +#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -6427,19 +6516,19 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615 -#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816 +#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271 #, c-format msgid "could not write '%s'" msgstr "kunde inte skriva \"%s\"" -#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230 -#: builtin/rebase.c:254 +#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229 +#: builtin/rebase.c:253 #, c-format msgid "could not write '%s'." msgstr "kunde inte skriva \"%s\"." -#: rebase-interactive.c:193 +#: rebase-interactive.c:196 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -6448,7 +6537,7 @@ msgstr "" "Varning: vissa incheckningar kan av misstag ha tappats.\n" "Tappade incheckningar (nyaste först):\n" -#: rebase-interactive.c:200 +#: rebase-interactive.c:203 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -6468,14 +6557,14 @@ msgstr "" "\" (fel).\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402 -#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241 -#: builtin/rebase.c:266 +#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597 +#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240 +#: builtin/rebase.c:265 #, c-format msgid "could not read '%s'." msgstr "kunde inte läsa \"%s\"." -#: ref-filter.c:42 wt-status.c:1975 +#: ref-filter.c:42 wt-status.c:1978 msgid "gone" msgstr "försvunnen" @@ -6631,111 +6720,111 @@ msgstr "" msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: atomen %%(if) använd utan en %%(then)-atom" -#: ref-filter.c:806 +#: ref-filter.c:807 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: atomen %%(then) använd utan en %%(if)-atom" -#: ref-filter.c:808 +#: ref-filter.c:809 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: atomen %%(then) använd mer än en gång" -#: ref-filter.c:810 +#: ref-filter.c:811 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atomen %%(then) använd efter %%(else)" -#: ref-filter.c:838 +#: ref-filter.c:839 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: atomen %%(else) använd utan en %%(if)-atom" -#: ref-filter.c:840 +#: ref-filter.c:841 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format: atomen %%(else) använd utan en %%(then)-atom" -#: ref-filter.c:842 +#: ref-filter.c:843 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format: atomen %%(else) använd mer än en gång" -#: ref-filter.c:857 +#: ref-filter.c:858 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: atomen %%(end) använd utan motsvarande atom" -#: ref-filter.c:914 +#: ref-filter.c:915 #, c-format msgid "malformed format string %s" msgstr "felformad formatsträng %s" -#: ref-filter.c:1555 +#: ref-filter.c:1556 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: ref-filter.c:1558 +#: ref-filter.c:1559 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)" -#: ref-filter.c:1561 +#: ref-filter.c:1562 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" -#: ref-filter.c:1565 +#: ref-filter.c:1566 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD frånkopplat vid %s)" -#: ref-filter.c:1568 +#: ref-filter.c:1569 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD frånkopplat från %s)" -#: ref-filter.c:1571 +#: ref-filter.c:1572 msgid "(no branch)" msgstr "(ingen gren)" -#: ref-filter.c:1603 ref-filter.c:1812 +#: ref-filter.c:1604 ref-filter.c:1813 #, c-format msgid "missing object %s for %s" msgstr "objektet %s saknas för %s" -#: ref-filter.c:1613 +#: ref-filter.c:1614 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer misslyckades på %s för %s" -#: ref-filter.c:1996 +#: ref-filter.c:1997 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:2085 +#: ref-filter.c:2086 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:2090 refs.c:676 +#: ref-filter.c:2091 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" -#: ref-filter.c:2430 +#: ref-filter.c:2431 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:2529 +#: ref-filter.c:2525 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: ref-filter.c:2534 +#: ref-filter.c:2530 #, c-format msgid "option `%s' must point to a commit" msgstr "flaggan \"%s\" måste peka på en incheckning" @@ -7191,8 +7280,8 @@ msgstr "kan inte ta bort lös länk \"%s\"" msgid "Recorded preimage for '%s'" msgstr "Sparade förhandsbild för \"%s\"" -#: rerere.c:865 submodule.c:2088 builtin/log.c:1991 -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 +#: rerere.c:865 submodule.c:2089 builtin/log.c:2000 +#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" @@ -7230,25 +7319,25 @@ msgstr "kan inte uppdatera katalogen rr-cache" msgid "could not determine HEAD revision" msgstr "kunde inte bestämma HEAD-revision" -#: reset.c:70 reset.c:76 sequencer.c:3468 +#: reset.c:70 reset.c:76 sequencer.c:3669 #, c-format msgid "failed to find tree of %s" msgstr "kunde inte hitta trädet för %s." -#: revision.c:2338 +#: revision.c:2343 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<paketfil> stöds inte längre" -#: revision.c:2668 +#: revision.c:2683 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2671 +#: revision.c:2686 #, 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:2877 +#: revision.c:2892 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" @@ -7256,12 +7345,12 @@ msgstr "-L stöder ännu inte andra diff-format än -p och -s" msgid "open /dev/null failed" msgstr "misslyckades öppna /dev/null" -#: run-command.c:1274 +#: run-command.c:1275 #, c-format msgid "cannot create async thread: %s" msgstr "kan inte skapa asynkron tråd: %s" -#: run-command.c:1338 +#: run-command.c:1345 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -7270,33 +7359,41 @@ msgstr "" "Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n" "Du kan inaktivera varningen med \"git config advice.ignoredHook false\"." -#: send-pack.c:146 +#: send-pack.c:150 msgid "unexpected flush packet while reading remote unpack status" msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus" -#: send-pack.c:148 +#: send-pack.c:152 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "kunde inte tolka fjärruppackningsstatus: %s" -#: send-pack.c:150 +#: send-pack.c:154 #, c-format msgid "remote unpack failed: %s" msgstr "fjärruppackning misslyckades: %s" -#: send-pack.c:374 +#: send-pack.c:378 msgid "failed to sign the push certificate" msgstr "misslyckades underteckna push-certifikatet" -#: send-pack.c:467 +#: send-pack.c:433 +msgid "send-pack: unable to fork off fetch subprocess" +msgstr "send-pack: kunde inte starta (fork) underprocessen för fetch" + +#: send-pack.c:455 +msgid "push negotiation failed; proceeding anyway with push" +msgstr "sänd-förhandling misslyckades; fortsätter ändå med sändningen" + +#: send-pack.c:520 msgid "the receiving end does not support this repository's hash algorithm" msgstr "mottagarsidan stöder inte arkivets hashningsalgoritm" -#: send-pack.c:476 +#: send-pack.c:529 msgid "the receiving end does not support --signed push" msgstr "mottagarsidan stöder inte push med --signed" -#: send-pack.c:478 +#: send-pack.c:531 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -7304,47 +7401,47 @@ msgstr "" "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --" "signed" -#: send-pack.c:490 +#: send-pack.c:543 msgid "the receiving end does not support --atomic push" msgstr "mottagarsidan stöder inte push med --atomic" -#: send-pack.c:495 +#: send-pack.c:548 msgid "the receiving end does not support push options" msgstr "mottagarsidan stöder inte push-flaggor" -#: sequencer.c:195 +#: sequencer.c:196 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\"" -#: sequencer.c:323 +#: sequencer.c:324 #, c-format msgid "could not delete '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385 +#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402 #, c-format msgid "could not remove '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:353 +#: sequencer.c:354 msgid "revert" msgstr "revert" -#: sequencer.c:355 +#: sequencer.c:356 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:357 +#: sequencer.c:358 msgid "rebase" msgstr "rebase" -#: sequencer.c:359 +#: sequencer.c:360 #, c-format msgid "unknown action: %d" msgstr "okänd funktion: %d" -#: sequencer.c:418 +#: sequencer.c:419 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -7352,7 +7449,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:421 +#: sequencer.c:422 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -7362,43 +7459,43 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:434 sequencer.c:3070 +#: sequencer.c:435 sequencer.c:3271 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088 -#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631 +#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 +#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" -#: sequencer.c:441 +#: sequencer.c:442 #, c-format msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090 -#: sequencer.c:3353 +#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 +#: sequencer.c:3554 #, c-format msgid "failed to finalize '%s'" msgstr "misslyckades färdigställa \"%s\"" -#: sequencer.c:485 +#: sequencer.c:486 #, c-format msgid "your local changes would be overwritten by %s." msgstr "dina lokala ändringar skulle skrivas över av %s." -#: sequencer.c:489 +#: sequencer.c:490 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:521 +#: sequencer.c:522 #, c-format msgid "%s: fast-forward" msgstr "%s: snabbspola" -#: sequencer.c:560 builtin/tag.c:598 +#: sequencer.c:561 builtin/tag.c:609 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" @@ -7406,65 +7503,65 @@ msgstr "Felaktigt städningsläge %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:670 +#: sequencer.c:671 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:684 +#: sequencer.c:685 msgid "unable to update cache tree" msgstr "kan inte uppdatera cacheträd" -#: sequencer.c:698 +#: sequencer.c:699 msgid "could not resolve HEAD commit" msgstr "kunde inte bestämma HEAD:s incheckning" -#: sequencer.c:778 +#: sequencer.c:779 #, c-format msgid "no key present in '%.*s'" msgstr "ingen nyckel i \"%.*s\"" -#: sequencer.c:789 +#: sequencer.c:790 #, c-format msgid "unable to dequote value of '%s'" msgstr "kan inte ta bort citering av värdet \"%s\"" -#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728 +#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: sequencer.c:836 +#: sequencer.c:837 msgid "'GIT_AUTHOR_NAME' already given" msgstr "\"GIT_AUTHOR_NAME\" har redan angivits" -#: sequencer.c:841 +#: sequencer.c:842 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits" -#: sequencer.c:846 +#: sequencer.c:847 msgid "'GIT_AUTHOR_DATE' already given" msgstr "\"GIT_AUTHOR_DATE\" har redan angivits" -#: sequencer.c:850 +#: sequencer.c:851 #, c-format msgid "unknown variable '%s'" msgstr "okänd variabel \"%s\"" -#: sequencer.c:855 +#: sequencer.c:856 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "\"GIT_AUTHOR_NAME\" saknas" -#: sequencer.c:857 +#: sequencer.c:858 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "\"GIT_AUTHOR_EMAIL\" saknas" -#: sequencer.c:859 +#: sequencer.c:860 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "\"GIT_AUTHOR_DATE\" saknas" -#: sequencer.c:924 +#: sequencer.c:925 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -7493,11 +7590,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1211 +#: sequencer.c:1212 msgid "'prepare-commit-msg' hook failed" msgstr "kroken \"prepare-commit-msg\" misslyckades" -#: sequencer.c:1217 +#: sequencer.c:1218 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7524,7 +7621,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1230 +#: sequencer.c:1231 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7549,340 +7646,344 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1272 +#: sequencer.c:1273 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: sequencer.c:1274 +#: sequencer.c:1275 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: sequencer.c:1320 +#: sequencer.c:1321 msgid "unable to resolve HEAD after creating commit" msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning" -#: sequencer.c:1322 +#: sequencer.c:1323 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: sequencer.c:1326 +#: sequencer.c:1327 msgid " (root-commit)" msgstr " (rotincheckning)" -#: sequencer.c:1347 +#: sequencer.c:1348 msgid "could not parse HEAD" msgstr "kunde inte tolka HEAD" -#: sequencer.c:1349 +#: sequencer.c:1350 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s är inte en incheckning!" -#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: sequencer.c:1409 sequencer.c:2108 +#: sequencer.c:1410 sequencer.c:2295 msgid "unable to parse commit author" msgstr "kunde inte tolka incheckningens författare" -#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702 +#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: sequencer.c:1453 sequencer.c:1573 +#: sequencer.c:1454 sequencer.c:1574 #, c-format msgid "unable to read commit message from '%s'" msgstr "kunde inte läsa incheckningsmeddelande från \"%s\"" -#: sequencer.c:1484 sequencer.c:1516 +#: sequencer.c:1485 sequencer.c:1517 #, c-format msgid "invalid author identity '%s'" msgstr "ogiltig författar-identitet \"%s\"" -#: sequencer.c:1490 +#: sequencer.c:1491 msgid "corrupt author: missing date information" msgstr "trasig författare: saknar datuminformation" -#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905 -#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909 +#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:1605 +#: sequencer.c:1606 #, c-format msgid "could not parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: sequencer.c:1610 +#: sequencer.c:1611 #, c-format msgid "could not parse parent commit %s" msgstr "kunde inte tolka föräldraincheckningen %s" -#: sequencer.c:1693 sequencer.c:1804 +#: sequencer.c:1694 sequencer.c:1975 #, c-format msgid "unknown command: %d" msgstr "okänt kommando: %d" -#: sequencer.c:1751 sequencer.c:1776 +#: sequencer.c:1736 git-rebase--preserve-merges.sh:486 +msgid "This is the 1st commit message:" +msgstr "Det här är 1:a incheckningsmeddelandet:" + +#: sequencer.c:1737 +#, c-format +msgid "This is the commit message #%d:" +msgstr "Det här är incheckningsmeddelande %d:" + +#: sequencer.c:1738 +msgid "The 1st commit message will be skipped:" +msgstr "1:a incheckningsmeddelandet kommer hoppas över:" + +#: sequencer.c:1739 +#, c-format +msgid "The commit message #%d will be skipped:" +msgstr "Incheckningsmeddelande %d kommer hoppas över:" + +#: sequencer.c:1740 #, c-format msgid "This is a combination of %d commits." msgstr "Det här är en kombination av %d incheckningar." -#: sequencer.c:1761 +#: sequencer.c:1887 sequencer.c:1944 +#, c-format +msgid "cannot write '%s'" +msgstr "kan inte skriva \"%s\"" + +#: sequencer.c:1934 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:1763 sequencer.c:3380 +#: sequencer.c:1936 sequencer.c:3581 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:1765 +#: sequencer.c:1938 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:1771 -#, c-format -msgid "cannot write '%s'" -msgstr "kan inte skriva \"%s\"" - -#: sequencer.c:1778 git-rebase--preserve-merges.sh:486 -msgid "This is the 1st commit message:" -msgstr "Det här är 1:a incheckningsmeddelandet:" - -#: sequencer.c:1786 +#: sequencer.c:1962 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:1793 -#, c-format -msgid "This is the commit message #%d:" -msgstr "Det här är incheckningsmeddelande %d:" - -#: sequencer.c:1799 -#, c-format -msgid "The commit message #%d will be skipped:" -msgstr "Incheckningsmeddelande %d kommer hoppas över:" - -#: sequencer.c:1887 +#: sequencer.c:2072 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:1894 +#: sequencer.c:2079 msgid "cannot fixup root commit" msgstr "kan inte göra \"fixup\" på rotincheckning" -#: sequencer.c:1913 +#: sequencer.c:2098 #, 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:1921 sequencer.c:1929 +#: sequencer.c:2106 sequencer.c:2114 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:1935 +#: sequencer.c:2120 #, 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:1954 +#: sequencer.c:2139 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:2019 +#: sequencer.c:2205 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:2079 +#: sequencer.c:2265 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:2080 +#: sequencer.c:2266 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:2100 +#: sequencer.c:2287 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "utelämnar %s %s -- patchinnehållet finns redan uppströms\n" -#: sequencer.c:2158 +#: sequencer.c:2345 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:2165 +#: sequencer.c:2352 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:2242 +#: sequencer.c:2425 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s tar inte argument: \"%s\"" -#: sequencer.c:2251 +#: sequencer.c:2434 #, c-format msgid "missing arguments for %s" msgstr "argument saknas för %s" -#: sequencer.c:2282 +#: sequencer.c:2477 #, c-format msgid "could not parse '%s'" msgstr "kunde inte tolka \"%s\"" -#: sequencer.c:2343 +#: sequencer.c:2538 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:2354 +#: sequencer.c:2549 #, c-format msgid "cannot '%s' without a previous commit" msgstr "kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:2440 +#: sequencer.c:2635 msgid "cancelling a cherry picking in progress" msgstr "avbryter pågående \"cherry-pick\"" -#: sequencer.c:2449 +#: sequencer.c:2644 msgid "cancelling a revert in progress" msgstr "avbryter pågående \"revert\"" -#: sequencer.c:2493 +#: sequencer.c:2690 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:2495 +#: sequencer.c:2692 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: \"%s\"" -#: sequencer.c:2500 +#: sequencer.c:2697 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:2511 +#: sequencer.c:2708 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:2513 +#: sequencer.c:2710 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:2591 +#: sequencer.c:2788 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:2698 +#: sequencer.c:2897 msgid "unusable squash-onto" msgstr "oanvändbar squash-onto" -#: sequencer.c:2718 +#: sequencer.c:2917 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: \"%s\"" -#: sequencer.c:2811 sequencer.c:4644 +#: sequencer.c:3012 sequencer.c:4869 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:2828 +#: sequencer.c:3029 msgid "revert is already in progress" msgstr "en \"revert\" pågår redan" -#: sequencer.c:2830 +#: sequencer.c:3031 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "testa \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2833 +#: sequencer.c:3034 msgid "cherry-pick is already in progress" msgstr "en \"cherry-pick\" pågår redan" -#: sequencer.c:2835 +#: sequencer.c:3036 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2849 +#: sequencer.c:3050 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:2864 +#: sequencer.c:3065 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:2924 sequencer.c:4379 +#: sequencer.c:3125 sequencer.c:4582 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:2926 sequencer.c:2937 +#: sequencer.c:3127 sequencer.c:3138 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:2928 sequencer.c:2972 +#: sequencer.c:3129 sequencer.c:3173 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:2958 builtin/grep.c:757 +#: sequencer.c:3159 builtin/grep.c:759 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:2960 +#: sequencer.c:3161 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:2961 +#: sequencer.c:3162 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:2967 +#: sequencer.c:3168 #, 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:2978 +#: sequencer.c:3179 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:3019 +#: sequencer.c:3220 msgid "no revert in progress" msgstr "ingen \"revers\" pågår" -#: sequencer.c:3028 +#: sequencer.c:3229 msgid "no cherry-pick in progress" msgstr "ingen \"cherry-pick\" pågår" -#: sequencer.c:3038 +#: sequencer.c:3239 msgid "failed to skip the commit" msgstr "kunde inte hoppa över incheckningen" -#: sequencer.c:3045 +#: sequencer.c:3246 msgid "there is nothing to skip" msgstr "ingenting att hoppa över" -#: sequencer.c:3048 +#: sequencer.c:3249 #, c-format msgid "" "have you committed already?\n" @@ -7891,16 +7992,16 @@ msgstr "" "har du redan checkat in?\n" "testa \"git %s --continue\"" -#: sequencer.c:3210 sequencer.c:4271 +#: sequencer.c:3411 sequencer.c:4473 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:3227 +#: sequencer.c:3428 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "kan inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3235 +#: sequencer.c:3436 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7919,27 +8020,27 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:3245 +#: sequencer.c:3446 #, c-format msgid "Could not apply %s... %.*s" msgstr "Kunde inte tillämpa %s... %.*s" -#: sequencer.c:3252 +#: sequencer.c:3453 #, c-format msgid "Could not merge %.*s" msgstr "Kunde inte slå ihop %.*s" -#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640 +#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3282 +#: sequencer.c:3483 #, c-format msgid "Executing: %s\n" msgstr "Kör: %s\n" -#: sequencer.c:3297 +#: sequencer.c:3498 #, c-format msgid "" "execution failed: %s\n" @@ -7954,11 +8055,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3303 +#: sequencer.c:3504 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:3309 +#: sequencer.c:3510 #, c-format msgid "" "execution succeeded: %s\n" @@ -7975,90 +8076,90 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3370 +#: sequencer.c:3571 #, c-format msgid "illegal label name: '%.*s'" msgstr "ogiltigt etikettnamn: \"%.*s\"" -#: sequencer.c:3424 +#: sequencer.c:3625 msgid "writing fake root commit" msgstr "skriver fejkad rotincheckning" -#: sequencer.c:3429 +#: sequencer.c:3630 msgid "writing squash-onto" msgstr "skriver squash-onto" -#: sequencer.c:3513 +#: sequencer.c:3714 #, c-format msgid "could not resolve '%s'" msgstr "kunde inte upplösa \"%s\"" -#: sequencer.c:3546 +#: sequencer.c:3747 msgid "cannot merge without a current revision" msgstr "kan inte slå ihop utan en aktuell incheckning" -#: sequencer.c:3568 +#: sequencer.c:3769 #, c-format msgid "unable to parse '%.*s'" msgstr "kan inte tolka \"%.*s\"" -#: sequencer.c:3577 +#: sequencer.c:3778 #, c-format msgid "nothing to merge: '%.*s'" msgstr "inget att slå samman: \"%.*s\"" -#: sequencer.c:3589 +#: sequencer.c:3790 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:3605 +#: sequencer.c:3806 #, c-format msgid "could not get commit message of '%s'" msgstr "kunde inte läsa incheckningsmeddelande för \"%s\"" -#: sequencer.c:3788 +#: sequencer.c:3989 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "kunde inte ens försöka slå ihop \"%.*s\"" -#: sequencer.c:3804 +#: sequencer.c:4005 msgid "merge: Unable to write new index file" msgstr "sammanslagning: Kunde inte skriva ny indexfil" -#: sequencer.c:3878 +#: sequencer.c:4079 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: sequencer.c:3881 +#: sequencer.c:4082 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Oväntat svar från stash: \"%s\"" -#: sequencer.c:3887 +#: sequencer.c:4088 #, c-format msgid "Could not create directory for '%s'" msgstr "Kunde inte skapa katalog för \"%s\"" -#: sequencer.c:3890 +#: sequencer.c:4091 #, c-format msgid "Created autostash: %s\n" msgstr "Skapade autostash: %s\n" -#: sequencer.c:3894 +#: sequencer.c:4095 msgid "could not reset --hard" msgstr "kunde inte utföra \"reset --hard\"" -#: sequencer.c:3919 +#: sequencer.c:4120 #, c-format msgid "Applied autostash.\n" msgstr "Tillämpade autostash.\n" -#: sequencer.c:3931 +#: sequencer.c:4132 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:3934 +#: sequencer.c:4135 #, c-format msgid "" "%s\n" @@ -8069,29 +8170,29 @@ 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:3939 +#: sequencer.c:4140 msgid "Applying autostash resulted in conflicts." msgstr "Tillämpning av autostash gav konflikter." -#: sequencer.c:3940 +#: sequencer.c:4141 msgid "Autostash exists; creating a new stash entry." msgstr "Autostash finns; skapar ny stash-post." -#: sequencer.c:4033 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4234 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" -#: sequencer.c:4048 +#: sequencer.c:4249 #, c-format msgid "Stopped at HEAD\n" msgstr "Stoppade på HEAD\n" -#: sequencer.c:4050 +#: sequencer.c:4251 #, c-format msgid "Stopped at %s\n" msgstr "Stoppade på %s\n" -#: sequencer.c:4058 +#: sequencer.c:4259 #, c-format msgid "" "Could not execute the todo command\n" @@ -8112,58 +8213,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4104 +#: sequencer.c:4305 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Ombaserar (%d/%d)%s" -#: sequencer.c:4149 +#: sequencer.c:4351 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:4220 +#: sequencer.c:4422 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:4279 +#: sequencer.c:4481 msgid "could not read orig-head" msgstr "kunde inte läsa orig-head" -#: sequencer.c:4284 +#: sequencer.c:4486 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:4298 +#: sequencer.c:4500 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:4358 +#: sequencer.c:4560 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Lyckades ombasera och uppdatera %s.\n" -#: sequencer.c:4391 +#: sequencer.c:4612 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:4400 +#: sequencer.c:4621 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:4402 +#: sequencer.c:4623 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:4404 +#: sequencer.c:4625 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:4407 +#: sequencer.c:4628 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -8173,50 +8274,50 @@ msgstr "" "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" "först och kör sedan \"git rebase --continue\" igen." -#: sequencer.c:4443 sequencer.c:4482 +#: sequencer.c:4664 sequencer.c:4703 #, c-format msgid "could not write file: '%s'" msgstr "kunde inte skriva fil: \"%s\"" -#: sequencer.c:4498 +#: sequencer.c:4719 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:4505 +#: sequencer.c:4726 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:4621 +#: sequencer.c:4846 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:4625 +#: sequencer.c:4850 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:4660 +#: sequencer.c:4885 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" -#: sequencer.c:5137 +#: sequencer.c:5362 msgid "make_script: unhandled options" msgstr "make_script: flaggor som inte stöds" -#: sequencer.c:5140 +#: sequencer.c:5365 msgid "make_script: error preparing revisions" msgstr "make_script: fel när revisioner skulle förberedas" -#: sequencer.c:5382 sequencer.c:5399 +#: sequencer.c:5615 sequencer.c:5632 msgid "nothing to do" msgstr "inget att göra" -#: sequencer.c:5418 +#: sequencer.c:5651 msgid "could not skip unnecessary pick commands" msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon" -#: sequencer.c:5512 +#: sequencer.c:5751 msgid "the script was already rearranged." msgstr "skriptet har redan omordnats." @@ -8362,7 +8463,7 @@ msgstr "" "monteringspunkten %s)\n" "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." -#: setup.c:1362 +#: setup.c:1370 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -8371,56 +8472,69 @@ 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:1409 +#: setup.c:1417 msgid "open /dev/null or dup failed" msgstr "misslyckades öppna /dev/null eller \"dup\"" -#: setup.c:1424 +#: setup.c:1432 msgid "fork failed" msgstr "\"fork\" misslyckades" -#: setup.c:1429 +#: setup.c:1437 t/helper/test-simple-ipc.c:285 msgid "setsid failed" msgstr "\"setsid\" misslyckades" +#: sparse-index.c:151 +msgid "attempting to use sparse-index without cone mode" +msgstr "försöker använda glest index utan \"cone\"-läge" + +#: sparse-index.c:156 +msgid "unable to update cache-tree, staying full" +msgstr "kan inte uppdatera cacheträd, behåller fullt läge" + +#: sparse-index.c:239 +#, c-format +msgid "index entry is a directory, but not sparse (%08x)" +msgstr "indexposten är en katalog, men inte gles (%08x)" + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:848 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB" msgstr "%u,%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:850 +#: strbuf.c:852 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u,%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:858 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB" msgstr "%u,%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:860 +#: strbuf.c:862 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u,%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:867 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB" msgstr "%u,%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:869 +#: strbuf.c:871 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u,%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:875 +#: strbuf.c:877 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -8428,20 +8542,20 @@ msgstr[0] "%u byte" msgstr[1] "%u bytes" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:877 +#: strbuf.c:879 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u byte/s" msgstr[1] "%u bytes/s" -#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737 #: builtin/rebase.c:866 #, c-format msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" -#: strbuf.c:1175 +#: strbuf.c:1177 #, c-format msgid "could not edit '%s'" msgstr "kunde inte redigera \"%s\"" @@ -8490,22 +8604,22 @@ msgstr "Kunde inte ta bort .gitmodules-posten för %s" msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:327 +#: submodule.c:328 #, c-format msgid "in unpopulated submodule '%s'" msgstr "i ej utcheckad undermodul \"%s\"" -#: submodule.c:358 +#: submodule.c:359 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" -#: submodule.c:435 +#: submodule.c:436 #, c-format msgid "bad --ignore-submodules argument: %s" msgstr "felaktigt argument till --ignore-submodules: %s" -#: submodule.c:817 +#: submodule.c:818 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " @@ -8514,12 +8628,12 @@ msgstr "" "Undermodulen i incheckning %s på sökvägen: \"%s\" krockar med en undermodul " "med samma namn. Hoppar över den." -#: submodule.c:920 +#: submodule.c:921 #, 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:1005 +#: submodule.c:1006 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " @@ -8528,36 +8642,36 @@ msgstr "" "kunde inte köra \"git rev-list <incheckningar> --not --remotes -n 1\" i " "undermodulen \"%s\"" -#: submodule.c:1128 +#: submodule.c:1129 #, c-format msgid "process for submodule '%s' failed" msgstr "process för undermodulen \"%s\" misslyckades" -#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469 +#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens." -#: submodule.c:1168 +#: submodule.c:1169 #, c-format msgid "Pushing submodule '%s'\n" msgstr "Sänder undermodulen \"%s\"\n" -#: submodule.c:1171 +#: submodule.c:1172 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "Kunde inte sända undermodulen \"%s\"\n" -#: submodule.c:1463 +#: submodule.c:1464 #, c-format msgid "Fetching submodule %s%s\n" msgstr "Hämtar undermodulen %s%s\n" -#: submodule.c:1497 +#: submodule.c:1498 #, c-format msgid "Could not access submodule '%s'\n" msgstr "Kunde inte komma åt undermodulen \"%s\"\n" -#: submodule.c:1652 +#: submodule.c:1653 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8566,61 +8680,61 @@ msgstr "" "Fel vid hämtning av undermodul:\n" "%s" -#: submodule.c:1677 +#: submodule.c:1678 #, c-format msgid "'%s' not recognized as a git repository" msgstr "\"%s\" känns inte igen som ett git-arkiv" -#: submodule.c:1694 +#: submodule.c:1695 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "Kunde inte köra \"git status --porcelain=2\" i undermodulen \"%s\"" -#: submodule.c:1735 +#: submodule.c:1736 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\"" -#: submodule.c:1810 +#: submodule.c:1811 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "kunde inte starta \"git status\" i undermodulen \"%s\"" -#: submodule.c:1823 +#: submodule.c:1824 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "kunde inte köra \"git status\" i undermodulen \"%s\"" -#: submodule.c:1838 +#: submodule.c:1839 #, 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:1865 submodule.c:2175 +#: submodule.c:1866 submodule.c:2176 #, c-format msgid "could not recurse into submodule '%s'" msgstr "kunde inte rekursera in i undermodulen \"%s\"" -#: submodule.c:1886 +#: submodule.c:1887 msgid "could not reset submodule index" msgstr "kunde inte återställa indexet i undermodul" -#: submodule.c:1928 +#: submodule.c:1929 #, c-format msgid "submodule '%s' has dirty index" msgstr "undermodulen \"%s\" har ett smutsigt index" -#: submodule.c:1980 +#: submodule.c:1981 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Undermoduler \"%s\" kunde inte uppdateras." -#: submodule.c:2048 +#: submodule.c:2049 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\"" -#: submodule.c:2069 +#: submodule.c:2070 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8628,17 +8742,17 @@ msgstr "" "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " "stöds ej" -#: submodule.c:2081 submodule.c:2140 +#: submodule.c:2082 submodule.c:2141 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" -#: submodule.c:2085 +#: submodule.c:2086 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog" -#: submodule.c:2092 +#: submodule.c:2093 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8649,65 +8763,71 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:2220 +#: submodule.c:2221 msgid "could not start ls-files in .." msgstr "kunde inte starta ls-files i .." -#: submodule.c:2260 +#: submodule.c:2261 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en oväntad returkod %d" -#: trailer.c:236 +#: symlinks.c:244 +#, c-format +msgid "failed to lstat '%s'" +msgstr "misslyckades ta status (lstat) på \"%s\"" + +#: trailer.c:244 #, c-format msgid "running trailer command '%s' failed" msgstr "misslyckades utföra släpradskommandot \"%s\"" -#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 -#: trailer.c:555 +#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566 +#: trailer.c:570 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "okänt värde \"%s\" för nyckeln \"%s\"" -#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324 +#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299 +#: builtin/remote.c:324 #, c-format msgid "more than one %s" msgstr "mer än en %s" -#: trailer.c:728 +#: trailer.c:743 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "tom släpradssymbol i släpraden \"%.*s\"" -#: trailer.c:748 +#: trailer.c:763 #, c-format msgid "could not read input file '%s'" msgstr "kunde inte läsa indatafilen \"%s\"" -#: trailer.c:751 builtin/mktag.c:91 +#: trailer.c:766 builtin/mktag.c:88 msgid "could not read from stdin" msgstr "kunde inte läsa från standard in" -#: trailer.c:1009 wrapper.c:676 +#: trailer.c:1024 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "kunde inte ta status på %s" -#: trailer.c:1011 +#: trailer.c:1026 #, c-format msgid "file %s is not a regular file" msgstr "filen %s är inte en normal fil" -#: trailer.c:1013 +#: trailer.c:1028 #, c-format msgid "file %s is not writable by user" msgstr "filen %s är inte skrivbar av användaren" -#: trailer.c:1025 +#: trailer.c:1040 msgid "could not open temporary file" msgstr "kunde inte öppna temporär fil" -#: trailer.c:1065 +#: trailer.c:1080 #, c-format msgid "could not rename temporary file to %s" msgstr "kunde inte byta namn på temporär fil till %s" @@ -8758,7 +8878,7 @@ msgstr "kunde inte köra fast-import" msgid "error while running fast-import" msgstr "fel när fast-import kördes" -#: transport-helper.c:549 transport-helper.c:1237 +#: transport-helper.c:549 transport-helper.c:1247 #, c-format msgid "could not read ref %s" msgstr "kunde inte läsa referensen %s" @@ -8776,7 +8896,7 @@ msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst" msgid "invalid remote service path" msgstr "felaktig sökväg till fjärrtjänst" -#: transport-helper.c:661 transport.c:1447 +#: transport-helper.c:661 transport.c:1471 msgid "operation not supported by protocol" msgstr "funktionen stöds inte av protokollet" @@ -8785,68 +8905,72 @@ msgstr "funktionen stöds inte av protokollet" msgid "can't connect to subservice %s" msgstr "kan inte ansluta till undertjänsten %s" -#: transport-helper.c:745 +#: transport-helper.c:693 transport.c:397 +msgid "--negotiate-only requires protocol v2" +msgstr "--negotiate-only kräver protokoll v2" + +#: transport-helper.c:755 msgid "'option' without a matching 'ok/error' directive" msgstr "\"option\" utan mostsvarande \"ok/error\"-direktiv" -#: transport-helper.c:788 +#: transport-helper.c:798 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\"" -#: transport-helper.c:845 +#: transport-helper.c:855 #, c-format msgid "helper reported unexpected status of %s" msgstr "hjälparen returnerade oväntad status %s" -#: transport-helper.c:928 +#: transport-helper.c:938 #, c-format msgid "helper %s does not support dry-run" msgstr "hjälparen %s stöder inte dry-run" -#: transport-helper.c:931 +#: transport-helper.c:941 #, c-format msgid "helper %s does not support --signed" msgstr "hjälparen %s stöder inte --signed" -#: transport-helper.c:934 +#: transport-helper.c:944 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "hjälparen %s stöder inte --signed=if-asked" -#: transport-helper.c:939 +#: transport-helper.c:949 #, c-format msgid "helper %s does not support --atomic" msgstr "hjälparen %s stöder inte --atomic" -#: transport-helper.c:943 +#: transport-helper.c:953 #, c-format msgid "helper %s does not support --%s" msgstr "hjälparen %s stöder inte --%s" -#: transport-helper.c:950 +#: transport-helper.c:960 #, c-format msgid "helper %s does not support 'push-option'" msgstr "hjälparen %s stöder inte \"push-option\"" -#: transport-helper.c:1050 +#: transport-helper.c:1060 msgid "remote-helper doesn't support push; refspec needed" msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs" -#: transport-helper.c:1055 +#: transport-helper.c:1065 #, c-format msgid "helper %s does not support 'force'" msgstr "hjälparen %s stöder inte \"force\"" -#: transport-helper.c:1102 +#: transport-helper.c:1112 msgid "couldn't run fast-export" msgstr "kunde inte köra fast-export" -#: transport-helper.c:1107 +#: transport-helper.c:1117 msgid "error while running fast-export" msgstr "fel vid körning av fast-export" -#: transport-helper.c:1132 +#: transport-helper.c:1142 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8855,52 +8979,52 @@ msgstr "" "Inga gemensamma referenser och inga angavs; gör inget.\n" "Du kanske borde ange en gren.\n" -#: transport-helper.c:1214 +#: transport-helper.c:1224 #, c-format msgid "unsupported object format '%s'" msgstr "objektformatet \"%s\" stöds ej" -#: transport-helper.c:1223 +#: transport-helper.c:1233 #, c-format msgid "malformed response in ref list: %s" msgstr "felformat svar i referenslistan: %s" -#: transport-helper.c:1375 +#: transport-helper.c:1385 #, c-format msgid "read(%s) failed" msgstr "läs(%s) misslyckades" -#: transport-helper.c:1402 +#: transport-helper.c:1412 #, c-format msgid "write(%s) failed" msgstr "skriv(%s) misslyckades" -#: transport-helper.c:1451 +#: transport-helper.c:1461 #, c-format msgid "%s thread failed" msgstr "%s-tråden misslyckades" -#: transport-helper.c:1455 +#: transport-helper.c:1465 #, c-format msgid "%s thread failed to join: %s" msgstr "%s-tråden misslyckades ansluta: %s" -#: transport-helper.c:1474 transport-helper.c:1478 +#: transport-helper.c:1484 transport-helper.c:1488 #, c-format msgid "can't start thread for copying data: %s" msgstr "kan inte starta tråd för kopiering av data: %s" -#: transport-helper.c:1515 +#: transport-helper.c:1525 #, c-format msgid "%s process failed to wait" msgstr "processen %s misslyckades vänta" -#: transport-helper.c:1519 +#: transport-helper.c:1529 #, c-format msgid "%s process failed" msgstr "processen %s misslyckades" -#: transport-helper.c:1537 transport-helper.c:1546 +#: transport-helper.c:1547 transport-helper.c:1556 msgid "can't start thread for copying data" msgstr "kan inte skapa tråd för kopiering av data" @@ -8919,37 +9043,41 @@ msgstr "kunde inte läsa paketet (bundlen) \"%s\"" msgid "transport: invalid depth option '%s'" msgstr "transport: ogiltig flagga för depth: \"%s\"" -#: transport.c:269 +#: transport.c:272 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:270 +#: transport.c:273 msgid "server options require protocol version 2 or later" msgstr "serverflaggor kräver protokollversion 2 eller senare" -#: transport.c:727 +#: transport.c:400 +msgid "server does not support wait-for-done" +msgstr "servern stöder inte wait-for-done" + +#: transport.c:751 msgid "could not parse transport.color.* config" msgstr "kunde inte tolka inställningen för transport.color.*" -#: transport.c:802 +#: transport.c:826 msgid "support for protocol v2 not implemented yet" msgstr "stöd för protokoll v2 ännu ej implementerat" -#: transport.c:936 +#: transport.c:960 #, c-format msgid "unknown value for config '%s': %s" msgstr "okänt värde för inställningen \"%s\": %s" -#: transport.c:1002 +#: transport.c:1026 #, c-format msgid "transport '%s' not allowed" msgstr "transporten \"%s\" tillåts inte" -#: transport.c:1055 +#: transport.c:1079 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync stöds inte längre" -#: transport.c:1157 +#: transport.c:1181 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -8958,7 +9086,7 @@ msgstr "" "Följande undermodulsökvägar innehåller ändringar som\n" "inte kan hittas av fjärrarna:\n" -#: transport.c:1161 +#: transport.c:1185 #, c-format msgid "" "\n" @@ -8985,11 +9113,11 @@ msgstr "" "för att sända dem till fjärren.\n" "\n" -#: transport.c:1169 +#: transport.c:1193 msgid "Aborting." msgstr "Avbryter." -#: transport.c:1316 +#: transport.c:1340 msgid "failed to push all needed submodules" msgstr "kunde inte sända alla nödvändiga undermoduler" @@ -9009,7 +9137,7 @@ msgstr "tomt filnamn i trädpost" msgid "too-short tree file" msgstr "trädfil för kort" -#: unpack-trees.c:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -9018,7 +9146,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:115 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -9027,7 +9155,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%s" -#: unpack-trees.c:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -9037,7 +9165,7 @@ msgstr "" "sammanslagning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:120 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -9047,7 +9175,7 @@ msgstr "" "sammanslagning:\n" "%%s" -#: unpack-trees.c:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -9056,7 +9184,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"." -#: unpack-trees.c:125 +#: unpack-trees.c:127 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -9065,7 +9193,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:130 +#: unpack-trees.c:132 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -9075,7 +9203,7 @@ msgstr "" "dem:\n" "%s" -#: unpack-trees.c:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -9084,7 +9212,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:136 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -9093,7 +9221,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%s" -#: unpack-trees.c:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -9103,7 +9231,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du slår samman." -#: unpack-trees.c:141 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -9113,7 +9241,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -9122,7 +9250,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%sFlytta eller ta bort dem innan du \"%s\"." -#: unpack-trees.c:146 +#: unpack-trees.c:148 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -9131,7 +9259,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%s" -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -9142,7 +9270,7 @@ msgstr "" "utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:154 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -9153,7 +9281,7 @@ msgstr "" "utcheckningen:\n" "%%s" -#: unpack-trees.c:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -9163,7 +9291,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:159 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -9173,7 +9301,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -9182,7 +9310,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%sFlytta eller ta bort dem innan du \"%s\"." -#: unpack-trees.c:164 +#: unpack-trees.c:166 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -9191,12 +9319,12 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:172 +#: unpack-trees.c:174 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda." -#: unpack-trees.c:175 +#: unpack-trees.c:177 #, c-format msgid "" "Cannot update submodule:\n" @@ -9205,7 +9333,7 @@ msgstr "" "Kan inte uppdatera undermodul:\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:180 #, c-format msgid "" "The following paths are not up to date and were left despite sparse " @@ -9215,7 +9343,7 @@ msgstr "" "Följande sökvägar är inte àjour och lämnades till trots för gles-mönster:\n" "%s" -#: unpack-trees.c:180 +#: unpack-trees.c:182 #, c-format msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" @@ -9225,7 +9353,7 @@ msgstr "" "mönster:\n" "%s" -#: unpack-trees.c:182 +#: unpack-trees.c:184 #, c-format msgid "" "The following paths were already present and thus not updated despite sparse " @@ -9236,12 +9364,12 @@ msgstr "" "gles-mönster:\n" "%s" -#: unpack-trees.c:262 +#: unpack-trees.c:264 #, c-format msgid "Aborting\n" msgstr "Avbryter\n" -#: unpack-trees.c:289 +#: unpack-trees.c:291 #, c-format msgid "" "After fixing the above paths, you may want to run `git sparse-checkout " @@ -9250,11 +9378,11 @@ msgstr "" "Du bör köra \"git sparse-checkout reapply\" efter att ha fixat sökvägarna " "ovan.\n" -#: unpack-trees.c:350 +#: unpack-trees.c:352 msgid "Updating files" msgstr "Uppdaterar filer" -#: unpack-trees.c:382 +#: unpack-trees.c:384 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -9264,11 +9392,16 @@ msgstr "" "sökvägar på ett okänsligt filsystem) och endast en från samma\n" "kollisionsgrupp finns i arbetskatalogen:\n" -#: unpack-trees.c:1498 +#: unpack-trees.c:1519 msgid "Updating index flags" msgstr "Uppdaterar indexflaggor" -#: upload-pack.c:1543 +#: unpack-trees.c:2608 +#, c-format +msgid "worktree and untracked commit have duplicate entries: %s" +msgstr "arbetskatalog och ospårad incheckning har dublettposter: %s" + +#: upload-pack.c:1548 msgid "expected flush after fetch arguments" msgstr "förväntade \"flush\" efter \"fetch\"-argument" @@ -9305,7 +9438,7 @@ msgstr "felaktigt \"..\"-sökvägssegment" msgid "Fetching objects" msgstr "Hämtar objekt" -#: worktree.c:238 builtin/am.c:2103 +#: worktree.c:238 builtin/am.c:2151 #, c-format msgid "failed to read '%s'" msgstr "misslyckades läsa \"%s\"" @@ -9446,11 +9579,11 @@ msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning) msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:211 wt-status.c:1072 +#: wt-status.c:211 wt-status.c:1075 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:234 wt-status.c:1081 +#: wt-status.c:234 wt-status.c:1084 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" @@ -9553,22 +9686,22 @@ msgstr "ändrat innehåll, " msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:905 +#: wt-status.c:908 #, 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:936 +#: wt-status.c:939 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:938 +#: wt-status.c:941 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:1020 +#: wt-status.c:1023 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9576,7 +9709,7 @@ msgstr "" "Raden ovan får inte ändras eller tas bort.\n" "Allt under den kommer tas bort." -#: wt-status.c:1112 +#: wt-status.c:1115 #, c-format msgid "" "\n" @@ -9587,107 +9720,107 @@ msgstr "" "Det tog %.2f sekunder att räkna före/bakom-värden.\n" "Du kan använda \"--no-ahead-behind\" för undvika detta.\n" -#: wt-status.c:1142 +#: wt-status.c:1145 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:1145 +#: wt-status.c:1148 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:1147 +#: wt-status.c:1150 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)" -#: wt-status.c:1151 +#: wt-status.c:1154 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:1154 +#: wt-status.c:1157 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:1163 +#: wt-status.c:1166 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:1166 +#: wt-status.c:1169 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:1170 +#: wt-status.c:1173 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:1172 +#: wt-status.c:1175 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:1174 +#: wt-status.c:1177 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:1307 +#: wt-status.c:1310 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo saknas." -#: wt-status.c:1309 +#: wt-status.c:1312 msgid "No commands done." msgstr "Inga kommandon utförda." -#: wt-status.c:1312 +#: wt-status.c:1315 #, 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:1323 +#: wt-status.c:1326 #, c-format msgid " (see more in file %s)" msgstr " (se fler i filen %s)" -#: wt-status.c:1328 +#: wt-status.c:1331 msgid "No commands remaining." msgstr "Inga kommandon återstår." -#: wt-status.c:1331 +#: wt-status.c:1334 #, 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:1339 +#: wt-status.c:1342 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:1351 +#: wt-status.c:1354 #, 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:1356 +#: wt-status.c:1359 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1369 +#: wt-status.c:1372 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1371 +#: wt-status.c:1374 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1373 +#: wt-status.c:1376 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:1380 +#: wt-status.c:1383 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1384 +#: wt-status.c:1387 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -9695,155 +9828,155 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1389 +#: wt-status.c:1392 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:1392 +#: wt-status.c:1395 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:1396 +#: wt-status.c:1399 #, 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:1401 +#: wt-status.c:1404 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:1404 +#: wt-status.c:1407 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:1406 +#: wt-status.c:1409 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:1417 +#: wt-status.c:1420 msgid "Cherry-pick currently in progress." msgstr "Cherry-pick pågår." -#: wt-status.c:1420 +#: wt-status.c:1423 #, 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:1427 +#: wt-status.c:1430 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1430 +#: wt-status.c:1433 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (kör \"git cherry-pick --continue\" för att fortsätta)" -#: wt-status.c:1433 +#: wt-status.c:1436 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1435 +#: wt-status.c:1438 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " (använd \"git cherry-pick --skip\" för att hoppa över patchen)" -#: wt-status.c:1437 +#: wt-status.c:1440 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-" "operationen)" -#: wt-status.c:1447 +#: wt-status.c:1450 msgid "Revert currently in progress." msgstr "Ångring pågår." -#: wt-status.c:1450 +#: wt-status.c:1453 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1456 +#: wt-status.c:1459 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1459 +#: wt-status.c:1462 msgid " (run \"git revert --continue\" to continue)" msgstr " (kör \"git revert --continue\" för att fortsätta)" -#: wt-status.c:1462 +#: wt-status.c:1465 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1464 +#: wt-status.c:1467 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (använd \"git revert --skip\" för att hoppa över patchen)" -#: wt-status.c:1466 +#: wt-status.c:1469 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1476 +#: wt-status.c:1479 #, 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:1480 +#: wt-status.c:1483 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1483 +#: wt-status.c:1486 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:1494 +#: wt-status.c:1497 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "Du är i en gles utcheckning med %d%% spårade filer på plats." -#: wt-status.c:1733 +#: wt-status.c:1736 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1740 +#: wt-status.c:1743 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå " -#: wt-status.c:1742 +#: wt-status.c:1745 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå " -#: wt-status.c:1747 +#: wt-status.c:1750 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1749 +#: wt-status.c:1752 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1752 +#: wt-status.c:1755 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1769 +#: wt-status.c:1772 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1770 +#: wt-status.c:1773 msgid "No commits yet" msgstr "Inga incheckningar ännu" -#: wt-status.c:1784 +#: wt-status.c:1787 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1786 +#: wt-status.c:1789 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1790 +#: wt-status.c:1793 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9855,32 +9988,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1796 +#: wt-status.c:1799 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1798 +#: wt-status.c:1801 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1804 +#: wt-status.c:1807 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1809 +#: wt-status.c:1812 #, 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:1813 +#: wt-status.c:1816 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1817 +#: wt-status.c:1820 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9889,67 +10022,85 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1821 +#: wt-status.c:1824 #, 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:1825 +#: wt-status.c:1828 #, 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:1829 wt-status.c:1835 +#: wt-status.c:1832 wt-status.c:1838 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1832 +#: wt-status.c:1835 #, 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:1837 +#: wt-status.c:1840 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1942 +#: wt-status.c:1945 msgid "No commits yet on " msgstr "Inga incheckningar ännu på " -#: wt-status.c:1946 +#: wt-status.c:1949 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1977 +#: wt-status.c:1980 msgid "different" msgstr "olika" -#: wt-status.c:1979 wt-status.c:1987 +#: wt-status.c:1982 wt-status.c:1990 msgid "behind " msgstr "efter " -#: wt-status.c:1982 wt-status.c:1985 +#: wt-status.c:1985 wt-status.c:1988 msgid "ahead " msgstr "före " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2507 +#: wt-status.c:2511 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "kan inte %s: Du har oköade ändringar." -#: wt-status.c:2513 +#: wt-status.c:2517 msgid "additionally, your index contains uncommitted changes." msgstr "dessutom innehåller dit index ändringar som inte har checkats in." -#: wt-status.c:2515 +#: wt-status.c:2519 #, 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:457 +#: compat/simple-ipc/ipc-unix-socket.c:178 +msgid "could not send IPC command" +msgstr "kunde inte sända IPC-kommando" + +#: compat/simple-ipc/ipc-unix-socket.c:185 +msgid "could not read IPC response" +msgstr "kunde inte läsa IPC-svar" + +#: compat/simple-ipc/ipc-unix-socket.c:862 +#, c-format +msgid "could not start accept_thread '%s'" +msgstr "kunde inte ta status \"accept_thread\" \"%s\"" + +#: compat/simple-ipc/ipc-unix-socket.c:874 +#, c-format +msgid "could not start worker[0] for '%s'" +msgstr "kunde inte starta \"worker[0]\" för \"%s\"" + +#: compat/precompose_utf8.c:58 builtin/clone.c:461 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" @@ -9958,131 +10109,131 @@ msgstr "misslyckades ta bort länken \"%s\"" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<flaggor>] [--] <sökväg>..." -#: builtin/add.c:58 +#: builtin/add.c:61 #, c-format msgid "cannot chmod %cx '%s'" msgstr "kan inte utföra chmod %cx \"%s\"" -#: builtin/add.c:96 +#: builtin/add.c:99 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:101 builtin/commit.c:285 +#: builtin/add.c:104 builtin/commit.c:297 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:111 +#: builtin/add.c:114 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:186 +#: builtin/add.c:198 msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:280 builtin/rev-parse.c:991 +#: builtin/add.c:307 builtin/rev-parse.c:991 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:291 +#: builtin/add.c:318 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning." -#: builtin/add.c:295 +#: builtin/add.c:322 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:298 +#: builtin/add.c:325 msgid "editing patch failed" msgstr "redigering av patch misslyckades" -#: builtin/add.c:301 +#: builtin/add.c:328 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:303 +#: builtin/add.c:330 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:308 +#: builtin/add.c:335 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:316 +#: builtin/add.c:343 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:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124 +#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124 #: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 -#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 +#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:339 +#: builtin/add.c:366 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308 +#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308 msgid "select hunks interactively" msgstr "välj stycken interaktivt" -#: builtin/add.c:341 +#: builtin/add.c:368 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:342 +#: builtin/add.c:369 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:343 +#: builtin/add.c:370 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:344 +#: builtin/add.c:371 msgid "renormalize EOL of tracked files (implies -u)" msgstr "åternormalisera radslut i spårade filer (implicerar -u)" -#: builtin/add.c:345 +#: builtin/add.c:372 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:346 +#: builtin/add.c:373 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:349 +#: builtin/add.c:376 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:351 +#: builtin/add.c:378 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:352 +#: builtin/add.c:379 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:353 +#: builtin/add.c:380 msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: builtin/add.c:355 builtin/update-index.c:1004 +#: builtin/add.c:382 builtin/update-index.c:1006 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" -#: builtin/add.c:357 +#: builtin/add.c:384 msgid "warn when adding an embedded repository" msgstr "varna när ett inbyggt arkiv läggs till" -#: builtin/add.c:359 +#: builtin/add.c:386 msgid "backend for `git stash -p`" msgstr "bakända för \"git stash -p\"" -#: builtin/add.c:377 +#: builtin/add.c:404 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -10113,12 +10264,12 @@ msgstr "" "\n" "Se \"git help submodule\" för ytterligare information." -#: builtin/add.c:405 +#: builtin/add.c:432 #, c-format msgid "adding embedded git repository: %s" msgstr "lägger till inbäddat git-arkiv: %s" -#: builtin/add.c:424 +#: builtin/add.c:451 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -10128,47 +10279,51 @@ msgstr "" "Slå av detta meddelande med\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:433 +#: builtin/add.c:460 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:461 builtin/commit.c:345 +#: builtin/add.c:488 +msgid "--dry-run is incompatible with --interactive/--patch" +msgstr "--dry-run är inkompatibelt med --interactive/--patch" + +#: builtin/add.c:490 builtin/commit.c:357 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch" -#: builtin/add.c:478 +#: builtin/add.c:507 msgid "--pathspec-from-file is incompatible with --edit" msgstr "--pathspec-from-file är inkompatibelt med --edit" -#: builtin/add.c:490 +#: builtin/add.c:519 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:493 +#: builtin/add.c:522 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:497 +#: builtin/add.c:526 #, 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:515 builtin/checkout.c:1714 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569 +#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 +#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar" -#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575 +#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 +#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul kräver --pathspec-from-file" -#: builtin/add.c:526 +#: builtin/add.c:555 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:528 +#: builtin/add.c:557 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -10178,109 +10333,109 @@ msgstr "" "Slå av detta meddelande genom att köra\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:352 +#: builtin/am.c:364 msgid "could not parse author script" msgstr "kunde inte tolka författarskript" -#: builtin/am.c:436 +#: builtin/am.c:454 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "\"%s\" togs bort av kroken applypatch-msg" -#: builtin/am.c:478 +#: builtin/am.c:496 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/am.c:516 +#: builtin/am.c:534 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/am.c:542 +#: builtin/am.c:560 msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:730 +#: builtin/am.c:748 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:795 +#: builtin/am.c:813 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:843 +#: builtin/am.c:861 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:848 builtin/am.c:860 +#: builtin/am.c:866 builtin/am.c:878 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:855 +#: builtin/am.c:873 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:948 +#: builtin/am.c:966 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:953 builtin/clone.c:410 +#: builtin/am.c:971 builtin/clone.c:414 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:958 +#: builtin/am.c:976 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1089 +#: builtin/am.c:1125 #, 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:1090 +#: builtin/am.c:1126 #, 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:1091 +#: builtin/am.c:1127 #, 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:1174 +#: builtin/am.c:1222 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:1202 +#: builtin/am.c:1250 msgid "Patch is empty." msgstr "Patchen är tom." -#: builtin/am.c:1267 +#: builtin/am.c:1315 #, c-format msgid "missing author line in commit %s" msgstr "saknad \"author\"-rad i incheckningen %s" -#: builtin/am.c:1270 +#: builtin/am.c:1318 #, c-format msgid "invalid ident line: %.*s" msgstr "ogiltig ident-rad: %.*s" -#: builtin/am.c:1489 +#: builtin/am.c:1537 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:1491 +#: builtin/am.c:1539 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1510 +#: builtin/am.c:1558 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10288,25 +10443,25 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1516 +#: builtin/am.c:1564 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1542 +#: builtin/am.c:1590 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1574 +#: builtin/am.c:1622 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1626 builtin/am.c:1630 +#: builtin/am.c:1674 builtin/am.c:1678 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1648 +#: builtin/am.c:1696 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -10314,41 +10469,41 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1658 +#: builtin/am.c:1706 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: " -#: builtin/am.c:1704 builtin/commit.c:395 +#: builtin/am.c:1752 builtin/commit.c:408 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/am.c:1708 +#: builtin/am.c:1756 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1748 builtin/am.c:1816 +#: builtin/am.c:1796 builtin/am.c:1864 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1765 +#: builtin/am.c:1813 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1771 +#: builtin/am.c:1819 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1775 +#: builtin/am.c:1823 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" "Använd \"git am --show-current-patch=diff\" för att se patchen som " "misslyckades" -#: builtin/am.c:1819 +#: builtin/am.c:1867 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10358,7 +10513,7 @@ msgstr "" "Om det inte är något kvar att köa kan det hända att något annat redan\n" "introducerat samma ändringar; kanske du bör hoppa över patchen." -#: builtin/am.c:1826 +#: builtin/am.c:1874 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10370,17 +10525,17 @@ msgstr "" "lösta.\n" "Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den." -#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347 +#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"." -#: builtin/am.c:1985 +#: builtin/am.c:2033 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2029 +#: builtin/am.c:2077 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10388,155 +10543,159 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2136 +#: builtin/am.c:2184 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt värde för --patch-format: %s" -#: builtin/am.c:2178 +#: builtin/am.c:2226 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "Felaktigt värde för --show-current-patch: %s" -#: builtin/am.c:2182 +#: builtin/am.c:2230 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "--show-current-patch=%s är inkompatibelt med --show-current-patch=%s" -#: builtin/am.c:2213 +#: builtin/am.c:2261 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2214 +#: builtin/am.c:2262 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2220 +#: builtin/am.c:2268 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2222 +#: builtin/am.c:2270 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2224 +#: builtin/am.c:2272 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 -#: builtin/repack.c:334 builtin/stash.c:882 +#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16 +#: builtin/repack.c:472 builtin/stash.c:948 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2227 +#: builtin/am.c:2275 msgid "add a Signed-off-by trailer to the commit message" msgstr "lägg till \"Signed-off-by\"-släprad i incheckningsmeddelandet" -#: builtin/am.c:2230 +#: builtin/am.c:2278 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2232 +#: builtin/am.c:2280 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2234 +#: builtin/am.c:2282 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2236 +#: builtin/am.c:2284 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2238 +#: builtin/am.c:2286 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet" -#: builtin/am.c:2241 +#: builtin/am.c:2289 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr" -#: builtin/am.c:2244 +#: builtin/am.c:2292 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2273 +#: builtin/am.c:2294 +msgid "pass it through git-mailinfo" +msgstr "sänd det genom git-mailinfo" + +#: builtin/am.c:2297 builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 +#: builtin/am.c:2309 builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 +#: builtin/am.c:2324 msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261 +#: builtin/am.c:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349 -#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172 -#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175 -#: parse-options.h:316 +#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 +#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176 +#: parse-options.h:317 msgid "n" msgstr "n" -#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136 -#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470 +#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137 +#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 #: builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2270 +#: builtin/am.c:2321 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2276 +#: builtin/am.c:2327 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2278 +#: builtin/am.c:2329 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2281 +#: builtin/am.c:2332 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2284 +#: builtin/am.c:2335 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2287 +#: builtin/am.c:2338 msgid "restore the original branch and abort the patching operation" msgstr "återställ originalgrenen och avbryt patchningen" -#: builtin/am.c:2290 +#: builtin/am.c:2341 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:2294 +#: builtin/am.c:2345 msgid "show the patch being applied" msgstr "visa patchen som tillämpas" -#: builtin/am.c:2299 +#: builtin/am.c:2350 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2301 +#: builtin/am.c:2352 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 -#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538 -#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451 +#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630 +#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 +#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401 +#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2307 +#: builtin/am.c:2358 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2325 +#: builtin/am.c:2376 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." @@ -10544,16 +10703,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:2332 +#: builtin/am.c:2383 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2347 +#: builtin/am.c:2398 #, 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:2371 +#: builtin/am.c:2422 #, c-format msgid "" "Stray %s directory found.\n" @@ -10562,11 +10721,11 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2377 +#: builtin/am.c:2428 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." -#: builtin/am.c:2387 +#: builtin/am.c:2438 msgid "interactive mode requires patches on the command line" msgstr "interaktivt läge kräver patchar på kommandoraden" @@ -10773,7 +10932,7 @@ 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:497 builtin/bisect--helper.c:1014 +#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021 msgid "revision walk setup failed\n" msgstr "misslyckades starta revisionstraversering\n" @@ -10841,86 +11000,91 @@ msgstr "Anropa \"--bisect-state\" med minst ett argument." msgid "'git bisect %s' can take only one argument." msgstr "\"git bisect %s\" kan bara ta ett argument." -#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878 +#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880 #, c-format msgid "Bad rev input: %s" msgstr "Felaktig rev-indata: %s" -#: builtin/bisect--helper.c:912 +#: builtin/bisect--helper.c:887 +#, c-format +msgid "Bad rev input (not a commit): %s" +msgstr "Felaktig rev-indata (ej incheckning): %s" + +#: builtin/bisect--helper.c:919 msgid "We are not bisecting." msgstr "Vi utför ingen bisect för tillfället." -#: builtin/bisect--helper.c:962 +#: builtin/bisect--helper.c:969 #, c-format msgid "'%s'?? what are you talking about?" msgstr "\"%s\"?? vad menar du?" -#: builtin/bisect--helper.c:974 +#: builtin/bisect--helper.c:981 #, c-format msgid "cannot read file '%s' for replaying" msgstr "kan inte läsa filen \"%s\" för återuppspelning" -#: builtin/bisect--helper.c:1047 +#: builtin/bisect--helper.c:1054 msgid "reset the bisection state" msgstr "återställ bisect-tillstånd" -#: builtin/bisect--helper.c:1049 +#: builtin/bisect--helper.c:1056 msgid "check whether bad or good terms exist" msgstr "se efter om termer för rätt och fel finns" -#: builtin/bisect--helper.c:1051 +#: builtin/bisect--helper.c:1058 msgid "print out the bisect terms" msgstr "skriv ut termer för bisect" -#: builtin/bisect--helper.c:1053 +#: builtin/bisect--helper.c:1060 msgid "start the bisect session" msgstr "påbörja bisect-körningen" -#: builtin/bisect--helper.c:1055 +#: builtin/bisect--helper.c:1062 msgid "find the next bisection commit" msgstr "hitta nästa incheckning i bisect" -#: builtin/bisect--helper.c:1057 +#: builtin/bisect--helper.c:1064 msgid "mark the state of ref (or refs)" msgstr "markera tillståndet för en eller flera referenser" -#: builtin/bisect--helper.c:1059 +#: builtin/bisect--helper.c:1066 msgid "list the bisection steps so far" msgstr "lista \"bisect\"-stegen som utförts så långt" -#: builtin/bisect--helper.c:1061 +#: builtin/bisect--helper.c:1068 msgid "replay the bisection process from the given file" msgstr "spela upp \"bisect\"-processen från angiven fil" -#: builtin/bisect--helper.c:1063 +#: builtin/bisect--helper.c:1070 msgid "skip some commits for checkout" msgstr "hoppa över ett par incheckningar" -#: builtin/bisect--helper.c:1065 +#: builtin/bisect--helper.c:1072 msgid "no log for BISECT_WRITE" msgstr "ingen logg för BISECT_WRITE" -#: builtin/bisect--helper.c:1080 +#: builtin/bisect--helper.c:1087 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:1085 +#: builtin/bisect--helper.c:1092 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check kräver 2 eller 3 argument" -#: builtin/bisect--helper.c:1091 +#: builtin/bisect--helper.c:1098 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms kräver noll eller ett argument" -#: builtin/bisect--helper.c:1100 +#: builtin/bisect--helper.c:1107 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next kräver 0 argument" -#: builtin/bisect--helper.c:1111 +#: builtin/bisect--helper.c:1118 msgid "--bisect-log requires 0 arguments" msgstr "--bisect-log kräver 0 argument" -#: builtin/bisect--helper.c:1116 +#: builtin/bisect--helper.c:1123 msgid "no logfile given" msgstr "ingen loggfil angiven" @@ -10971,9 +11135,9 @@ msgstr "vehandla inte rotincheckningar som gränser (Standard: av)" msgid "show work cost statistics" msgstr "visa statistik över arbetskostnad" -#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92 -#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175 -#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119 +#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 +#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 +#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 #: builtin/push.c:575 builtin/send-pack.c:198 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" @@ -11022,7 +11186,7 @@ msgstr "visa författarens e-post istället för namn (Standard: av)" msgid "ignore whitespace differences" msgstr "ignorera ändringar i blanksteg" -#: builtin/blame.c:883 builtin/log.c:1812 +#: builtin/blame.c:883 builtin/log.c:1820 msgid "rev" msgstr "incheckning" @@ -11199,75 +11363,75 @@ msgstr "Tog bort fjärrspårande grenen %s (var %s).\n" msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:438 builtin/tag.c:61 +#: builtin/branch.c:440 builtin/tag.c:63 msgid "unable to parse format string" msgstr "kan inte tolka formatsträng" -#: builtin/branch.c:469 +#: builtin/branch.c:471 msgid "could not resolve HEAD" msgstr "kunde inte slå upp HEAD" -#: builtin/branch.c:475 +#: builtin/branch.c:477 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) pekar utenför refs/heads/" -#: builtin/branch.c:490 +#: builtin/branch.c:492 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Grenen %s ombaseras på %s" -#: builtin/branch.c:494 +#: builtin/branch.c:496 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" på %s" -#: builtin/branch.c:511 +#: builtin/branch.c:513 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:513 +#: builtin/branch.c:515 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:524 +#: builtin/branch.c:526 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:553 +#: builtin/branch.c:555 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:555 +#: builtin/branch.c:557 msgid "Branch copy failed" msgstr "Misslyckades kopiera gren" -#: builtin/branch.c:559 +#: builtin/branch.c:561 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Skapade kopia av felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:562 +#: builtin/branch.c:564 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:568 +#: builtin/branch.c:570 #, 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:577 +#: builtin/branch.c:579 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:579 +#: builtin/branch.c:581 msgid "Branch is copied, but update of config-file failed" msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:595 +#: builtin/branch.c:597 #, c-format msgid "" "Please edit the description for the branch\n" @@ -11278,211 +11442,211 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/branch.c:629 +#: builtin/branch.c:631 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:631 +#: builtin/branch.c:633 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:632 +#: builtin/branch.c:634 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:633 +#: builtin/branch.c:635 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:635 +#: builtin/branch.c:637 msgid "do not use" msgstr "använd ej" -#: builtin/branch.c:637 builtin/rebase.c:534 +#: builtin/branch.c:639 builtin/rebase.c:533 msgid "upstream" msgstr "uppströms" -#: builtin/branch.c:637 +#: builtin/branch.c:639 msgid "change the upstream info" msgstr "ändra uppströmsinformationen" -#: builtin/branch.c:638 +#: builtin/branch.c:640 msgid "unset the upstream info" msgstr "ta bort uppströmsinformationen" -#: builtin/branch.c:639 +#: builtin/branch.c:641 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:640 +#: builtin/branch.c:642 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:642 builtin/branch.c:644 +#: builtin/branch.c:644 builtin/branch.c:646 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:643 builtin/branch.c:645 +#: builtin/branch.c:645 builtin/branch.c:647 msgid "print only branches that don't contain the commit" msgstr "visa endast grenar som inte innehåller incheckningen" -#: builtin/branch.c:648 +#: builtin/branch.c:650 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:649 +#: builtin/branch.c:651 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:651 +#: builtin/branch.c:653 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:652 +#: builtin/branch.c:654 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:653 +#: builtin/branch.c:655 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:654 +#: builtin/branch.c:656 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:655 +#: builtin/branch.c:657 msgid "copy a branch and its reflog" msgstr "kopiera en gren och dess reflogg" -#: builtin/branch.c:656 +#: builtin/branch.c:658 msgid "copy a branch, even if target exists" msgstr "kopiera en gren, även om målet finns" -#: builtin/branch.c:657 +#: builtin/branch.c:659 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:658 +#: builtin/branch.c:660 msgid "show current branch name" msgstr "visa namn på aktuell gren" -#: builtin/branch.c:659 +#: builtin/branch.c:661 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:661 +#: builtin/branch.c:663 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:662 +#: builtin/branch.c:664 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:663 +#: builtin/branch.c:665 msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:664 +#: builtin/branch.c:666 msgid "print only branches that are not merged" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:665 +#: builtin/branch.c:667 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:667 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:466 +#: builtin/tag.c:477 msgid "object" msgstr "objekt" -#: builtin/branch.c:668 +#: builtin/branch.c:670 msgid "print only branches of the object" msgstr "visa endast grenar för objektet" -#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473 +#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484 msgid "sorting and filtering are case insensitive" msgstr "sortering och filtrering skiljer gemener och VERSALER" -#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471 +#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/branch.c:693 builtin/clone.c:790 +#: builtin/branch.c:695 builtin/clone.c:794 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:717 +#: builtin/branch.c:719 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797 +#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:764 +#: builtin/branch.c:766 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:769 +#: builtin/branch.c:771 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:776 +#: builtin/branch.c:778 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu." -#: builtin/branch.c:779 +#: builtin/branch.c:781 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:794 +#: builtin/branch.c:796 msgid "too many branches for a copy operation" msgstr "för många grenar för kopiering" -#: builtin/branch.c:803 +#: builtin/branch.c:805 msgid "too many arguments for a rename operation" msgstr "för många flaggor för namnbyte" -#: builtin/branch.c:808 +#: builtin/branch.c:810 msgid "too many arguments to set new upstream" msgstr "för många flaggor för att byta uppström" -#: builtin/branch.c:812 +#: builtin/branch.c:814 #, 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:815 builtin/branch.c:838 +#: builtin/branch.c:817 builtin/branch.c:840 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:819 +#: builtin/branch.c:821 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:832 +#: builtin/branch.c:834 msgid "too many arguments to unset upstream" msgstr "för många flaggor för att ta bort uppström" -#: builtin/branch.c:836 +#: builtin/branch.c:838 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:842 +#: builtin/branch.c:844 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:852 +#: builtin/branch.c:854 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -11490,7 +11654,7 @@ msgstr "" "Flaggorna -a och -r på \"git branch\" tar inte ett namn på gren.\n" "Menade du att använda: -a|-r --list <mönster>?" -#: builtin/branch.c:856 +#: builtin/branch.c:858 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -11559,38 +11723,38 @@ msgstr "" "Se över resten av felrapporten nedan.\n" "Du kan ta bort rader du inte vill dela.\n" -#: builtin/bugreport.c:135 +#: builtin/bugreport.c:136 msgid "specify a destination for the bugreport file" msgstr "ange mål för buggrapporteringsfilen" -#: builtin/bugreport.c:137 +#: builtin/bugreport.c:138 msgid "specify a strftime format suffix for the filename" msgstr "ange ett filändelse i strftime-format" -#: builtin/bugreport.c:159 +#: builtin/bugreport.c:160 #, c-format msgid "could not create leading directories for '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/bugreport.c:166 +#: builtin/bugreport.c:167 msgid "System Info" msgstr "Systeminfo" -#: builtin/bugreport.c:169 +#: builtin/bugreport.c:170 msgid "Enabled Hooks" msgstr "Aktiverade krokar" -#: builtin/bugreport.c:176 +#: builtin/bugreport.c:177 #, c-format msgid "couldn't create a new file at '%s'" msgstr "kunde inte skapa filen på \"%s\"" -#: builtin/bugreport.c:179 +#: builtin/bugreport.c:180 #, c-format msgid "unable to write to %s" msgstr "kunde inte skriva till %s" -#: builtin/bugreport.c:189 +#: builtin/bugreport.c:190 #, c-format msgid "Created new report at '%s'.\n" msgstr "Skapade ny rapport på \"%s\"\n" @@ -11611,19 +11775,19 @@ msgstr "git bundle list-heads <fil> [<refnamn>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <fil> [<refnamn>...]" -#: builtin/bundle.c:67 builtin/pack-objects.c:3495 +#: builtin/bundle.c:67 builtin/pack-objects.c:3747 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/bundle.c:69 builtin/pack-objects.c:3497 +#: builtin/bundle.c:69 builtin/pack-objects.c:3749 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/bundle.c:71 builtin/pack-objects.c:3499 +#: builtin/bundle.c:71 builtin/pack-objects.c:3751 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/bundle.c:74 builtin/pack-objects.c:3502 +#: builtin/bundle.c:74 builtin/pack-objects.c:3754 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" @@ -11766,8 +11930,8 @@ msgstr "läs filnamn från standard in" msgid "terminate input and output records by a NUL character" msgstr "avsluta in- och utdataposter med NUL-tecken" -#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549 -#: builtin/worktree.c:489 +#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 +#: builtin/worktree.c:491 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -11779,27 +11943,27 @@ msgstr "visa indatasökvägar som inte träffas" msgid "ignore index when checking" msgstr "ignorera index vid kontroll" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:165 msgid "cannot specify pathnames with --stdin" msgstr "kan inte ange sökvägsnamn med --stdin" -#: builtin/check-ignore.c:166 +#: builtin/check-ignore.c:168 msgid "-z only makes sense with --stdin" msgstr "-z kan endast användas tillsammans med --stdin" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:170 msgid "no path specified" msgstr "ingen sökväg angavs" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:174 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:174 +#: builtin/check-ignore.c:176 msgid "cannot have both --quiet and --verbose" msgstr "kan inte använda både --quiet och --verbose" -#: builtin/check-ignore.c:177 +#: builtin/check-ignore.c:179 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching är endast giltig med --verbose" @@ -11820,6 +11984,21 @@ msgstr "kunde inte tolka kontakt: %s" msgid "no contacts specified" msgstr "inga kontakter angavs" +#: builtin/checkout--worker.c:110 +msgid "git checkout--worker [<options>]" +msgstr "git checkout--worker [<flaggor>]" + +#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 +#: builtin/column.c:31 builtin/submodule--helper.c:1825 +#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836 +#: builtin/submodule--helper.c:2334 builtin/worktree.c:719 +msgid "string" +msgstr "sträng" + +#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202 +msgid "when creating files, prepend <string>" +msgstr "när filer skapas, lägg till <sträng> först" + #: builtin/checkout-index.c:152 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<flaggor>] [--] [<fil>...]" @@ -11828,157 +12007,146 @@ msgstr "git checkout-index [<flaggor>] [--] [<fil>...]" 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:186 +#: builtin/checkout-index.c:187 msgid "check out all files in the index" msgstr "checka ut alla filer i indexet" -#: builtin/checkout-index.c:187 +#: builtin/checkout-index.c:188 msgid "force overwrite of existing files" msgstr "tvinga överskrivning av befintliga filer" -#: builtin/checkout-index.c:189 +#: builtin/checkout-index.c:190 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:191 +#: builtin/checkout-index.c:192 msgid "don't checkout new files" msgstr "checka inte ut nya filer" -#: builtin/checkout-index.c:193 +#: builtin/checkout-index.c:194 msgid "update stat information in the index file" msgstr "uppdatera stat-information i indexfilen" -#: builtin/checkout-index.c:197 +#: builtin/checkout-index.c:198 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:199 +#: builtin/checkout-index.c:200 msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" -#: builtin/checkout-index.c:200 builtin/column.c:31 -#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 -#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 -#: builtin/worktree.c:717 -msgid "string" -msgstr "sträng" - -#: builtin/checkout-index.c:201 -msgid "when creating files, prepend <string>" -msgstr "när filer skapas, lägg till <sträng> först" - -#: builtin/checkout-index.c:203 +#: builtin/checkout-index.c:204 msgid "copy out the files from named stage" msgstr "kopiera ut filer från namngiven etapp" -#: builtin/checkout.c:31 +#: builtin/checkout.c:33 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<flaggor>] <gren>" -#: builtin/checkout.c:32 +#: builtin/checkout.c:34 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..." -#: builtin/checkout.c:37 +#: builtin/checkout.c:39 msgid "git switch [<options>] [<branch>]" msgstr "git switch [<flaggor>] [<gren>]" -#: builtin/checkout.c:42 +#: builtin/checkout.c:44 msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<flaggor>] [--source=<gren>] <fil>..." -#: builtin/checkout.c:188 builtin/checkout.c:227 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:190 builtin/checkout.c:229 +#: builtin/checkout.c:192 builtin/checkout.c:231 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:206 +#: builtin/checkout.c:208 #, 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:258 +#: builtin/checkout.c:261 #, 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:275 +#: builtin/checkout.c:278 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:291 +#: builtin/checkout.c:294 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:396 +#: builtin/checkout.c:414 #, 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:401 +#: builtin/checkout.c:419 #, 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:408 +#: builtin/checkout.c:426 #, 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:431 builtin/checkout.c:434 builtin/checkout.c:437 -#: builtin/checkout.c:441 +#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455 +#: builtin/checkout.c:459 #, 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:444 builtin/checkout.c:447 +#: builtin/checkout.c:462 builtin/checkout.c:465 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:451 +#: builtin/checkout.c:469 #, 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:455 +#: builtin/checkout.c:473 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "varken \"%s\" eller \"%s\" har angivits" -#: builtin/checkout.c:459 +#: builtin/checkout.c:477 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "\"%s\" måste användas när \"%s\" inte anges" -#: builtin/checkout.c:464 builtin/checkout.c:469 +#: builtin/checkout.c:482 builtin/checkout.c:487 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "\"%s\" eller \"%s\" kan inte användas med %s" -#: builtin/checkout.c:543 builtin/checkout.c:550 +#: builtin/checkout.c:563 builtin/checkout.c:570 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:718 +#: builtin/checkout.c:739 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:772 +#: builtin/checkout.c:793 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11987,50 +12155,50 @@ msgstr "" "kan inte fortsätta med köade ändringar i följande filer:\n" "%s" -#: builtin/checkout.c:865 +#: builtin/checkout.c:886 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:907 +#: builtin/checkout.c:928 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:915 +#: builtin/checkout.c:936 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:918 +#: builtin/checkout.c:939 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:922 +#: builtin/checkout.c:943 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:924 builtin/checkout.c:1355 +#: builtin/checkout.c:945 builtin/checkout.c:1376 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:926 +#: builtin/checkout.c:947 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:977 +#: builtin/checkout.c:998 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:983 +#: builtin/checkout.c:1004 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12053,7 +12221,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1002 +#: builtin/checkout.c:1023 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12080,19 +12248,19 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:1037 +#: builtin/checkout.c:1058 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:1041 +#: builtin/checkout.c:1062 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:1081 builtin/checkout.c:1350 +#: builtin/checkout.c:1102 builtin/checkout.c:1371 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:1163 +#: builtin/checkout.c:1184 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12101,7 +12269,7 @@ msgstr "" "\"%s\" kan vara både en lokal fil och en spårande gren.\n" "Använd -- (och möjligen --no-guess) för att göra otvetydig" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1191 msgid "" "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" @@ -12121,51 +12289,51 @@ msgstr "" "föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n" "checkout.defaultRemote=origin i din konfiguration." -#: builtin/checkout.c:1180 +#: builtin/checkout.c:1201 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1267 msgid "only one reference expected" msgstr "endast en referens förväntades" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1284 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438 +#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1322 builtin/checkout.c:1688 +#: builtin/checkout.c:1343 builtin/checkout.c:1709 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1369 +#: builtin/checkout.c:1390 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "förväntade gren, fick taggen \"%s\"" -#: builtin/checkout.c:1371 +#: builtin/checkout.c:1392 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "förväntade gren, fick fjärrgrenen \"%s\"" -#: builtin/checkout.c:1372 builtin/checkout.c:1380 +#: builtin/checkout.c:1393 builtin/checkout.c:1401 #, c-format msgid "a branch is expected, got '%s'" msgstr "förväntade gren, fick \"%s\"" -#: builtin/checkout.c:1375 +#: builtin/checkout.c:1396 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "förväntade gren, fick incheckningen \"%s\"" -#: builtin/checkout.c:1391 +#: builtin/checkout.c:1412 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12173,7 +12341,7 @@ msgstr "" "kan inte växla gren vid sammanslagning\n" "Överväg \"git merge --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1416 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12181,7 +12349,7 @@ msgstr "" "kan inte växla gren mitt i en \"am\"-körning\n" "Överväg \"git am --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1399 +#: builtin/checkout.c:1420 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12189,7 +12357,7 @@ msgstr "" "kan inte växla gren vid ombasering\n" "Överväg \"git rebase --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1403 +#: builtin/checkout.c:1424 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12197,7 +12365,7 @@ msgstr "" "kan inte växla gren i en \"cherry-pick\"\n" "Överväg \"git cherry-pick --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1407 +#: builtin/checkout.c:1428 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12205,139 +12373,139 @@ msgstr "" "kan inte växla gren i en \"revert\"\n" "Överväg \"git revert --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1432 msgid "you are switching branch while bisecting" msgstr "då växlar grenar medan du gör en \"bisect\"" -#: builtin/checkout.c:1418 +#: builtin/checkout.c:1439 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429 +#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439 -#: builtin/checkout.c:1444 builtin/checkout.c:1449 +#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 +#: builtin/checkout.c:1465 builtin/checkout.c:1470 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1446 +#: builtin/checkout.c:1467 #, c-format msgid "'%s' cannot take <start-point>" msgstr "\"%s\" kan inte ta <startpunkt>" -#: builtin/checkout.c:1454 +#: builtin/checkout.c:1475 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1461 +#: builtin/checkout.c:1482 msgid "missing branch or commit argument" msgstr "saknar gren- eller incheckingsargument" -#: builtin/checkout.c:1504 +#: builtin/checkout.c:1525 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:1505 builtin/log.c:1799 parse-options.h:322 +#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323 msgid "style" msgstr "stil" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1527 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1518 builtin/worktree.c:486 +#: builtin/checkout.c:1539 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1519 +#: builtin/checkout.c:1540 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1521 +#: builtin/checkout.c:1542 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1523 +#: builtin/checkout.c:1544 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1523 +#: builtin/checkout.c:1544 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1525 builtin/merge.c:301 +#: builtin/checkout.c:1546 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1528 +#: builtin/checkout.c:1549 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:1541 +#: builtin/checkout.c:1562 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1565 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1548 +#: builtin/checkout.c:1569 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1603 +#: builtin/checkout.c:1624 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1607 +#: builtin/checkout.c:1628 msgid "-p and --overlay are mutually exclusive" msgstr "-p och --overlay är ömsesidigt uteslutande" -#: builtin/checkout.c:1644 +#: builtin/checkout.c:1665 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1649 +#: builtin/checkout.c:1670 #, c-format msgid "missing branch name; try -%c" msgstr "grennamn saknas; försök med -%c" -#: builtin/checkout.c:1681 +#: builtin/checkout.c:1702 #, c-format msgid "could not resolve %s" msgstr "kunde inte upplösa %s" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1718 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1704 +#: builtin/checkout.c:1725 #, 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:1708 +#: builtin/checkout.c:1729 #, 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:1717 +#: builtin/checkout.c:1738 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file är inkompatibelt med --detach" -#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566 +#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file är inkompatibelt med --patch" -#: builtin/checkout.c:1733 +#: builtin/checkout.c:1754 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12345,70 +12513,70 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1759 msgid "you must specify path(s) to restore" msgstr "du måste ange katalog(er) att återställa" -#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815 -#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482 -#: builtin/worktree.c:484 +#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 +#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484 +#: builtin/worktree.c:486 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1765 +#: builtin/checkout.c:1786 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1767 +#: builtin/checkout.c:1788 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1768 +#: builtin/checkout.c:1789 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1770 +#: builtin/checkout.c:1791 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "förutspå \"git checkout <gren-saknas>\" (förval)" -#: builtin/checkout.c:1771 +#: builtin/checkout.c:1792 msgid "use overlay mode (default)" msgstr "använd överläggsläge (standard)" -#: builtin/checkout.c:1816 +#: builtin/checkout.c:1837 msgid "create and switch to a new branch" msgstr "skapa och växla till en ny gren" -#: builtin/checkout.c:1818 +#: builtin/checkout.c:1839 msgid "create/reset and switch to a branch" msgstr "skapa/nollställ och växla till en gren" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1841 msgid "second guess 'git switch <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1822 +#: builtin/checkout.c:1843 msgid "throw away local modifications" msgstr "kasta bort lokala ändringar" -#: builtin/checkout.c:1856 +#: builtin/checkout.c:1877 msgid "which tree-ish to checkout from" msgstr "vilken träd-igt att checka ut från" -#: builtin/checkout.c:1858 +#: builtin/checkout.c:1879 msgid "restore the index" msgstr "återställ indexet" -#: builtin/checkout.c:1860 +#: builtin/checkout.c:1881 msgid "restore the working tree (default)" msgstr "återställ arbetskatalogen (förval)" -#: builtin/checkout.c:1862 +#: builtin/checkout.c:1883 msgid "ignore unmerged entries" msgstr "ignorera ej sammanslagna poster" -#: builtin/checkout.c:1863 +#: builtin/checkout.c:1884 msgid "use overlay mode" msgstr "använd överläggsläge" @@ -12439,11 +12607,6 @@ msgstr "Hoppar över arkivet %s\n" msgid "Would skip repository %s\n" msgstr "Skulle hoppa över arkivet %s\n" -#: builtin/clean.c:37 -#, c-format -msgid "failed to remove %s" -msgstr "misslyckades ta bort %s" - #: builtin/clean.c:38 #, c-format msgid "could not lstat %s\n" @@ -12554,8 +12717,8 @@ msgid "remove whole directories" msgstr "ta bort hela kataloger" #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186 -#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186 +#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "mönster" @@ -12596,164 +12759,169 @@ msgstr "-x och -X kan inte användas samtidigt" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:94 +#: builtin/clone.c:96 +msgid "don't clone shallow repository" +msgstr "klona inte grunt arkiv" + +#: builtin/clone.c:98 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555 +#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:99 +#: builtin/clone.c:103 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:101 +#: builtin/clone.c:105 msgid "to clone from a local repository" msgstr "för att klona från ett lokalt arkiv" -#: builtin/clone.c:103 +#: builtin/clone.c:107 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hårda länkar, kopiera alltid" -#: builtin/clone.c:105 +#: builtin/clone.c:109 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "pathspec" msgstr "sökvägsangivelse" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:111 +#: builtin/clone.c:115 msgid "number of submodules cloned in parallel" msgstr "antal undermoduler som klonas parallellt" -#: builtin/clone.c:112 builtin/init-db.c:552 +#: builtin/clone.c:116 builtin/init-db.c:538 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:113 builtin/init-db.c:553 +#: builtin/clone.c:117 builtin/init-db.c:539 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831 -#: builtin/submodule--helper.c:2336 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832 +#: builtin/submodule--helper.c:2337 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:119 builtin/submodule--helper.c:1833 -#: builtin/submodule--helper.c:2338 +#: builtin/clone.c:123 builtin/submodule--helper.c:1834 +#: builtin/submodule--helper.c:2339 msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" -#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357 +#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:549 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495 +#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698 msgid "name" msgstr "namn" -#: builtin/clone.c:121 +#: builtin/clone.c:125 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:123 +#: builtin/clone.c:127 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checka ut <gren> istället för fjärrens HEAD" -#: builtin/clone.c:125 +#: builtin/clone.c:129 msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863 #: builtin/pull.c:208 msgid "depth" msgstr "djup" -#: builtin/clone.c:127 +#: builtin/clone.c:131 msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550 +#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804 #: builtin/pull.c:211 msgid "time" msgstr "tid" -#: builtin/clone.c:129 +#: builtin/clone.c:133 msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon från en angiven tidpunkt" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323 +#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318 msgid "revision" msgstr "revision" -#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215 +#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" -#: builtin/clone.c:133 builtin/submodule--helper.c:1843 -#: builtin/submodule--helper.c:2352 +#: builtin/clone.c:137 builtin/submodule--helper.c:1844 +#: builtin/submodule--helper.c:2353 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:135 +#: builtin/clone.c:139 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:137 +#: builtin/clone.c:141 msgid "any cloned submodules will be shallow" msgstr "klonade undermoduler kommer vara grunda" -#: builtin/clone.c:138 builtin/init-db.c:561 +#: builtin/clone.c:142 builtin/init-db.c:547 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:139 builtin/init-db.c:562 +#: builtin/clone.c:143 builtin/init-db.c:548 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" -#: builtin/clone.c:140 +#: builtin/clone.c:144 msgid "key=value" msgstr "nyckel=värde" -#: builtin/clone.c:141 +#: builtin/clone.c:145 msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 #: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 msgid "server-specific" msgstr "serverspecifik" -#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 #: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 msgid "option to transmit" msgstr "" "inget att checka in\n" "flagga att sända" -#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234 +#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 #: builtin/push.c:585 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237 +#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 #: builtin/push.c:587 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" -#: builtin/clone.c:150 +#: builtin/clone.c:154 msgid "any cloned submodules will use their remote-tracking branch" msgstr "klonade undermoduler kommer använda sin fjärrspårningsgren" -#: builtin/clone.c:152 +#: builtin/clone.c:156 msgid "initialize sparse-checkout file to include only files at root" msgstr "initiera sparse-checkout-filen till att bara inkludera filer i roten" -#: builtin/clone.c:288 +#: builtin/clone.c:292 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12761,42 +12929,42 @@ msgstr "" "Kunde inte gissa katalognamn.\n" "Ange en katalog på kommandoraden" -#: builtin/clone.c:341 +#: builtin/clone.c:345 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Kan inte skapa suppleant för \"%s\": %s\n" -#: builtin/clone.c:414 +#: builtin/clone.c:418 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:432 +#: builtin/clone.c:436 #, c-format msgid "failed to start iterator over '%s'" msgstr "misslyckades starta iterator över \"%s\"" -#: builtin/clone.c:463 +#: builtin/clone.c:467 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:467 +#: builtin/clone.c:471 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:472 +#: builtin/clone.c:476 #, c-format msgid "failed to iterate over '%s'" msgstr "misslyckades iterera över \"%s\"" -#: builtin/clone.c:499 +#: builtin/clone.c:503 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:513 +#: builtin/clone.c:517 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12806,147 +12974,147 @@ msgstr "" "Du kan inspektera det som checkades ut med \"git status\"\n" "och försöka med \"git restore -source=HEAD :/\"\n" -#: builtin/clone.c:590 +#: builtin/clone.c:594 #, 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:709 +#: builtin/clone.c:713 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:757 +#: builtin/clone.c:761 msgid "failed to initialize sparse-checkout" msgstr "misslyckades initiera sparse-checkout" -#: builtin/clone.c:780 +#: builtin/clone.c:784 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:812 +#: builtin/clone.c:816 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:887 +#: builtin/clone.c:894 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:950 +#: builtin/clone.c:957 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:952 +#: builtin/clone.c:959 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:993 builtin/receive-pack.c:2493 +#: builtin/clone.c:1001 builtin/receive-pack.c:2491 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:997 +#: builtin/clone.c:1005 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:1010 +#: builtin/clone.c:1018 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:1013 +#: builtin/clone.c:1021 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:1026 +#: builtin/clone.c:1035 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:1030 builtin/fetch.c:1951 +#: builtin/clone.c:1039 builtin/fetch.c:2011 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:1040 +#: builtin/clone.c:1049 #, 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:1046 +#: builtin/clone.c:1055 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "arkivsökvägen \"%s\" finns redan och är inte en tom katalog." -#: builtin/clone.c:1060 +#: builtin/clone.c:1069 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271 -#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314 +#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 +#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:1080 +#: builtin/clone.c:1089 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:1100 +#: builtin/clone.c:1109 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:1102 +#: builtin/clone.c:1111 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:1126 +#: builtin/clone.c:1135 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:1170 builtin/remote.c:200 builtin/remote.c:705 +#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705 #, c-format msgid "'%s' is not a valid remote name" msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" -#: builtin/clone.c:1211 +#: builtin/clone.c:1229 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1213 +#: builtin/clone.c:1231 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:1215 +#: builtin/clone.c:1233 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:1217 +#: builtin/clone.c:1235 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1220 +#: builtin/clone.c:1240 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1225 +#: builtin/clone.c:1245 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1315 builtin/clone.c:1323 +#: builtin/clone.c:1337 builtin/clone.c:1345 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1326 +#: builtin/clone.c:1348 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -12963,20 +13131,20 @@ msgid "layout to use" msgstr "utseende att använda" #: builtin/column.c:30 -msgid "Maximum width" -msgstr "Maximal bredd" +msgid "maximum width" +msgstr "maximal bredd" #: builtin/column.c:31 -msgid "Padding space on left border" -msgstr "Spaltfyllnad i vänsterkanten" +msgid "padding space on left border" +msgstr "spaltfyllnad i vänsterkanten" #: builtin/column.c:32 -msgid "Padding space on right border" -msgstr "Spaltfyllnad i högerkanten" +msgid "padding space on right border" +msgstr "spaltfyllnad i högerkanten" #: builtin/column.c:33 -msgid "Padding space between columns" -msgstr "Spaltfyllnad mellan spalter" +msgid "padding space between columns" +msgstr "spaltfyllnad mellan spalter" #: builtin/column.c:51 msgid "--command must be the first argument" @@ -13004,7 +13172,7 @@ msgid "could not find object directory matching %s" msgstr "kunde inte hitta objektkatalog för %s" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768 +#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776 msgid "dir" msgstr "kat" @@ -13099,7 +13267,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "duplicerad förälder %s ignorerades" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559 #, c-format msgid "not a valid object name %s" msgstr "objektnamnet är inte giltigt: %s" @@ -13127,13 +13295,13 @@ msgstr "förälder" msgid "id of a parent commit object" msgstr "id på ett förälderincheckningsobjekt" -#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537 -#: builtin/tag.c:445 +#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605 +#: builtin/tag.c:456 msgid "message" msgstr "meddelande" -#: builtin/commit-tree.c:115 builtin/commit.c:1504 +#: builtin/commit-tree.c:115 builtin/commit.c:1614 msgid "commit message" msgstr "incheckningsmeddelande" @@ -13141,7 +13309,7 @@ msgstr "incheckningsmeddelande" msgid "read commit log message from file" msgstr "läs incheckningsloggmeddelande från fil" -#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299 +#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG-signera incheckning" @@ -13216,73 +13384,73 @@ msgstr "" " git cherry-pick --skip\n" "\n" -#: builtin/commit.c:312 +#: builtin/commit.c:324 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:348 +#: builtin/commit.c:360 msgid "--pathspec-from-file with -a does not make sense" msgstr "--pathspec-from-file med -a ger ingen mening" -#: builtin/commit.c:361 +#: builtin/commit.c:374 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:373 +#: builtin/commit.c:386 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:382 +#: builtin/commit.c:395 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:397 +#: builtin/commit.c:410 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporärt index" -#: builtin/commit.c:399 +#: builtin/commit.c:412 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cacheträdet" -#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 +#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:476 +#: builtin/commit.c:489 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:478 +#: builtin/commit.c:491 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:480 +#: builtin/commit.c:493 msgid "cannot do a partial commit during a rebase." msgstr "kan inte utföra en delvis incheckning under en ombasering." -#: builtin/commit.c:488 +#: builtin/commit.c:501 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:507 +#: builtin/commit.c:520 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:605 +#: builtin/commit.c:618 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar författarhuvud" -#: builtin/commit.c:607 +#: builtin/commit.c:620 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:626 +#: builtin/commit.c:639 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:679 +#: builtin/commit.c:692 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -13290,38 +13458,43 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 +#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:729 builtin/shortlog.c:413 +#: builtin/commit.c:758 builtin/shortlog.c:413 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:731 +#: builtin/commit.c:760 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:735 +#: builtin/commit.c:764 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:766 builtin/commit.c:782 +#: builtin/commit.c:801 +#, c-format +msgid "cannot combine -m with --fixup:%s" +msgstr "kan inte kombinera -m med --fixup:%s" + +#: builtin/commit.c:813 builtin/commit.c:829 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:773 +#: builtin/commit.c:820 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:833 +#: builtin/commit.c:880 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:853 +#: builtin/commit.c:900 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -13335,7 +13508,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "och försöker igen.\n" -#: builtin/commit.c:858 +#: builtin/commit.c:905 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -13349,7 +13522,7 @@ msgstr "" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "och försöker igen.\n" -#: builtin/commit.c:868 +#: builtin/commit.c:915 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -13359,7 +13532,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:876 +#: builtin/commit.c:923 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -13370,144 +13543,175 @@ 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:893 +#: builtin/commit.c:940 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:901 +#: builtin/commit.c:948 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:908 +#: builtin/commit.c:955 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:926 +#: builtin/commit.c:973 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:997 +#: builtin/commit.c:1018 +msgid "unable to pass trailers to --trailers" +msgstr "kan inte sända släprader till --trailers" + +#: builtin/commit.c:1058 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:1011 builtin/tag.c:308 +#: builtin/commit.c:1072 builtin/tag.c:319 #, 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:1055 +#: builtin/commit.c:1116 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' är inte 'Namn <epost>' och motsvarar ingen befintlig författare" -#: builtin/commit.c:1069 +#: builtin/commit.c:1130 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Ogiltigt ignorerat läge \"%s\"" -#: builtin/commit.c:1087 builtin/commit.c:1331 +#: builtin/commit.c:1148 builtin/commit.c:1441 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1127 +#: builtin/commit.c:1188 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1171 +#: builtin/commit.c:1219 +msgid "You are in the middle of a merge -- cannot reword." +msgstr "Du är i mitten av en sammanslagning -- kan inte omformulera." + +#: builtin/commit.c:1221 +msgid "You are in the middle of a cherry-pick -- cannot reword." +msgstr "Du är i mitten av en cherry-pick -- kan inte omformulera." + +#: builtin/commit.c:1224 +#, c-format +msgid "cannot combine reword option of --fixup with path '%s'" +msgstr "" +"kan inte kombinera omformuleringsflaggor för --fixup med sökvägen \"%s\"" + +#: builtin/commit.c:1226 +msgid "" +"reword option of --fixup is mutually exclusive with --patch/--interactive/--" +"all/--include/--only" +msgstr "" +"omformuleringsflaggan i --fixup är ömsesidigt uteslutande med --patch/--" +"interactive/--all/--include/--only" + +#: builtin/commit.c:1245 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:1180 +#: builtin/commit.c:1254 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1183 +#: builtin/commit.c:1257 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:1185 +#: builtin/commit.c:1259 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:1187 +#: builtin/commit.c:1261 msgid "You are in the middle of a rebase -- cannot amend." msgstr "Du är i mitten av en ombasering -- kan inte utöka." -#: builtin/commit.c:1190 +#: builtin/commit.c:1264 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1200 +#: builtin/commit.c:1274 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:1202 +#: builtin/commit.c:1276 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F." -#: builtin/commit.c:1211 +#: builtin/commit.c:1285 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:1229 +#: builtin/commit.c:1303 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:1235 +#: builtin/commit.c:1331 +#, c-format +msgid "unknown option: --fixup=%s:%s" +msgstr "okänd flagga: --fixup=%s:%s" + +#: builtin/commit.c:1345 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "sökvägarna \"%s ...\" med -a ger ingen mening" -#: builtin/commit.c:1366 builtin/commit.c:1527 +#: builtin/commit.c:1476 builtin/commit.c:1642 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1368 builtin/commit.c:1529 +#: builtin/commit.c:1478 builtin/commit.c:1644 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1370 +#: builtin/commit.c:1480 msgid "show stash information" msgstr "visa information om stash" -#: builtin/commit.c:1372 builtin/commit.c:1531 +#: builtin/commit.c:1482 builtin/commit.c:1646 msgid "compute full ahead/behind values" msgstr "beräkna fullständiga före-/efter-värden" -#: builtin/commit.c:1374 +#: builtin/commit.c:1484 msgid "version" msgstr "version" -#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 -#: builtin/worktree.c:679 +#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560 +#: builtin/worktree.c:681 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1377 builtin/commit.c:1535 +#: builtin/commit.c:1487 builtin/commit.c:1650 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1380 builtin/commit.c:1538 +#: builtin/commit.c:1490 builtin/commit.c:1653 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656 #: builtin/fast-export.c:1198 builtin/fast-export.c:1201 -#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336 +#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337 msgid "mode" msgstr "läge" -#: builtin/commit.c:1383 builtin/commit.c:1541 +#: builtin/commit.c:1493 builtin/commit.c:1656 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:1387 +#: builtin/commit.c:1497 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -13515,11 +13719,11 @@ msgstr "" "visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: " "traditional)" -#: builtin/commit.c:1389 parse-options.h:192 +#: builtin/commit.c:1499 parse-options.h:193 msgid "when" msgstr "när" -#: builtin/commit.c:1390 +#: builtin/commit.c:1500 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -13527,172 +13731,194 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1392 +#: builtin/commit.c:1502 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1393 +#: builtin/commit.c:1503 msgid "do not detect renames" msgstr "detektera inte namnändringar" -#: builtin/commit.c:1395 +#: builtin/commit.c:1505 msgid "detect renames, optionally set similarity index" msgstr "detektera namnändringar, möjligen sätt likhetsindex" -#: builtin/commit.c:1415 +#: builtin/commit.c:1525 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:1497 +#: builtin/commit.c:1607 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1498 +#: builtin/commit.c:1608 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1500 +#: builtin/commit.c:1610 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447 +#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1502 +#: builtin/commit.c:1612 msgid "author" msgstr "författare" -#: builtin/commit.c:1502 +#: builtin/commit.c:1612 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1503 builtin/gc.c:550 +#: builtin/commit.c:1613 builtin/gc.c:550 msgid "date" msgstr "datum" -#: builtin/commit.c:1503 +#: builtin/commit.c:1613 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 -#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90 +#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622 +#: parse-options.h:329 ref-filter.h:90 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1505 +#: builtin/commit.c:1615 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1506 +#: builtin/commit.c:1616 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1507 -msgid "use autosquash formatted message to fixup specified commit" +#. TRANSLATORS: Leave "[(amend|reword):]" as-is, +#. and only translate <commit>. +#. +#: builtin/commit.c:1621 +msgid "[(amend|reword):]commit" +msgstr "[(amend|reword):]incheckning" + +#: builtin/commit.c:1621 +msgid "" +"use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" -"använd autosquash-formaterat meddelande för att fixa angiven incheckning" +"använd autosquash-formaterat meddelande för att fixa/omformulera angiven " +"incheckning" -#: builtin/commit.c:1508 +#: builtin/commit.c:1622 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:1509 +#: builtin/commit.c:1623 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:1510 builtin/log.c:1743 builtin/merge.c:302 +#: builtin/commit.c:1624 builtin/interpret-trailers.c:111 +msgid "trailer" +msgstr "släprad" + +#: builtin/commit.c:1624 +msgid "add custom trailer(s)" +msgstr "använd skräddarsydd(a) släprad(er)" + +#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "lägg till Signed-off-by-släprad" -#: builtin/commit.c:1511 +#: builtin/commit.c:1626 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1512 +#: builtin/commit.c:1627 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1514 +#: builtin/commit.c:1629 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1519 +#: builtin/commit.c:1634 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1520 +#: builtin/commit.c:1635 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1521 +#: builtin/commit.c:1636 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1522 +#: builtin/commit.c:1637 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1523 +#: builtin/commit.c:1638 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1524 +#: builtin/commit.c:1639 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1525 +#: builtin/commit.c:1640 msgid "bypass pre-commit and commit-msg hooks" msgstr "förbigå pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1526 +#: builtin/commit.c:1641 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1539 +#: builtin/commit.c:1654 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1540 +#: builtin/commit.c:1655 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1547 +#: builtin/commit.c:1662 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1549 +#: builtin/commit.c:1664 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1622 +#: builtin/commit.c:1737 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1629 +#: builtin/commit.c:1744 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1650 +#: builtin/commit.c:1765 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1657 +#: builtin/commit.c:1772 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1662 +#: builtin/commit.c:1777 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1696 +#: builtin/commit.c:1788 +#, c-format +msgid "Aborting commit due to empty commit message body.\n" +msgstr "Avbryter på grund av tom incheckningsmeddelandekropp.\n" + +#: builtin/commit.c:1824 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -14035,7 +14261,7 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" -#: builtin/credential-cache--daemon.c:226 +#: builtin/credential-cache--daemon.c:227 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -14048,11 +14274,11 @@ msgstr "" "\n" "\tchmod 0700 %s" -#: builtin/credential-cache--daemon.c:275 +#: builtin/credential-cache--daemon.c:276 msgid "print debugging messages to stderr" msgstr "skriv felsökningsmeddelanden på standard fel" -#: builtin/credential-cache--daemon.c:315 +#: builtin/credential-cache--daemon.c:316 msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "" "\"credential-cache--daemon\" ej tillgänglig; stöd för unix-uttag saknas" @@ -14258,7 +14484,7 @@ msgstr "%s...%s: ingen sammanslagningsbas" msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:532 builtin/grep.c:682 +#: builtin/diff.c:532 builtin/grep.c:684 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." @@ -14278,32 +14504,32 @@ msgstr "ej hanterat objekt \"%s\" angavs." msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s: flera sammanslagningsbaser, använder %s" -#: builtin/difftool.c:30 +#: builtin/difftool.c:31 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" "git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]" -#: builtin/difftool.c:260 +#: builtin/difftool.c:261 #, c-format msgid "failed: %d" msgstr "misslyckades: %d" -#: builtin/difftool.c:302 +#: builtin/difftool.c:303 #, c-format msgid "could not read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/difftool.c:304 +#: builtin/difftool.c:305 #, c-format msgid "could not read symlink file %s" msgstr "kunde inte läsa symbolisk länk-fil %s" -#: builtin/difftool.c:312 +#: builtin/difftool.c:313 #, c-format msgid "could not read object %s for symlink %s" msgstr "kunde inte läsa objektet %s för symboliska länken %s" -#: builtin/difftool.c:412 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -14311,53 +14537,53 @@ msgstr "" "kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n" "katalogdiffläge (\"-d\" och \"--dir-diff\")." -#: builtin/difftool.c:633 +#: builtin/difftool.c:637 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "bägge filerna ändrade: \"%s\" och \"%s\"." -#: builtin/difftool.c:635 +#: builtin/difftool.c:639 msgid "working tree file has been left." msgstr "filen i arbetskatalogen lämnades kvar." -#: builtin/difftool.c:646 +#: builtin/difftool.c:650 #, c-format msgid "temporary files exist in '%s'." msgstr "temporära filer finns i \"%s\"." -#: builtin/difftool.c:647 +#: builtin/difftool.c:651 msgid "you may want to cleanup or recover these." msgstr "du kanske vill städa eller rädda dem." -#: builtin/difftool.c:696 +#: builtin/difftool.c:700 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "använd \"diff.guitool\" istället för \"diff.tool\"" -#: builtin/difftool.c:698 +#: builtin/difftool.c:702 msgid "perform a full-directory diff" msgstr "utför diff för hela katalogen" -#: builtin/difftool.c:700 +#: builtin/difftool.c:704 msgid "do not prompt before launching a diff tool" msgstr "fråga inte vid start av diff-verktyg" -#: builtin/difftool.c:705 +#: builtin/difftool.c:709 msgid "use symlinks in dir-diff mode" msgstr "använd symboliska länkar i katalogdiffläge" -#: builtin/difftool.c:706 +#: builtin/difftool.c:710 msgid "tool" msgstr "verktyg" -#: builtin/difftool.c:707 +#: builtin/difftool.c:711 msgid "use the specified diff tool" msgstr "använd angivet diff-verktyg" -#: builtin/difftool.c:709 +#: builtin/difftool.c:713 msgid "print a list of diff tools that may be used with `--tool`" msgstr "visa en lista över diff-verktyg som kan användas med \"--tool\"" -#: builtin/difftool.c:712 +#: builtin/difftool.c:716 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -14365,31 +14591,31 @@ msgstr "" "låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde " "skilt från noll" -#: builtin/difftool.c:715 +#: builtin/difftool.c:719 msgid "specify a custom command for viewing diffs" msgstr "ange eget kommando för att visa diffar" -#: builtin/difftool.c:716 +#: builtin/difftool.c:720 msgid "passed to `diff`" msgstr "sändes till \"diff\"" -#: builtin/difftool.c:731 +#: builtin/difftool.c:735 msgid "difftool requires worktree or --no-index" msgstr "difftool kräver en arbetskatalog eller --no-index" -#: builtin/difftool.c:738 +#: builtin/difftool.c:742 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff är inkompatibelt med --no-index" -#: builtin/difftool.c:741 +#: builtin/difftool.c:745 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande" -#: builtin/difftool.c:749 +#: builtin/difftool.c:753 msgid "no <tool> given for --tool=<tool>" msgstr "inget <verktyg> angavs för --tool=<verktyg>" -#: builtin/difftool.c:756 +#: builtin/difftool.c:760 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "inget <kommando> angavs för --extcmd=<kommando>" @@ -14481,7 +14707,7 @@ msgstr "använd done-funktionen för att avsluta strömmen" msgid "skip output of blob data" msgstr "hoppa över skrivning av blob-data" -#: builtin/fast-export.c:1222 builtin/log.c:1815 +#: builtin/fast-export.c:1222 builtin/log.c:1823 msgid "refspec" msgstr "referensspecifikation" @@ -14571,97 +14797,103 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:120 +#: builtin/fetch.c:122 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel kan inte vara negativt" -#: builtin/fetch.c:143 builtin/pull.c:185 +#: builtin/fetch.c:145 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:145 builtin/pull.c:245 +#: builtin/fetch.c:147 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "ställ in uppström för git pull/fetch" -#: builtin/fetch.c:147 builtin/pull.c:188 +#: builtin/fetch.c:149 builtin/pull.c:188 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:149 +#: builtin/fetch.c:151 msgid "use atomic transaction to update references" msgstr "använd atomiska transaktioner för att uppdatera referenser" -#: builtin/fetch.c:151 builtin/pull.c:191 +#: builtin/fetch.c:153 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:152 +#: builtin/fetch.c:154 msgid "force overwrite of local reference" msgstr "tvinga överskrivning av lokal referens" -#: builtin/fetch.c:154 +#: builtin/fetch.c:156 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:156 builtin/pull.c:195 +#: builtin/fetch.c:158 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:158 +#: builtin/fetch.c:160 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:160 +#: builtin/fetch.c:162 msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:162 builtin/pull.c:198 +#: builtin/fetch.c:164 +msgid "modify the refspec to place all refs within refs/prefetch/" +msgstr "" +"modifiera referensspecifikationen så att alla referenser hamnar i refs/" +"prefetch/" + +#: builtin/fetch.c:166 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:164 +#: builtin/fetch.c:168 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:165 builtin/fetch.c:190 builtin/pull.c:122 +#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:166 +#: builtin/fetch.c:170 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:171 +#: builtin/fetch.c:175 msgid "write fetched references to the FETCH_HEAD file" msgstr "skriv hämtade referenser till FETCH_HEAD-filen" -#: builtin/fetch.c:172 builtin/pull.c:206 +#: builtin/fetch.c:176 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:174 +#: builtin/fetch.c:178 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209 +#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209 #: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:179 builtin/pull.c:212 +#: builtin/fetch.c:183 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "fördjupa historik för grund klon baserad på tid" -#: builtin/fetch.c:185 builtin/pull.c:221 +#: builtin/fetch.c:189 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:188 +#: builtin/fetch.c:192 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:191 +#: builtin/fetch.c:195 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -14669,98 +14901,102 @@ msgstr "" "standard för rekursiv hämtning av undermoduler (lägre prioritet än " "konfigurationsfiler)" -#: builtin/fetch.c:195 builtin/pull.c:224 +#: builtin/fetch.c:199 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:196 builtin/pull.c:226 +#: builtin/fetch.c:200 builtin/pull.c:226 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:197 builtin/pull.c:227 +#: builtin/fetch.c:201 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:204 builtin/pull.c:240 +#: builtin/fetch.c:208 builtin/pull.c:240 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:207 builtin/fetch.c:209 +#: builtin/fetch.c:210 +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" +msgstr "hämta inte paketfil; skriv istället förfäder till förhandlingstips" + +#: builtin/fetch.c:213 builtin/fetch.c:215 msgid "run 'maintenance --auto' after fetching" msgstr "kör \"maintenance --auto\" efter hämtning" -#: builtin/fetch.c:211 builtin/pull.c:243 +#: builtin/fetch.c:217 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar" -#: builtin/fetch.c:213 +#: builtin/fetch.c:219 msgid "write the commit-graph after fetching" msgstr "skriv incheckingsgrafen efter hämtning" -#: builtin/fetch.c:215 +#: builtin/fetch.c:221 msgid "accept refspecs from stdin" msgstr "ta emot referenser från standard in" -#: builtin/fetch.c:526 +#: builtin/fetch.c:586 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:697 +#: builtin/fetch.c:757 #, 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:796 +#: builtin/fetch.c:856 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:800 +#: builtin/fetch.c:860 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901 +#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:814 +#: builtin/fetch.c:874 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:824 +#: builtin/fetch.c:884 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884 -#: builtin/fetch.c:896 +#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944 +#: builtin/fetch.c:956 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:829 +#: builtin/fetch.c:889 msgid "would clobber existing tag" msgstr "skulle skriva över befintlig tagg" -#: builtin/fetch.c:851 +#: builtin/fetch.c:911 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:854 +#: builtin/fetch.c:914 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:857 +#: builtin/fetch.c:917 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:896 +#: builtin/fetch.c:956 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:901 +#: builtin/fetch.c:961 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:1005 +#: builtin/fetch.c:1065 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -14771,7 +15007,7 @@ msgstr "" "av. För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n" "\"git config fetch.showForcedUpdates true\"." -#: builtin/fetch.c:1009 +#: builtin/fetch.c:1069 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14784,22 +15020,22 @@ msgstr "" "showForcedUpdates\n" "false\" för att undvika testet.\n" -#: builtin/fetch.c:1041 +#: builtin/fetch.c:1101 #, 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:1069 +#: builtin/fetch.c:1129 #, 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:1146 builtin/fetch.c:1297 +#: builtin/fetch.c:1206 builtin/fetch.c:1357 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1228 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -14808,56 +15044,56 @@ 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:1267 +#: builtin/fetch.c:1327 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:1268 +#: builtin/fetch.c:1328 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:1300 +#: builtin/fetch.c:1360 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:1301 builtin/remote.c:1118 +#: builtin/fetch.c:1361 builtin/remote.c:1118 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:1324 +#: builtin/fetch.c:1384 #, 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:1343 +#: builtin/fetch.c:1403 #, 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:1346 +#: builtin/fetch.c:1406 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1558 +#: builtin/fetch.c:1618 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream" -#: builtin/fetch.c:1573 +#: builtin/fetch.c:1633 msgid "not setting upstream for a remote remote-tracking branch" msgstr "ställer inte in uppströmsgren för en fjärrspårande gren på fjärren" -#: builtin/fetch.c:1575 +#: builtin/fetch.c:1635 msgid "not setting upstream for a remote tag" msgstr "ställer inte in uppström för en fjärrtag" -#: builtin/fetch.c:1577 +#: builtin/fetch.c:1637 msgid "unknown branch type" msgstr "okänd grentyp" -#: builtin/fetch.c:1579 +#: builtin/fetch.c:1639 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -14865,22 +15101,22 @@ msgstr "" "hittade ingen källgren.\n" "du måste ange exakt en gren med flaggan --set-upstream." -#: builtin/fetch.c:1708 builtin/fetch.c:1771 +#: builtin/fetch.c:1768 builtin/fetch.c:1831 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101 +#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1790 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "kunde inte hämta \"%s\" (felkod: %d)\n" -#: builtin/fetch.c:1834 +#: builtin/fetch.c:1894 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -14888,44 +15124,52 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar ska hämtas från." -#: builtin/fetch.c:1870 +#: builtin/fetch.c:1930 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1935 +#: builtin/fetch.c:1995 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1937 +#: builtin/fetch.c:1997 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1942 +#: builtin/fetch.c:2002 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1944 +#: builtin/fetch.c:2004 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1961 +#: builtin/fetch.c:2021 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1963 +#: builtin/fetch.c:2023 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1972 +#: builtin/fetch.c:2032 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1979 +#: builtin/fetch.c:2039 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" -#: builtin/fetch.c:1997 +#: builtin/fetch.c:2055 +msgid "must supply remote when using --negotiate-only" +msgstr "måste ange fjärr när --negotiate-only anges" + +#: builtin/fetch.c:2060 +msgid "Protocol does not support --negotiate-only, exiting." +msgstr "Protokollet stöder inte --negotiate-only, avslutar." + +#: builtin/fetch.c:2079 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -14933,11 +15177,11 @@ msgstr "" "--filter kan endast användas med fjärren konfigurerad i extensions." "partialclone" -#: builtin/fetch.c:2001 +#: builtin/fetch.c:2083 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic kan bara användas vid hämtning från en fjärr" -#: builtin/fetch.c:2005 +#: builtin/fetch.c:2087 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin kan bara användas vid hämtning fårn en fjärr" @@ -14985,47 +15229,47 @@ msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "" "git for-each-ref [--contains [<incheckning>]] [--no-contains [<incheckning>]]" -#: builtin/for-each-ref.c:28 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for shells" msgstr "citera platshållare passande för skal" -#: builtin/for-each-ref.c:30 +#: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for perl" msgstr "citera platshållare passande för perl" -#: builtin/for-each-ref.c:32 +#: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for python" msgstr "citera platshållare passande för python" -#: builtin/for-each-ref.c:34 +#: builtin/for-each-ref.c:36 msgid "quote placeholders suitably for Tcl" msgstr "citera platshållare passande för Tcl" -#: builtin/for-each-ref.c:37 +#: builtin/for-each-ref.c:39 msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:39 builtin/tag.c:472 +#: builtin/for-each-ref.c:41 builtin/tag.c:483 msgid "respect format colors" msgstr "använd formatfärger" -#: builtin/for-each-ref.c:42 +#: builtin/for-each-ref.c:44 msgid "print only refs which points at the given object" msgstr "visa endast referenser som pekar på objektet" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:46 msgid "print only refs that are merged" msgstr "visa endast referenser som slagits samman" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:47 msgid "print only refs that are not merged" msgstr "visa endast referenser som ej slagits samman" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:48 msgid "print only refs which contain the commit" msgstr "visa endast referenser som innehåller incheckningen" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:49 msgid "print only refs which don't contain the commit" msgstr "visa endast referenser som inte innehåller incheckningen" @@ -15045,32 +15289,32 @@ msgstr "konfigurationsnyckel som innehåller en lista över arkivsökvägar" msgid "missing --config=<config>" msgstr "saknar --config=<konfig>" -#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131 +#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128 msgid "unknown" msgstr "okänd" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:83 builtin/fsck.c:103 +#: builtin/fsck.c:78 builtin/fsck.c:100 #, 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:97 +#: builtin/fsck.c:94 #, c-format msgid "warning in %s %s: %s" msgstr "varning i %s %s: %s" -#: builtin/fsck.c:126 builtin/fsck.c:129 +#: builtin/fsck.c:123 builtin/fsck.c:126 #, c-format msgid "broken link from %7s %s" msgstr "trasig länk från %7s %s" -#: builtin/fsck.c:138 +#: builtin/fsck.c:135 msgid "wrong object type in link" msgstr "fel objekttyp i länk" -#: builtin/fsck.c:154 +#: builtin/fsck.c:151 #, c-format msgid "" "broken link from %7s %s\n" @@ -15079,215 +15323,215 @@ msgstr "" "trasig länk från %7s %s\n" " till %7s %s" -#: builtin/fsck.c:265 +#: builtin/fsck.c:263 #, c-format msgid "missing %s %s" msgstr "saknat %s %s" -#: builtin/fsck.c:292 +#: builtin/fsck.c:290 #, c-format msgid "unreachable %s %s" msgstr "onåbart %s %s" -#: builtin/fsck.c:312 +#: builtin/fsck.c:310 #, c-format msgid "dangling %s %s" msgstr "hängande %s %s" -#: builtin/fsck.c:322 +#: builtin/fsck.c:320 msgid "could not create lost-found" msgstr "kunde inte skapa lost-found" -#: builtin/fsck.c:333 +#: builtin/fsck.c:331 #, c-format msgid "could not finish '%s'" msgstr "kunde inte avsluta \"%s\"" -#: builtin/fsck.c:350 +#: builtin/fsck.c:348 #, 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:388 +#: builtin/fsck.c:386 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Kontrollerar konnektivitet (%d objekt)" -#: builtin/fsck.c:407 +#: builtin/fsck.c:405 #, c-format msgid "Checking %s %s" msgstr "Kontrollerar %s %s" -#: builtin/fsck.c:412 +#: builtin/fsck.c:410 msgid "broken links" msgstr "trasiga länkar" -#: builtin/fsck.c:421 +#: builtin/fsck.c:419 #, c-format msgid "root %s" msgstr "roten %s" -#: builtin/fsck.c:429 +#: builtin/fsck.c:427 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "taggad %s %s (%s) i %s" -#: builtin/fsck.c:458 +#: builtin/fsck.c:456 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: objekt trasigt eller saknas" -#: builtin/fsck.c:483 +#: builtin/fsck.c:481 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: ogiltig reflog-post %s" -#: builtin/fsck.c:497 +#: builtin/fsck.c:495 #, c-format msgid "Checking reflog %s->%s" msgstr "Kontrollerar reflog %s->%s" -#: builtin/fsck.c:531 +#: builtin/fsck.c:529 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: ogiltig sha1-pekare %s" -#: builtin/fsck.c:538 +#: builtin/fsck.c:536 #, c-format msgid "%s: not a commit" msgstr "%s: inte en incheckning!" -#: builtin/fsck.c:592 +#: builtin/fsck.c:590 msgid "notice: No default references" msgstr "obs: Inga förvalda referenser" -#: builtin/fsck.c:607 +#: builtin/fsck.c:605 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: objektet trasigt eller saknas: %s" -#: builtin/fsck.c:620 +#: builtin/fsck.c:618 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: objektet kunde inte tolkas: %s" -#: builtin/fsck.c:640 +#: builtin/fsck.c:638 #, c-format msgid "bad sha1 file: %s" msgstr "ogiltig sha1-fil: %s" -#: builtin/fsck.c:655 +#: builtin/fsck.c:653 msgid "Checking object directory" msgstr "Kontrollerar objektkatalog" -#: builtin/fsck.c:658 +#: builtin/fsck.c:656 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:673 +#: builtin/fsck.c:671 #, c-format msgid "Checking %s link" msgstr "Kontrollerar %s-länk" -#: builtin/fsck.c:678 builtin/index-pack.c:865 +#: builtin/fsck.c:676 builtin/index-pack.c:866 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/fsck.c:685 +#: builtin/fsck.c:683 #, c-format msgid "%s points to something strange (%s)" msgstr "%s pekar på något konstigt (%s)" -#: builtin/fsck.c:691 +#: builtin/fsck.c:689 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: frånkopplat HEAD pekar på ingenting" -#: builtin/fsck.c:695 +#: builtin/fsck.c:693 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "obs: %s pekar på en ofödd gren (%s)" -#: builtin/fsck.c:707 +#: builtin/fsck.c:705 msgid "Checking cache tree" msgstr "Kontrollerar cacheträd" -#: builtin/fsck.c:712 +#: builtin/fsck.c:710 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: ogiltig sha1-pekare i cacheträd" -#: builtin/fsck.c:721 +#: builtin/fsck.c:719 msgid "non-tree in cache-tree" msgstr "icke-träd i cacheträd" -#: builtin/fsck.c:752 +#: builtin/fsck.c:750 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:758 +#: builtin/fsck.c:756 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:759 +#: builtin/fsck.c:757 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:760 +#: builtin/fsck.c:758 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:761 +#: builtin/fsck.c:759 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:762 +#: builtin/fsck.c:760 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:763 +#: builtin/fsck.c:761 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:764 +#: builtin/fsck.c:762 msgid "also consider packs and alternate objects" msgstr "ta även hänsyn till paket och supplerande objekt" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:765 +#: builtin/fsck.c:763 msgid "check only connectivity" msgstr "kontrollera endast konnektivitet" -#: builtin/fsck.c:766 builtin/mktag.c:78 +#: builtin/fsck.c:764 builtin/mktag.c:75 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:768 +#: builtin/fsck.c:766 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:769 builtin/prune.c:134 +#: builtin/fsck.c:767 builtin/prune.c:134 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:770 +#: builtin/fsck.c:768 msgid "show verbose names for reachable objects" msgstr "visa ordrika namn för nåbara objekt" -#: builtin/fsck.c:829 builtin/index-pack.c:261 +#: builtin/fsck.c:827 builtin/index-pack.c:262 msgid "Checking objects" msgstr "Kontrollerar objekt" -#: builtin/fsck.c:857 +#: builtin/fsck.c:855 #, c-format msgid "%s: object missing" msgstr "%s: objekt saknas" -#: builtin/fsck.c:868 +#: builtin/fsck.c:866 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "ogiltig parameter: förväntade sha1, fick \"%s\"" @@ -15306,12 +15550,12 @@ msgstr "Misslyckades ta status (fstat) på %s: %s" msgid "failed to parse '%s' value '%s'" msgstr "misslyckades tolka \"%s\" värde \"%s\"" -#: builtin/gc.c:487 builtin/init-db.c:58 +#: builtin/gc.c:487 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562 +#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" @@ -15410,146 +15654,146 @@ msgstr "okänt argument för --schedule, %s" msgid "failed to write commit-graph" msgstr "kunde inte skriva incheckningsgraf" -#: builtin/gc.c:914 -msgid "failed to fill remotes" -msgstr "kunde inte fylla fjärrar" +#: builtin/gc.c:905 +msgid "failed to prefetch remotes" +msgstr "kunde inte förhämta fjärrar" -#: builtin/gc.c:1037 +#: builtin/gc.c:1022 msgid "failed to start 'git pack-objects' process" msgstr "kunde inte starta \"git pack-objects\"-process" -#: builtin/gc.c:1054 +#: builtin/gc.c:1039 msgid "failed to finish 'git pack-objects' process" msgstr "kunde inte avsluta \"git pack-objects\"-process" -#: builtin/gc.c:1106 +#: builtin/gc.c:1091 msgid "failed to write multi-pack-index" msgstr "kunde inte skriva multi-pack-index" -#: builtin/gc.c:1124 +#: builtin/gc.c:1109 msgid "'git multi-pack-index expire' failed" msgstr "\"git multi-pack-index expire\" misslyckades" -#: builtin/gc.c:1185 +#: builtin/gc.c:1170 msgid "'git multi-pack-index repack' failed" msgstr "\"git multi-pack-index repack\" misslyckades" -#: builtin/gc.c:1194 +#: builtin/gc.c:1179 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "" "hoppar över \"incremental-repack\"-uppgift eftersom core.multiPackIndex är " "inaktiverat" -#: builtin/gc.c:1298 +#: builtin/gc.c:1283 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "låsfilen \"%s\" finns, hoppar över underhåll" -#: builtin/gc.c:1328 +#: builtin/gc.c:1313 #, c-format msgid "task '%s' failed" msgstr "uppgiften \"%s\" misslyckades" -#: builtin/gc.c:1410 +#: builtin/gc.c:1395 #, c-format msgid "'%s' is not a valid task" msgstr "\"%s\" är inte en giltig uppgift" -#: builtin/gc.c:1415 +#: builtin/gc.c:1400 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "uppgiften \"%s\" kan inte väljas flera gånger" -#: builtin/gc.c:1430 +#: builtin/gc.c:1415 msgid "run tasks based on the state of the repository" msgstr "kör uppgifter baserad på arkivets tillstånd" -#: builtin/gc.c:1431 +#: builtin/gc.c:1416 msgid "frequency" msgstr "frekvens" -#: builtin/gc.c:1432 +#: builtin/gc.c:1417 msgid "run tasks based on frequency" msgstr "kör uppgifter baserat på frekvens" -#: builtin/gc.c:1435 +#: builtin/gc.c:1420 msgid "do not report progress or other information over stderr" msgstr "rapportera inte framgång eller annan information över standard fel" -#: builtin/gc.c:1436 +#: builtin/gc.c:1421 msgid "task" msgstr "uppgift" -#: builtin/gc.c:1437 +#: builtin/gc.c:1422 msgid "run a specific task" msgstr "utför en specifik uppgift" -#: builtin/gc.c:1454 +#: builtin/gc.c:1439 msgid "use at most one of --auto and --schedule=<frequency>" msgstr "använd som mest en av --auto och --schedule=<frekvens>" -#: builtin/gc.c:1497 +#: builtin/gc.c:1482 msgid "failed to run 'git config'" msgstr "misslyckades köra \"git config\"" -#: builtin/gc.c:1562 +#: builtin/gc.c:1547 #, c-format msgid "failed to expand path '%s'" msgstr "misslyckades expandera sökvägen \"%s\"" -#: builtin/gc.c:1591 +#: builtin/gc.c:1576 msgid "failed to start launchctl" msgstr "misslyckades starta launchctl" -#: builtin/gc.c:1628 +#: builtin/gc.c:1613 #, c-format msgid "failed to create directories for '%s'" msgstr "misslyckades skapa kataloger för \"%s\"" -#: builtin/gc.c:1689 +#: builtin/gc.c:1674 #, c-format msgid "failed to bootstrap service %s" msgstr "misslyckades starta tjänsten %s" -#: builtin/gc.c:1760 +#: builtin/gc.c:1745 msgid "failed to create temp xml file" msgstr "misslyckades skapa temporär xml-fil" -#: builtin/gc.c:1850 +#: builtin/gc.c:1835 msgid "failed to start schtasks" msgstr "misslyckades starta schtasks" -#: builtin/gc.c:1894 +#: builtin/gc.c:1879 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" "kunde inte köra \"crontab -l\"; ditt system kanske inte stöder \"cron\"" -#: builtin/gc.c:1911 +#: builtin/gc.c:1896 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "kunde inte köra \"crontab\"; ditt system kanske inte stöder \"cron\"" -#: builtin/gc.c:1915 +#: builtin/gc.c:1900 msgid "failed to open stdin of 'crontab'" msgstr "misslyckades öppna standard in för \"crontab\"" -#: builtin/gc.c:1956 +#: builtin/gc.c:1942 msgid "'crontab' died" msgstr "\"crontab\" dog" -#: builtin/gc.c:1990 +#: builtin/gc.c:1976 msgid "another process is scheduling background maintenance" msgstr "en annan process schemalägger bakgrundsunderhåll" -#: builtin/gc.c:2009 +#: builtin/gc.c:2000 msgid "failed to add repo to global config" msgstr "misslyckades lägga till arkiv till global konfiguration" -#: builtin/gc.c:2019 +#: builtin/gc.c:2010 msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <underkommando> [<flaggor>]" -#: builtin/gc.c:2038 +#: builtin/gc.c:2029 #, c-format msgid "invalid subcommand: %s" msgstr "felaktigt underkommando: %s" @@ -15572,258 +15816,258 @@ msgstr "felaktigt antal trådar angivet (%d) för %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808 -#: builtin/pack-objects.c:2944 +#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793 +#: builtin/pack-objects.c:2969 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641 +#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:656 +#: builtin/grep.c:658 #, c-format msgid "unable to grep from object of type %s" msgstr "kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:737 +#: builtin/grep.c:739 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:836 +#: builtin/grep.c:838 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:838 +#: builtin/grep.c:840 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:840 +#: builtin/grep.c:842 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:842 +#: builtin/grep.c:844 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:844 +#: builtin/grep.c:846 msgid "recursively search in each submodule" msgstr "sök varje undermodul rekursivt" -#: builtin/grep.c:847 +#: builtin/grep.c:849 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:851 +#: builtin/grep.c:853 msgid "match patterns only at word boundaries" msgstr "träffa endast mönster vid ordgränser" -#: builtin/grep.c:853 +#: builtin/grep.c:855 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:858 +#: builtin/grep.c:860 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "search in subdirectories (default)" msgstr "sök i underkataloger (standard)" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:866 +#: builtin/grep.c:868 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:869 +#: builtin/grep.c:871 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:872 +#: builtin/grep.c:874 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:875 +#: builtin/grep.c:877 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:878 +#: builtin/grep.c:880 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:879 +#: builtin/grep.c:881 msgid "show column number of first match" msgstr "visa kolumnnummer för första träff" -#: builtin/grep.c:880 +#: builtin/grep.c:882 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:881 +#: builtin/grep.c:883 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:883 +#: builtin/grep.c:885 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:885 +#: builtin/grep.c:887 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:890 +#: builtin/grep.c:892 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:892 +#: builtin/grep.c:894 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:895 +#: builtin/grep.c:897 msgid "show only matching parts of a line" msgstr "visa endast träffade delar av rader" -#: builtin/grep.c:897 +#: builtin/grep.c:899 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:898 +#: builtin/grep.c:900 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:900 +#: builtin/grep.c:902 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:902 +#: builtin/grep.c:904 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:905 +#: builtin/grep.c:907 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:908 +#: builtin/grep.c:910 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:910 +#: builtin/grep.c:912 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:912 +#: builtin/grep.c:914 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:913 +#: builtin/grep.c:915 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:916 +#: builtin/grep.c:918 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:918 +#: builtin/grep.c:920 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:921 +#: builtin/grep.c:923 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:923 +#: builtin/grep.c:925 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:925 +#: builtin/grep.c:927 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:937 +#: builtin/grep.c:939 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:939 +#: builtin/grep.c:941 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:942 +#: builtin/grep.c:944 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:942 +#: builtin/grep.c:944 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:946 +#: builtin/grep.c:948 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:1012 +#: builtin/grep.c:1014 msgid "no pattern given" msgstr "inget mönster angavs" -#: builtin/grep.c:1048 +#: builtin/grep.c:1050 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index och --untracked kan inte användas med revisioner" -#: builtin/grep.c:1056 +#: builtin/grep.c:1058 #, c-format msgid "unable to resolve revision: %s" msgstr "kan inte slå upp revision: %s" -#: builtin/grep.c:1086 +#: builtin/grep.c:1088 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked stöds inte med --recurse-submodules" -#: builtin/grep.c:1090 +#: builtin/grep.c:1092 msgid "invalid option combination, ignoring --threads" msgstr "ogiltig kombination av flaggor, ignorerar --threads" -#: builtin/grep.c:1093 builtin/pack-objects.c:3672 +#: builtin/grep.c:1095 builtin/pack-objects.c:3930 msgid "no threads support, ignoring --threads" msgstr "trådstöd saknas, ignorerar --threads" -#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941 +#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:1130 +#: builtin/grep.c:1132 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1156 +#: builtin/grep.c:1158 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached och --untracked kan inte användas med --no-index" -#: builtin/grep.c:1159 +#: builtin/grep.c:1161 msgid "--untracked cannot be used with --cached" msgstr "--untracked kan inte användas med --cached" -#: builtin/grep.c:1165 +#: builtin/grep.c:1167 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:1173 +#: builtin/grep.c:1175 msgid "both --cached and trees are given" msgstr "både --cached och träd angavs" @@ -15955,12 +16199,12 @@ msgstr "ingen man-visare hanterade förfrågan" msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:520 builtin/help.c:531 git.c:340 +#: builtin/help.c:520 builtin/help.c:531 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "\"%s\" är ett alias för \"%s\"" -#: builtin/help.c:534 git.c:372 +#: builtin/help.c:534 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "felaktig alias.%s-sträng: %s" @@ -15974,396 +16218,392 @@ msgstr "användning: %s%s" msgid "'git help config' for more information" msgstr "\"git help config\" för mer information" -#: builtin/index-pack.c:221 +#: builtin/index-pack.c:222 #, c-format msgid "object type mismatch at %s" msgstr "objekttyp stämmer inte överens vid %s" -#: builtin/index-pack.c:241 +#: builtin/index-pack.c:242 #, c-format msgid "did not receive expected object %s" msgstr "emottog inte det förväntade objektet %s" -#: builtin/index-pack.c:244 +#: builtin/index-pack.c:245 #, 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:294 +#: builtin/index-pack.c:295 #, 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:304 +#: builtin/index-pack.c:305 msgid "early EOF" msgstr "tidigt filslut" -#: builtin/index-pack.c:305 +#: builtin/index-pack.c:306 msgid "read error on input" msgstr "indataläsfel" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:318 msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:324 builtin/pack-objects.c:624 +#: builtin/index-pack.c:325 builtin/pack-objects.c:624 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:327 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:328 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "paket är större än tillåten maximal storlek" -#: builtin/index-pack.c:342 +#: builtin/index-pack.c:343 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: builtin/index-pack.c:348 +#: builtin/index-pack.c:349 #, c-format msgid "cannot open packfile '%s'" msgstr "kan inte öppna paketfilen \"%s\"" -#: builtin/index-pack.c:362 +#: builtin/index-pack.c:363 msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" -#: builtin/index-pack.c:364 +#: builtin/index-pack.c:365 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stöds ej" -#: builtin/index-pack.c:382 +#: builtin/index-pack.c:383 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s" -#: builtin/index-pack.c:488 +#: builtin/index-pack.c:489 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:537 +#: builtin/index-pack.c:538 msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" -#: builtin/index-pack.c:545 +#: builtin/index-pack.c:546 msgid "delta base offset is out of bound" msgstr "deltabasindex utanför gränsen" -#: builtin/index-pack.c:553 +#: builtin/index-pack.c:554 #, c-format msgid "unknown object type %d" msgstr "okänd objekttyp %d" -#: builtin/index-pack.c:584 +#: builtin/index-pack.c:585 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: builtin/index-pack.c:586 +#: builtin/index-pack.c:587 #, 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:612 +#: builtin/index-pack.c:613 msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 -#: builtin/index-pack.c:826 builtin/index-pack.c:835 +#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788 +#: builtin/index-pack.c:827 builtin/index-pack.c:836 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/index-pack.c:761 builtin/pack-objects.c:171 #: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:825 #, c-format msgid "cannot read existing object info %s" msgstr "kan inte läsa information om befintligt objekt %s" -#: builtin/index-pack.c:832 +#: builtin/index-pack.c:833 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:846 +#: builtin/index-pack.c:847 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:849 builtin/index-pack.c:868 +#: builtin/index-pack.c:850 builtin/index-pack.c:869 msgid "fsck error in packed object" msgstr "fsck-fel i packat objekt" -#: builtin/index-pack.c:870 +#: builtin/index-pack.c:871 #, 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:931 builtin/index-pack.c:978 +#: builtin/index-pack.c:932 builtin/index-pack.c:979 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c:1162 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c:1162 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1196 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1200 +#: builtin/index-pack.c:1201 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1203 +#: builtin/index-pack.c:1204 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1215 +#: builtin/index-pack.c:1216 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1238 +#: builtin/index-pack.c:1239 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707 +#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1282 +#: builtin/index-pack.c:1283 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1288 +#: builtin/index-pack.c:1289 #, 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:1300 +#: builtin/index-pack.c:1301 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1304 +#: builtin/index-pack.c:1305 #, 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:1328 +#: builtin/index-pack.c:1329 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1424 +#: builtin/index-pack.c:1425 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1445 +#: builtin/index-pack.c:1446 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "paketfilnamnet \"%s\" slutar inte med \".%s\"" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1470 #, c-format msgid "cannot write %s file '%s'" msgstr "kan inte ta skriva %s-fil \"%s\"" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1478 #, c-format msgid "cannot close written %s file '%s'" msgstr "kan inte stänga skriven %s-fil \"%s\"" -#: builtin/index-pack.c:1503 +#: builtin/index-pack.c:1504 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1517 +#: builtin/index-pack.c:1518 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1526 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1534 -msgid "cannot store reverse index file" -msgstr "kan inte spara reverse-index-fil" - -#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952 +#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1650 +#: builtin/index-pack.c:1651 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1652 +#: builtin/index-pack.c:1653 #, 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:1700 +#: builtin/index-pack.c:1701 #, 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:1707 +#: builtin/index-pack.c:1708 #, 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:1765 +#: builtin/index-pack.c:1750 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1819 builtin/index-pack.c:1822 -#: builtin/index-pack.c:1838 builtin/index-pack.c:1842 +#: builtin/index-pack.c:1804 builtin/index-pack.c:1807 +#: builtin/index-pack.c:1823 builtin/index-pack.c:1827 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625 +#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613 #, c-format msgid "unknown hash algorithm '%s'" msgstr "okänd hashningsalgoritm \"%s\"" -#: builtin/index-pack.c:1867 +#: builtin/index-pack.c:1852 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1869 +#: builtin/index-pack.c:1854 msgid "--stdin requires a git repository" msgstr "--stdin kräver ett git-arkiv" -#: builtin/index-pack.c:1871 +#: builtin/index-pack.c:1856 msgid "--object-format cannot be used with --stdin" msgstr "--object-format kan inte användas med --stdin" -#: builtin/index-pack.c:1886 +#: builtin/index-pack.c:1871 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" -#: builtin/index-pack.c:1956 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "fsck-fel i packat objekt" -#: builtin/init-db.c:64 +#: builtin/init-db.c:63 #, c-format msgid "cannot stat template '%s'" msgstr "kan inte ta status på mallen \"%s\"" -#: builtin/init-db.c:69 +#: builtin/init-db.c:68 #, c-format msgid "cannot opendir '%s'" msgstr "kan inte öppna katalogen (opendir) \"%s\"" -#: builtin/init-db.c:81 +#: builtin/init-db.c:80 #, c-format msgid "cannot readlink '%s'" msgstr "kan inte läsa länk (readlink) \"%s\"" -#: builtin/init-db.c:83 +#: builtin/init-db.c:82 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\"" -#: builtin/init-db.c:89 +#: builtin/init-db.c:88 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "kan inte kopiera \"%s\" till \"%s\"" -#: builtin/init-db.c:93 +#: builtin/init-db.c:92 #, c-format msgid "ignoring template %s" msgstr "ignorerar mallen %s" -#: builtin/init-db.c:124 +#: builtin/init-db.c:123 #, c-format msgid "templates not found in %s" msgstr "mallarna hittades inte i %s" -#: builtin/init-db.c:139 +#: builtin/init-db.c:138 #, c-format msgid "not copying templates from '%s': %s" msgstr "kopierade inte mallar från \"%s\": %s" -#: builtin/init-db.c:275 +#: builtin/init-db.c:262 #, c-format msgid "invalid initial branch name: '%s'" msgstr "ogiltigt namn på första gren: \"%s\"" -#: builtin/init-db.c:367 +#: builtin/init-db.c:353 #, c-format msgid "unable to handle file type %d" msgstr "kan inte hantera filtyp %d" -#: builtin/init-db.c:370 +#: builtin/init-db.c:356 #, c-format msgid "unable to move %s to %s" msgstr "kan inte flytta %s till %s" -#: builtin/init-db.c:386 +#: builtin/init-db.c:372 msgid "attempt to reinitialize repository with different hash" msgstr "försöker initiera arkivet på nytt med annan hash" -#: builtin/init-db.c:410 builtin/init-db.c:413 +#: builtin/init-db.c:396 builtin/init-db.c:399 #, c-format msgid "%s already exists" msgstr "%s finns redan" -#: builtin/init-db.c:445 +#: builtin/init-db.c:431 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init: ignorerade --initial-branch=%s" -#: builtin/init-db.c:476 +#: builtin/init-db.c:462 #, 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:477 +#: builtin/init-db.c:463 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Ominitierade befintligt Git-arkiv i %s%s\n" -#: builtin/init-db.c:481 +#: builtin/init-db.c:467 #, 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:482 +#: builtin/init-db.c:468 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Initierade tomt Git-arkiv i %s%s\n" -#: builtin/init-db.c:531 +#: builtin/init-db.c:517 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -16371,41 +16611,41 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" "shared[=<behörigheter>]] [<katalog>]" -#: builtin/init-db.c:557 +#: builtin/init-db.c:543 msgid "permissions" msgstr "behörigheter" -#: builtin/init-db.c:558 +#: builtin/init-db.c:544 msgid "specify that the git repository is to be shared amongst several users" msgstr "ange att git-arkivet ska delas bland flera användare" -#: builtin/init-db.c:564 +#: builtin/init-db.c:550 msgid "override the name of the initial branch" msgstr "överstyr namnet på första gren" -#: builtin/init-db.c:565 builtin/verify-pack.c:74 +#: builtin/init-db.c:551 builtin/verify-pack.c:74 msgid "hash" msgstr "hash" -#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "ange hashningsalgoritm att använda" -#: builtin/init-db.c:573 +#: builtin/init-db.c:559 msgid "--separate-git-dir and --bare are mutually exclusive" msgstr "--separate-git-dir och --bare är ömsesidigt uteslutande" -#: builtin/init-db.c:602 builtin/init-db.c:607 +#: builtin/init-db.c:590 builtin/init-db.c:595 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:611 builtin/init-db.c:666 +#: builtin/init-db.c:599 builtin/init-db.c:654 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:638 +#: builtin/init-db.c:626 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -16414,12 +16654,12 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:690 +#: builtin/init-db.c:678 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" -#: builtin/init-db.c:695 +#: builtin/init-db.c:683 msgid "--separate-git-dir incompatible with bare repository" msgstr "--separatebgit-dir är inkompatibelt med naket arkiv" @@ -16471,10 +16711,6 @@ msgstr "välj tolkningsalternativ" msgid "do not treat --- specially" msgstr "tolka inte --- speciellt" -#: builtin/interpret-trailers.c:111 -msgid "trailer" -msgstr "släprad" - #: builtin/interpret-trailers.c:112 msgid "trailer(s) to add" msgstr "släprad(er) att lägga till" @@ -16537,80 +16773,80 @@ msgstr "-L<intervall>:<fil> kan inte användas med sökvägsspecifikation" msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:566 +#: builtin/log.c:568 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:581 builtin/log.c:671 +#: builtin/log.c:583 builtin/log.c:673 #, c-format msgid "could not read object %s" msgstr "kunde inte läsa objektet %s" -#: builtin/log.c:696 +#: builtin/log.c:698 #, c-format msgid "unknown type: %d" msgstr "okänd typ: %d" -#: builtin/log.c:841 +#: builtin/log.c:843 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s: ogiltigt omslag från beskrivningsläge" -#: builtin/log.c:848 +#: builtin/log.c:850 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:977 +#: builtin/log.c:979 #, c-format msgid "cannot open patch file %s" msgstr "kan inte öppna patchfilen %s" -#: builtin/log.c:994 +#: builtin/log.c:996 msgid "need exactly one range" msgstr "behöver precis ett intervall" -#: builtin/log.c:1004 +#: builtin/log.c:1006 msgid "not a range" msgstr "inte ett intervall" -#: builtin/log.c:1168 +#: builtin/log.c:1170 msgid "cover letter needs email format" msgstr "omslagsbrevet behöver e-postformat" -#: builtin/log.c:1174 +#: builtin/log.c:1176 msgid "failed to create cover-letter file" msgstr "misslyckades skapa fil för omslagsbrev" -#: builtin/log.c:1261 +#: builtin/log.c:1263 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1288 +#: builtin/log.c:1290 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1346 +#: builtin/log.c:1348 msgid "two output directories?" msgstr "två utdatakataloger?" -#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331 +#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340 #, c-format msgid "unknown commit %s" msgstr "okänd incheckning %s" -#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "misslyckades slå upp \"%s\" som en giltig referens" -#: builtin/log.c:1517 +#: builtin/log.c:1519 msgid "could not find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1527 +#: builtin/log.c:1529 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -16620,394 +16856,398 @@ msgstr "" "använd git branch --set-upstream-to för att spåra en fjärrgren.\n" "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> manuellt" -#: builtin/log.c:1550 +#: builtin/log.c:1552 msgid "failed to find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1567 +#: builtin/log.c:1569 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1577 +#: builtin/log.c:1579 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1635 +#: builtin/log.c:1637 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1692 +#: builtin/log.c:1700 msgid "failed to infer range-diff origin of current series" msgstr "misslyckades räkna ut intervalldiff-ursprung för aktuell serie" -#: builtin/log.c:1694 +#: builtin/log.c:1702 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "använd \"%s\" som intervalldiff-ursprung för aktuell serie" -#: builtin/log.c:1738 +#: builtin/log.c:1746 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:1741 +#: builtin/log.c:1749 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1745 +#: builtin/log.c:1753 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1747 +#: builtin/log.c:1755 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1749 +#: builtin/log.c:1757 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1750 +#: builtin/log.c:1758 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1751 +#: builtin/log.c:1759 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1753 +#: builtin/log.c:1761 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1755 +#: builtin/log.c:1762 +msgid "reroll-count" +msgstr "antal iterationer" + +#: builtin/log.c:1763 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1757 +#: builtin/log.c:1765 msgid "max length of output filename" msgstr "maximal längd för utdatafilnamn" -#: builtin/log.c:1759 +#: builtin/log.c:1767 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "använd [RFC PATCH] istället för [PATCH]" -#: builtin/log.c:1762 +#: builtin/log.c:1770 msgid "cover-from-description-mode" msgstr "cover-from-description-läge" -#: builtin/log.c:1763 +#: builtin/log.c:1771 msgid "generate parts of a cover letter based on a branch's description" msgstr "skapa delar av omslagsbrevet baserat på grenbeskrivelsen" -#: builtin/log.c:1765 +#: builtin/log.c:1773 msgid "use [<prefix>] instead of [PATCH]" msgstr "använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1768 +#: builtin/log.c:1776 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1771 +#: builtin/log.c:1779 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1774 +#: builtin/log.c:1782 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1776 +#: builtin/log.c:1784 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1778 +#: builtin/log.c:1786 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1780 +#: builtin/log.c:1788 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1782 +#: builtin/log.c:1790 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1783 +#: builtin/log.c:1791 msgid "header" msgstr "huvud" -#: builtin/log.c:1784 +#: builtin/log.c:1792 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1785 builtin/log.c:1786 +#: builtin/log.c:1793 builtin/log.c:1794 msgid "email" msgstr "epost" -#: builtin/log.c:1785 +#: builtin/log.c:1793 msgid "add To: header" msgstr "lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1786 +#: builtin/log.c:1794 msgid "add Cc: header" msgstr "lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1787 +#: builtin/log.c:1795 msgid "ident" msgstr "ident" -#: builtin/log.c:1788 +#: builtin/log.c:1796 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:1790 +#: builtin/log.c:1798 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1791 +#: builtin/log.c:1799 msgid "make first mail a reply to <message-id>" msgstr "gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1792 builtin/log.c:1795 +#: builtin/log.c:1800 builtin/log.c:1803 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1793 +#: builtin/log.c:1801 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1796 +#: builtin/log.c:1804 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1800 +#: builtin/log.c:1808 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1802 +#: builtin/log.c:1810 msgid "signature" msgstr "signatur" -#: builtin/log.c:1803 +#: builtin/log.c:1811 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1804 +#: builtin/log.c:1812 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1805 +#: builtin/log.c:1813 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1808 +#: builtin/log.c:1816 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1809 +#: builtin/log.c:1817 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1811 +#: builtin/log.c:1819 msgid "show progress while generating patches" msgstr "visa förloppsindikator medan patchar skapas" -#: builtin/log.c:1813 +#: builtin/log.c:1821 msgid "show changes against <rev> in cover letter or single patch" msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch" -#: builtin/log.c:1816 +#: builtin/log.c:1824 msgid "show changes against <refspec> in cover letter or single patch" msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch" -#: builtin/log.c:1818 +#: builtin/log.c:1826 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "procent som skapelse vägs med" -#: builtin/log.c:1904 +#: builtin/log.c:1913 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1919 +#: builtin/log.c:1928 msgid "-n and -k are mutually exclusive" msgstr "-n och -k kan inte användas samtidigt" -#: builtin/log.c:1921 +#: builtin/log.c:1930 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt" -#: builtin/log.c:1929 +#: builtin/log.c:1938 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1931 +#: builtin/log.c:1940 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1933 +#: builtin/log.c:1942 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1955 +#: builtin/log.c:1964 msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "--stdout, --output, och --output-directory är ömsesidigt uteslutande" -#: builtin/log.c:2078 +#: builtin/log.c:2087 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff kräver --cover-letter eller ensam patch" -#: builtin/log.c:2082 +#: builtin/log.c:2091 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:2083 +#: builtin/log.c:2092 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff mot v%d:" -#: builtin/log.c:2089 +#: builtin/log.c:2098 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor kräver --range-diff" -#: builtin/log.c:2093 +#: builtin/log.c:2102 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff kräver --cover-letter eller ensam patch" -#: builtin/log.c:2101 +#: builtin/log.c:2110 msgid "Range-diff:" msgstr "Intervall-diff:" -#: builtin/log.c:2102 +#: builtin/log.c:2111 #, c-format msgid "Range-diff against v%d:" msgstr "Intervall-diff mot v%d:" -#: builtin/log.c:2113 +#: builtin/log.c:2122 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:2149 +#: builtin/log.c:2158 msgid "Generating patches" msgstr "Skapar patchar" -#: builtin/log.c:2193 +#: builtin/log.c:2202 msgid "failed to create output files" msgstr "misslyckades skapa utdatafiler" -#: builtin/log.c:2252 +#: builtin/log.c:2261 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:2306 +#: builtin/log.c:2315 #, 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:486 +#: builtin/ls-files.c:563 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<flaggor>] [<fil>...]" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:619 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:544 +#: builtin/ls-files.c:621 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:546 +#: builtin/ls-files.c:623 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "använd små bokstäver för \"fsmonitor clean\"-filer" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:625 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:627 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:629 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:631 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:633 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:636 msgid "show staged contents' object name in the output" msgstr "visa köat innehålls objektnamn i utdata" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:638 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:563 +#: builtin/ls-files.c:640 msgid "show 'other' directories' names only" msgstr "visa endast namn för \"andra\" kataloger" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:642 msgid "show line endings of files" msgstr "visa radslut i filer" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:644 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:647 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:572 +#: builtin/ls-files.c:649 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:574 +#: builtin/ls-files.c:651 msgid "skip files matching pattern" msgstr "hoppa över filer som motsvarar mönster" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:654 msgid "exclude patterns are read from <file>" msgstr "exkludera mönster som läses från <fil>" -#: builtin/ls-files.c:580 +#: builtin/ls-files.c:657 msgid "read additional per-directory exclude patterns in <file>" msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" -#: builtin/ls-files.c:582 +#: builtin/ls-files.c:659 msgid "add the standard git exclusions" msgstr "lägg till git:s standardexkluderingar" -#: builtin/ls-files.c:586 +#: builtin/ls-files.c:663 msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:589 +#: builtin/ls-files.c:666 msgid "recurse through submodules" msgstr "rekursera ner i undermoduler" -#: builtin/ls-files.c:591 +#: builtin/ls-files.c:668 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:592 +#: builtin/ls-files.c:669 msgid "tree-ish" msgstr "träd-igt" -#: builtin/ls-files.c:593 +#: builtin/ls-files.c:670 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:595 +#: builtin/ls-files.c:672 msgid "show debugging data" msgstr "visa felsökningsutdata" -#: builtin/ls-files.c:597 +#: builtin/ls-files.c:674 msgid "suppress duplicate entries" msgstr "undertyck dublettposter" @@ -17025,7 +17265,7 @@ msgstr "" msgid "do not print remote URL" msgstr "visa inte fjärr-URL" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399 msgid "exec" msgstr "exec" @@ -17093,6 +17333,55 @@ msgstr "använd fullständiga sökvägsnamn" msgid "list entire tree; not just current directory (implies --full-name)" msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" +#. TRANSLATORS: keep <> in "<" mail ">" info. +#: builtin/mailinfo.c:14 +msgid "git mailinfo [<options>] <msg> <patch> < mail >info" +msgstr "git mailinfo [<flaggor>] <meddelande> <patch> < epost >info" + +#: builtin/mailinfo.c:58 +msgid "keep subject" +msgstr "behåll ärenderad" + +#: builtin/mailinfo.c:60 +msgid "keep non patch brackets in subject" +msgstr "behåll hakparanterser som inte är \"patch\" i ärenderaden" + +#: builtin/mailinfo.c:62 +msgid "copy Message-ID to the end of commit message" +msgstr "kopiera Message-ID till slutet av incheckningsmeddelandet" + +#: builtin/mailinfo.c:64 +msgid "re-code metadata to i18n.commitEncoding" +msgstr "koda om metadata till i18n.commmitEncoding" + +#: builtin/mailinfo.c:67 +msgid "disable charset re-coding of metadata" +msgstr "inaktivera omkodning av metadata" + +#: builtin/mailinfo.c:69 +msgid "encoding" +msgstr "teckenkodning" + +#: builtin/mailinfo.c:70 +msgid "re-code metadata to this encoding" +msgstr "omkoda metadata till denna teckenkodning" + +#: builtin/mailinfo.c:72 +msgid "use scissors" +msgstr "använd saxar" + +#: builtin/mailinfo.c:73 +msgid "<action>" +msgstr "<åtgärd>" + +#: builtin/mailinfo.c:74 +msgid "action when quoted CR is found" +msgstr "åtgärd när citerad vagnretur hittas" + +#: builtin/mailinfo.c:77 +msgid "use headers in message's body" +msgstr "använd huvuden i brevkroppen" + #: builtin/mailsplit.c:241 #, c-format msgid "empty mbox: '%s'" @@ -17287,7 +17576,7 @@ 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:278 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114 +#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114 msgid "strategy" msgstr "strategi" @@ -17344,57 +17633,57 @@ msgstr "inte ett giltigt objekt: %s" msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:399 -msgid " (nothing to squash)" -msgstr " (inget att platta till)" +#: builtin/merge.c:400 +msgid "Already up to date. (nothing to squash)" +msgstr "Redan à jour. (inget att platta till)" -#: builtin/merge.c:410 +#: builtin/merge.c:414 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:460 +#: builtin/merge.c:464 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:511 +#: builtin/merge.c:515 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:598 +#: builtin/merge.c:602 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:724 +#: builtin/merge.c:728 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:737 +#: builtin/merge.c:741 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:808 +#: builtin/merge.c:812 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:817 +#: builtin/merge.c:821 #, 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:823 +#: builtin/merge.c:827 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" @@ -17405,11 +17694,11 @@ msgstr "" "temagren.\n" "\n" -#: builtin/merge.c:828 +#: builtin/merge.c:832 msgid "An empty message aborts the commit.\n" msgstr "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/merge.c:831 +#: builtin/merge.c:835 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -17418,73 +17707,73 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:884 +#: builtin/merge.c:888 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:899 +#: builtin/merge.c:903 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:960 +#: builtin/merge.c:964 #, 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:999 +#: builtin/merge.c:1003 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:1001 +#: builtin/merge.c:1005 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:1003 +#: builtin/merge.c:1007 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:1008 +#: builtin/merge.c:1012 #, 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:1065 +#: builtin/merge.c:1069 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1168 +#: builtin/merge.c:1172 #, 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:1202 +#: builtin/merge.c:1206 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1312 +#: builtin/merge.c:1316 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1316 +#: builtin/merge.c:1320 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1334 +#: builtin/merge.c:1338 msgid "--quit expects no arguments" msgstr "--quit tar inga argument" -#: builtin/merge.c:1347 +#: builtin/merge.c:1351 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1351 +#: builtin/merge.c:1355 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1367 +#: builtin/merge.c:1371 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17492,7 +17781,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1374 +#: builtin/merge.c:1378 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17500,96 +17789,88 @@ 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:1377 +#: builtin/merge.c:1381 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:1391 +#: builtin/merge.c:1395 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1393 +#: builtin/merge.c:1397 msgid "You cannot combine --squash with --commit." msgstr "Du kan inte kombinera --squash med --commit." -#: builtin/merge.c:1409 +#: builtin/merge.c:1413 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1426 +#: builtin/merge.c:1430 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1428 +#: builtin/merge.c:1432 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:1433 +#: builtin/merge.c:1437 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1435 +#: builtin/merge.c:1439 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:1516 +#: builtin/merge.c:1520 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1525 -msgid "Already up to date." -msgstr "Redan à jour." - -#: builtin/merge.c:1535 +#: builtin/merge.c:1539 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1581 +#: builtin/merge.c:1585 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1588 +#: builtin/merge.c:1592 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1613 -msgid "Already up to date. Yeeah!" -msgstr "Redan à jour. Toppen!" - -#: builtin/merge.c:1619 +#: builtin/merge.c:1623 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1647 builtin/merge.c:1712 +#: builtin/merge.c:1651 builtin/merge.c:1716 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1651 +#: builtin/merge.c:1655 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1703 +#: builtin/merge.c:1707 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1705 +#: builtin/merge.c:1709 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1714 +#: builtin/merge.c:1718 #, 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:1728 +#: builtin/merge.c:1732 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -17599,40 +17880,40 @@ msgstr "" msgid "git mktag" msgstr "git mktag" -#: builtin/mktag.c:30 +#: builtin/mktag.c:27 #, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "varning: taggindata godkänns inte av fsck: %s" -#: builtin/mktag.c:41 +#: builtin/mktag.c:38 #, c-format msgid "error: tag input does not pass fsck: %s" msgstr "fel: taggindata godkänns inte av fsck: %s" -#: builtin/mktag.c:44 +#: builtin/mktag.c:41 #, c-format msgid "%d (FSCK_IGNORE?) should never trigger this callback" msgstr "%d (FSCK_IGNORE?) skulle aldrig utlösa detta återanrop" -#: builtin/mktag.c:59 +#: builtin/mktag.c:56 #, c-format msgid "could not read tagged object '%s'" msgstr "kunde inte läsa det taggade objektet \"%s\"" -#: builtin/mktag.c:62 +#: builtin/mktag.c:59 #, c-format msgid "object '%s' tagged as '%s', but is a '%s' type" msgstr "objektet \"%s\" taggat som \"%s\", men är av typen \"%s\"" -#: builtin/mktag.c:99 +#: builtin/mktag.c:97 msgid "tag on stdin did not pass our strict fsck check" msgstr "tagg på stdin godkänns inte av vår strikta fsck-kontroll" -#: builtin/mktag.c:102 +#: builtin/mktag.c:100 msgid "tag on stdin did not refer to a valid object" msgstr "taggen på stdin pekar inte på ett giltigt objekt" -#: builtin/mktag.c:105 builtin/tag.c:232 +#: builtin/mktag.c:103 builtin/tag.c:243 msgid "unable to write tag file" msgstr "kunde inte skriva tagg-filen" @@ -17652,38 +17933,43 @@ msgstr "tillåt saknade objekt" msgid "allow creation of more than one tree" msgstr "tillåt skapa mer än ett träd" -#: builtin/multi-pack-index.c:9 -msgid "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<size>)" -msgstr "" -"git multi-pack-index [<flaggor>] (write|verify|expire|repack --batch-" -"size=<storlek>)" +#: builtin/multi-pack-index.c:10 +msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]" +msgstr "git multi-pack-index [<flaggor>] write [--preferred-pack=<paket>]" + +#: builtin/multi-pack-index.c:13 +msgid "git multi-pack-index [<options>] verify" +msgstr "git multi-pack-index [<flaggor>] verify" -#: builtin/multi-pack-index.c:26 +#: builtin/multi-pack-index.c:16 +msgid "git multi-pack-index [<options>] expire" +msgstr "git multi-pack-index [<flaggor>] expire" + +#: builtin/multi-pack-index.c:19 +msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]" +msgstr "git multi-pack-index [<flaggor>] repack [--batch-size=<storlek>]" + +#: builtin/multi-pack-index.c:54 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:29 +#: builtin/multi-pack-index.c:69 +msgid "preferred-pack" +msgstr "föredraget paket" + +#: builtin/multi-pack-index.c:70 +msgid "pack for reuse when computing a multi-pack bitmap" +msgstr "paket att återanvända vid beräkning av multipaketsbitkarta" + +#: builtin/multi-pack-index.c:128 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" msgstr "" "vid ompackning, samla mindre paketfiler i en bunt som är större än denna " -"storlekt" - -#: builtin/multi-pack-index.c:50 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 builtin/prune-packed.c:25 builtin/tag.c:575 -msgid "too many arguments" -msgstr "för många argument" +"storlek" -#: builtin/multi-pack-index.c:60 -msgid "--batch-size option is only for 'repack' subcommand" -msgstr "flaggan --batch-size används bara i underkommandot \"repack\"" - -#: builtin/multi-pack-index.c:69 +#: builtin/multi-pack-index.c:180 #, c-format msgid "unrecognized subcommand: %s" msgstr "okänt underkommando: %s" @@ -17780,7 +18066,7 @@ msgstr "%s, källa=%s, mål=%s" msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" @@ -17972,7 +18258,7 @@ msgstr "kunde inte skriva anteckningsobjekt" msgid "the note contents have been left in %s" msgstr "anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:242 builtin/tag.c:565 +#: builtin/notes.c:242 builtin/tag.c:576 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" @@ -18012,6 +18298,13 @@ msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\"" 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: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 +#: builtin/prune-packed.c:25 builtin/tag.c:586 +msgid "too many arguments" +msgstr "för många argument" + #: builtin/notes.c:389 builtin/notes.c:678 #, c-format msgid "no note found for object %s." @@ -18200,7 +18493,7 @@ msgstr "" "%s och checka in resultatet med \"git notes merge --commit\", eller avbryt " "sammanslagningen med \"git notes merge --abort\".\n" -#: builtin/notes.c:897 builtin/tag.c:578 +#: builtin/notes.c:897 builtin/tag.c:589 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." @@ -18234,7 +18527,7 @@ msgstr "anteckningar-ref" msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1034 builtin/stash.c:1671 +#: builtin/notes.c:1034 builtin/stash.c:1739 #, c-format msgid "unknown subcommand: %s" msgstr "okänt underkommando: %s" @@ -18304,63 +18597,63 @@ msgstr "misslyckades ta status på %s" msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades" -#: builtin/pack-objects.c:1358 +#: builtin/pack-objects.c:1383 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:1806 +#: builtin/pack-objects.c:1831 #, 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:1815 +#: builtin/pack-objects.c:1840 #, 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:2096 +#: builtin/pack-objects.c:2121 msgid "Counting objects" msgstr "Räknar objekt" -#: builtin/pack-objects.c:2241 +#: builtin/pack-objects.c:2266 #, c-format msgid "unable to parse object header of %s" msgstr "kunde inte tolka objekthuvud för %s" -#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327 -#: builtin/pack-objects.c:2337 +#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352 +#: builtin/pack-objects.c:2362 #, c-format msgid "object %s cannot be read" msgstr "objektet %s kunde inte läsas" -#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341 +#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366 #, 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:2351 +#: builtin/pack-objects.c:2376 msgid "suboptimal pack - out of memory" msgstr "icke-optimalt pack - minnet slut" -#: builtin/pack-objects.c:2666 +#: builtin/pack-objects.c:2691 #, c-format msgid "Delta compression using up to %d threads" msgstr "Deltakomprimering använder upp till %d trådar" -#: builtin/pack-objects.c:2805 +#: builtin/pack-objects.c:2830 #, 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:2891 +#: builtin/pack-objects.c:2916 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2922 msgid "inconsistency with delta count" msgstr "deltaräknaren är inkonsekvent" -#: builtin/pack-objects.c:2976 +#: builtin/pack-objects.c:3001 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -18369,14 +18662,24 @@ msgstr "" "värdet på uploadpack.blobpackfileuri måste vara på formen '<objekt-hash> " "<paket-hash> <uri>' (fick '%s')" -#: builtin/pack-objects.c:2979 +#: builtin/pack-objects.c:3004 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "" "objektet redan konfigurerat i et annat uploadpack.blobpackfileuri (fick '%s)" -#: builtin/pack-objects.c:3008 +#: builtin/pack-objects.c:3039 +#, c-format +msgid "could not get type of object %s in pack %s" +msgstr "kunde inte hämta typ för objektet %s i paketet %s" + +#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175 +#, c-format +msgid "could not find pack '%s'" +msgstr "kunde inte hitta paketet \"%s\"" + +#: builtin/pack-objects.c:3218 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -18385,7 +18688,7 @@ msgstr "" "förväntade kant-objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:3014 +#: builtin/pack-objects.c:3224 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -18394,236 +18697,248 @@ msgstr "" "förväntade objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:3112 +#: builtin/pack-objects.c:3322 msgid "invalid value for --missing" msgstr "ogiltigt värde för --missing" -#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279 +#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490 msgid "cannot open pack index" msgstr "kan inte öppna paketfilen" -#: builtin/pack-objects.c:3202 +#: builtin/pack-objects.c:3412 #, 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:3287 +#: builtin/pack-objects.c:3498 msgid "unable to force loose object" msgstr "kan inte tvinga lösa objekt" -#: builtin/pack-objects.c:3380 +#: builtin/pack-objects.c:3628 #, c-format msgid "not a rev '%s'" msgstr "inte en referens \"%s\"" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3631 #, c-format msgid "bad revision '%s'" msgstr "felaktig revision \"%s\"" -#: builtin/pack-objects.c:3408 +#: builtin/pack-objects.c:3659 msgid "unable to add recent objects" msgstr "kan inte lägga till nya objekt" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3712 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:3465 +#: builtin/pack-objects.c:3716 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:3503 +#: builtin/pack-objects.c:3755 msgid "<version>[,<offset>]" msgstr "<version>[,<offset>]" -#: builtin/pack-objects.c:3504 +#: builtin/pack-objects.c:3756 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:3507 +#: builtin/pack-objects.c:3759 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:3509 +#: builtin/pack-objects.c:3761 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från supplerande objektlager" -#: builtin/pack-objects.c:3511 +#: builtin/pack-objects.c:3763 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:3513 +#: builtin/pack-objects.c:3765 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:3515 +#: builtin/pack-objects.c:3767 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:3517 +#: builtin/pack-objects.c:3769 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:3519 +#: builtin/pack-objects.c:3771 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:3521 +#: builtin/pack-objects.c:3773 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:3523 +#: builtin/pack-objects.c:3775 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:3525 +#: builtin/pack-objects.c:3777 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:3527 +#: builtin/pack-objects.c:3779 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:3529 +#: builtin/pack-objects.c:3781 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:3531 +#: builtin/pack-objects.c:3783 msgid "limit the objects to those that are not yet packed" msgstr "begränsa objekt till dem som ännu inte packats" -#: builtin/pack-objects.c:3534 +#: builtin/pack-objects.c:3786 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:3537 +#: builtin/pack-objects.c:3789 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:3540 +#: builtin/pack-objects.c:3792 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:3543 +#: builtin/pack-objects.c:3795 +msgid "read packs from stdin" +msgstr "läs paket från standard in" + +#: builtin/pack-objects.c:3797 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:3545 +#: builtin/pack-objects.c:3799 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som ska packas" -#: builtin/pack-objects.c:3547 +#: builtin/pack-objects.c:3801 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:3549 +#: builtin/pack-objects.c:3803 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3805 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:3554 +#: builtin/pack-objects.c:3808 msgid "use the sparse reachability algorithm" msgstr "använd gles-nåbarhetsalgoritmen" -#: builtin/pack-objects.c:3556 +#: builtin/pack-objects.c:3810 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:3558 +#: builtin/pack-objects.c:3812 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:3560 +#: builtin/pack-objects.c:3814 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:3562 +#: builtin/pack-objects.c:3816 msgid "ignore this pack" msgstr "ignorera detta paket" -#: builtin/pack-objects.c:3564 +#: builtin/pack-objects.c:3818 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:3566 +#: builtin/pack-objects.c:3820 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:3568 +#: builtin/pack-objects.c:3822 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:3570 +#: builtin/pack-objects.c:3824 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:3574 +#: builtin/pack-objects.c:3828 msgid "write a bitmap index if possible" msgstr "skriv bitkartindex om möjligt" -#: builtin/pack-objects.c:3578 +#: builtin/pack-objects.c:3832 msgid "handling for missing objects" msgstr "hantering av saknade objekt" -#: builtin/pack-objects.c:3581 +#: builtin/pack-objects.c:3835 msgid "do not pack objects in promisor packfiles" msgstr "packa inte objekt i kontraktspackfiler" -#: builtin/pack-objects.c:3583 +#: builtin/pack-objects.c:3837 msgid "respect islands during delta compression" msgstr "respektera öar under deltakomprimering" -#: builtin/pack-objects.c:3585 +#: builtin/pack-objects.c:3839 msgid "protocol" msgstr "protokoll" -#: builtin/pack-objects.c:3586 +#: builtin/pack-objects.c:3840 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" "uteslut redan konfigurerade uploadpack.blobpackfileuri med detta protokoll" -#: builtin/pack-objects.c:3617 +#: builtin/pack-objects.c:3873 #, 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:3622 +#: builtin/pack-objects.c:3878 #, 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:3676 +#: builtin/pack-objects.c:3934 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 ska överföras" -#: builtin/pack-objects.c:3678 +#: builtin/pack-objects.c:3936 msgid "minimum pack size limit is 1 MiB" msgstr "minsta packstorlek är 1 MiB" -#: builtin/pack-objects.c:3683 +#: builtin/pack-objects.c:3941 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:3686 +#: builtin/pack-objects.c:3944 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt" -#: builtin/pack-objects.c:3692 +#: builtin/pack-objects.c:3950 msgid "cannot use --filter without --stdout" msgstr "kan inte använda --filter utan --stdout" -#: builtin/pack-objects.c:3752 +#: builtin/pack-objects.c:3952 +msgid "cannot use --filter with --stdin-packs" +msgstr "kan inte använda --filter med --stdin-packs" + +#: builtin/pack-objects.c:3956 +msgid "cannot use internal rev list with --stdin-packs" +msgstr "kan inte använda intern revisionslista med --stdin-packs" + +#: builtin/pack-objects.c:4015 msgid "Enumerating objects" msgstr "Räknar upp objekt" -#: builtin/pack-objects.c:3783 +#: builtin/pack-objects.c:4052 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -18703,11 +19018,11 @@ msgstr "Alternativ gällande sammanslagning" msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" -#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126 msgid "allow fast-forward" msgstr "tillåt snabbspolning" -#: builtin/pull.c:167 parse-options.h:339 +#: builtin/pull.c:167 parse-options.h:340 msgid "automatically stash/stash pop before and after" msgstr "utför automatiskt stash/stash pop före och efter" @@ -18762,7 +19077,7 @@ 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:456 builtin/rebase.c:1253 +#: builtin/pull.c:456 builtin/rebase.c:1248 msgid "You are not currently on a branch." msgstr "Du är inte på någon gren för närvarande." @@ -18779,7 +19094,7 @@ msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." #: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 -#: builtin/rebase.c:1259 +#: builtin/rebase.c:1254 msgid "<remote>" msgstr "<fjärr>" @@ -18787,7 +19102,7 @@ msgstr "<fjärr>" msgid "<branch>" msgstr "<gren>" -#: builtin/pull.c:471 builtin/rebase.c:1251 +#: builtin/pull.c:471 builtin/rebase.c:1246 msgid "There is no tracking information for the current branch." msgstr "Det finns ingen spårningsinformation för aktuell gren." @@ -19211,10 +19526,6 @@ msgstr "git range-diff [<flaggor>] <gammal-bas>..<ny-ända>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<flaggor>] <bas> <gammal-ända> <ny-ända>" -#: builtin/range-diff.c:28 -msgid "Percentage by which creation is weighted" -msgstr "Procent som skapelse vägs med" - #: builtin/range-diff.c:30 msgid "use simple diff colors" msgstr "använd enkla diff-färger" @@ -19348,188 +19659,188 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246 +#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245 #, c-format msgid "unusable todo list: '%s'" msgstr "oanvändbar todo-lista: %s" -#: builtin/rebase.c:312 +#: builtin/rebase.c:311 #, c-format msgid "could not create temporary %s" msgstr "kunde inte skapa temporär %s" -#: builtin/rebase.c:318 +#: builtin/rebase.c:317 msgid "could not mark as interactive" msgstr "kunde inte markera som interaktiv" -#: builtin/rebase.c:371 +#: builtin/rebase.c:370 msgid "could not generate todo list" msgstr "Kunde inte skapa attgöra-lista" -#: builtin/rebase.c:413 +#: builtin/rebase.c:412 msgid "a base commit must be provided with --upstream or --onto" msgstr "en basincheckning måste anges med --upstream eller --onto" -#: builtin/rebase.c:482 +#: builtin/rebase.c:481 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<flaggor>]" -#: builtin/rebase.c:495 builtin/rebase.c:1394 +#: builtin/rebase.c:494 builtin/rebase.c:1389 msgid "keep commits which start empty" msgstr "behåller incheckningar som är tomma från början" -#: builtin/rebase.c:499 builtin/revert.c:128 +#: builtin/rebase.c:498 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "tillåt incheckningar med tomt meddelande" -#: builtin/rebase.c:501 +#: builtin/rebase.c:500 msgid "rebase merge commits" msgstr "ombasera sammanslagningar" -#: builtin/rebase.c:503 +#: builtin/rebase.c:502 msgid "keep original branch points of cousins" msgstr "behåll ursprungliga förgreningspunkter för kusiner" -#: builtin/rebase.c:505 +#: builtin/rebase.c:504 msgid "move commits that begin with squash!/fixup!" msgstr "flytta incheckningar som inleds med squash!/fixup!" -#: builtin/rebase.c:506 +#: builtin/rebase.c:505 msgid "sign commits" msgstr "signera incheckningar" -#: builtin/rebase.c:508 builtin/rebase.c:1333 +#: builtin/rebase.c:507 builtin/rebase.c:1328 msgid "display a diffstat of what changed upstream" msgstr "vis diffstat för vad som ändrats uppströms" -#: builtin/rebase.c:510 +#: builtin/rebase.c:509 msgid "continue rebase" msgstr "fortsätt ombasering" -#: builtin/rebase.c:512 +#: builtin/rebase.c:511 msgid "skip commit" msgstr "hoppa över incheckning" -#: builtin/rebase.c:513 +#: builtin/rebase.c:512 msgid "edit the todo list" msgstr "redigera attgöra-listan" -#: builtin/rebase.c:515 +#: builtin/rebase.c:514 msgid "show the current patch" msgstr "visa nuvarande patch" -#: builtin/rebase.c:518 +#: builtin/rebase.c:517 msgid "shorten commit ids in the todo list" msgstr "förkorta inchecknings-id i todo-listan" -#: builtin/rebase.c:520 +#: builtin/rebase.c:519 msgid "expand commit ids in the todo list" msgstr "utöka inchecknings-id i todo-listan" -#: builtin/rebase.c:522 +#: builtin/rebase.c:521 msgid "check the todo list" msgstr "kontrollera todo-listan" -#: builtin/rebase.c:524 +#: builtin/rebase.c:523 msgid "rearrange fixup/squash lines" msgstr "ordna om fixup-/squash-rader" -#: builtin/rebase.c:526 +#: builtin/rebase.c:525 msgid "insert exec commands in todo list" msgstr "lägg in exec-kommandon i todo-listan" -#: builtin/rebase.c:527 +#: builtin/rebase.c:526 msgid "onto" msgstr "ovanpå" -#: builtin/rebase.c:530 +#: builtin/rebase.c:529 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:530 +#: builtin/rebase.c:529 msgid "restrict revision" msgstr "begränsa revision" -#: builtin/rebase.c:532 +#: builtin/rebase.c:531 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:533 +#: builtin/rebase.c:532 msgid "squash onto" msgstr "tryck ihop ovanpå" -#: builtin/rebase.c:535 +#: builtin/rebase.c:534 msgid "the upstream commit" msgstr "uppströmsincheckningen" -#: builtin/rebase.c:537 +#: builtin/rebase.c:536 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:537 +#: builtin/rebase.c:536 msgid "head name" msgstr "namn på huvud" -#: builtin/rebase.c:542 +#: builtin/rebase.c:541 msgid "rebase strategy" msgstr "sammanslagningsstrategi" -#: builtin/rebase.c:543 +#: builtin/rebase.c:542 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:544 +#: builtin/rebase.c:543 msgid "strategy options" msgstr "strategiflaggor" -#: builtin/rebase.c:545 +#: builtin/rebase.c:544 msgid "switch-to" msgstr "switch-to" -#: builtin/rebase.c:546 +#: builtin/rebase.c:545 msgid "the branch or commit to checkout" msgstr "gren eller inchecking att checka ut" -#: builtin/rebase.c:547 +#: builtin/rebase.c:546 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:547 +#: builtin/rebase.c:546 msgid "onto name" msgstr "på-namn" -#: builtin/rebase.c:548 +#: builtin/rebase.c:547 msgid "cmd" msgstr "kmd" -#: builtin/rebase.c:548 +#: builtin/rebase.c:547 msgid "the command to run" msgstr "kommando att köra" -#: builtin/rebase.c:551 builtin/rebase.c:1427 +#: builtin/rebase.c:550 builtin/rebase.c:1422 msgid "automatically re-schedule any `exec` that fails" msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt" -#: builtin/rebase.c:567 +#: builtin/rebase.c:566 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges" -#: builtin/rebase.c:583 +#: builtin/rebase.c:582 #, c-format msgid "%s requires the merge backend" msgstr "%s kräver \"merge\"-bakändan" -#: builtin/rebase.c:626 +#: builtin/rebase.c:625 #, c-format msgid "could not get 'onto': '%s'" msgstr "kunde inte hämta \"onto\": \"%s\"" -#: builtin/rebase.c:643 +#: builtin/rebase.c:642 #, c-format msgid "invalid orig-head: '%s'" msgstr "ogiltigt orig-head: \"%s\"" -#: builtin/rebase.c:668 +#: builtin/rebase.c:667 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\"" @@ -19567,7 +19878,7 @@ msgstr "" "\n" "Därför kan inte git ombasera dessa." -#: builtin/rebase.c:1227 +#: builtin/rebase.c:1222 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" @@ -19575,7 +19886,7 @@ msgid "" msgstr "" "okänd tom-typ \"%s\"; giltiga värden är \"drop\", \"keep\" och \"ask\"." -#: builtin/rebase.c:1245 +#: builtin/rebase.c:1240 #, c-format msgid "" "%s\n" @@ -19592,7 +19903,7 @@ msgstr "" " git rebase '<gren>'\n" "\n" -#: builtin/rebase.c:1261 +#: builtin/rebase.c:1256 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -19605,190 +19916,182 @@ msgstr "" " git branch --set-upstream-to=%s/<gren> %s\n" "\n" -#: builtin/rebase.c:1291 +#: builtin/rebase.c:1286 msgid "exec commands cannot contain newlines" msgstr "exec-kommandon kan inte innehålla nyradstecken" -#: builtin/rebase.c:1295 +#: builtin/rebase.c:1290 msgid "empty exec command" msgstr "tomt exec-kommando" -#: builtin/rebase.c:1324 +#: builtin/rebase.c:1319 msgid "rebase onto given branch instead of upstream" msgstr "ombasera mot given grenen istället för uppström" -#: builtin/rebase.c:1326 +#: builtin/rebase.c:1321 msgid "use the merge-base of upstream and branch as the current base" msgstr "använd sammanslagningsbasen mellan uppströms och gren som aktuell bas" -#: builtin/rebase.c:1328 +#: builtin/rebase.c:1323 msgid "allow pre-rebase hook to run" msgstr "tillåt pre-rebase-krok att köra" -#: builtin/rebase.c:1330 +#: builtin/rebase.c:1325 msgid "be quiet. implies --no-stat" msgstr "var tyst. implicerar --no-stat" -#: builtin/rebase.c:1336 +#: builtin/rebase.c:1331 msgid "do not show diffstat of what changed upstream" msgstr "visa inte en diffstat för vad som ändrats uppströms" -#: builtin/rebase.c:1339 +#: builtin/rebase.c:1334 msgid "add a Signed-off-by trailer to each commit" msgstr "lägg \"Signed-off-by:\"-släprad till varje incheckning" -#: builtin/rebase.c:1342 +#: builtin/rebase.c:1337 msgid "make committer date match author date" msgstr "sätt incheckningsdatum till författardatum" -#: builtin/rebase.c:1344 +#: builtin/rebase.c:1339 msgid "ignore author date and use current date" msgstr "ignorera författardatum och använd nuvarande" -#: builtin/rebase.c:1346 +#: builtin/rebase.c:1341 msgid "synonym of --reset-author-date" msgstr "synonym för --reset-author-date" -#: builtin/rebase.c:1348 builtin/rebase.c:1352 +#: builtin/rebase.c:1343 builtin/rebase.c:1347 msgid "passed to 'git apply'" msgstr "sänds till \"git apply\"" -#: builtin/rebase.c:1350 +#: builtin/rebase.c:1345 msgid "ignore changes in whitespace" msgstr "ignorera ändringar i blanksteg" -#: builtin/rebase.c:1354 builtin/rebase.c:1357 +#: builtin/rebase.c:1349 builtin/rebase.c:1352 msgid "cherry-pick all commits, even if unchanged" msgstr "utför cherry-pick på alla incheckningar, även om oändrad" -#: builtin/rebase.c:1359 +#: builtin/rebase.c:1354 msgid "continue" msgstr "fortsätt" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1357 msgid "skip current patch and continue" msgstr "hoppa över nuvarande patch och fortsätt" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1359 msgid "abort and check out the original branch" msgstr "avbryt och checka ut ursprungsgrenen" -#: builtin/rebase.c:1367 +#: builtin/rebase.c:1362 msgid "abort but keep HEAD where it is" msgstr "avbryt men behåll HEAD där det är" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1363 msgid "edit the todo list during an interactive rebase" msgstr "redigera attgöra-listan under interaktiv ombasering." -#: builtin/rebase.c:1371 +#: builtin/rebase.c:1366 msgid "show the patch file being applied or merged" msgstr "visa patchen som tillämpas eller slås samman" -#: builtin/rebase.c:1374 +#: builtin/rebase.c:1369 msgid "use apply strategies to rebase" msgstr "använd appliceringstrategier för ombasering" -#: builtin/rebase.c:1378 +#: builtin/rebase.c:1373 msgid "use merging strategies to rebase" msgstr "använd sammanslagningsstrategier för ombasering" -#: builtin/rebase.c:1382 +#: builtin/rebase.c:1377 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:1386 +#: builtin/rebase.c:1381 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:1391 +#: builtin/rebase.c:1386 msgid "how to handle commits that become empty" msgstr "hur incheckningar som blir tomma ska hanteras" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1393 msgid "move commits that begin with squash!/fixup! under -i" msgstr "flytta incheckningar som börjar med squash!/fixup! under -i" -#: builtin/rebase.c:1405 +#: builtin/rebase.c:1400 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:1409 +#: builtin/rebase.c:1404 msgid "allow rebasing commits with empty messages" msgstr "tillåt ombasering av incheckningar med tomt meddelande" -#: builtin/rebase.c:1413 +#: builtin/rebase.c:1408 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:1416 +#: builtin/rebase.c:1411 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:1418 +#: builtin/rebase.c:1413 msgid "use the given merge strategy" msgstr "använd angiven sammanslagningsstrategi" -#: builtin/rebase.c:1420 builtin/revert.c:115 +#: builtin/rebase.c:1415 builtin/revert.c:115 msgid "option" msgstr "alternativ" -#: builtin/rebase.c:1421 +#: builtin/rebase.c:1416 msgid "pass the argument through to the merge strategy" msgstr "sänd flaggan till sammanslagningsstrategin" -#: builtin/rebase.c:1424 +#: builtin/rebase.c:1419 msgid "rebase all reachable commits up to the root(s)" msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna" -#: builtin/rebase.c:1429 +#: builtin/rebase.c:1424 msgid "apply all changes, even those already present upstream" msgstr "applicera alla ändringar, även de som redan finns uppströms" -#: builtin/rebase.c:1446 -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:1452 +#: builtin/rebase.c:1442 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:1493 +#: builtin/rebase.c:1483 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:1498 +#: builtin/rebase.c:1488 msgid "cannot combine '--keep-base' with '--onto'" msgstr "kan inte kombinera \"--keep-base\" med \"--onto\"" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1490 msgid "cannot combine '--keep-base' with '--root'" msgstr "kan inte kombinera \"--keep-base\" med \"--root\"" -#: builtin/rebase.c:1504 +#: builtin/rebase.c:1494 msgid "cannot combine '--root' with '--fork-point'" msgstr "kan inte kombinera \"--root\" med \"--fork-point\"" -#: builtin/rebase.c:1507 +#: builtin/rebase.c:1497 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: builtin/rebase.c:1511 +#: builtin/rebase.c:1501 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:1534 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: builtin/rebase.c:1546 +#: builtin/rebase.c:1536 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -19796,16 +20099,16 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: builtin/rebase.c:1565 +#: builtin/rebase.c:1555 msgid "could not discard worktree changes" msgstr "kunde inte kasta ändringar i arbetskatalogen" -#: builtin/rebase.c:1584 +#: builtin/rebase.c:1574 #, c-format msgid "could not move back to %s" msgstr "kunde inte flytta tillbaka till %s" -#: builtin/rebase.c:1630 +#: builtin/rebase.c:1620 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -19826,134 +20129,134 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där.\n" -#: builtin/rebase.c:1658 +#: builtin/rebase.c:1648 msgid "switch `C' expects a numerical value" msgstr "flaggan \"C\" förväntar ett numeriskt värde" -#: builtin/rebase.c:1700 +#: builtin/rebase.c:1690 #, c-format msgid "Unknown mode: %s" msgstr "Okänt läge: %s" -#: builtin/rebase.c:1739 +#: builtin/rebase.c:1729 msgid "--strategy requires --merge or --interactive" msgstr "--strategy kräver --merge eller --interactive" -#: builtin/rebase.c:1769 +#: builtin/rebase.c:1759 msgid "cannot combine apply options with merge options" msgstr "kan inte kombinera apply-flaggor med merge-flaggor" -#: builtin/rebase.c:1782 +#: builtin/rebase.c:1772 #, c-format msgid "Unknown rebase backend: %s" msgstr "Okänd rebase-bakända: %s" -#: builtin/rebase.c:1812 +#: builtin/rebase.c:1802 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec kräver --exec eller --interactive" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1822 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\"" -#: builtin/rebase.c:1836 +#: builtin/rebase.c:1826 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec" "\"" -#: builtin/rebase.c:1860 +#: builtin/rebase.c:1850 #, c-format msgid "invalid upstream '%s'" msgstr "felaktig uppström \"%s\"" -#: builtin/rebase.c:1866 +#: builtin/rebase.c:1856 msgid "Could not create new root commit" msgstr "kunde inte skapa ny rotincheckning" -#: builtin/rebase.c:1892 +#: builtin/rebase.c:1882 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "\"%s\": behöver precis en sammanslagningsbas med gren" -#: builtin/rebase.c:1895 +#: builtin/rebase.c:1885 #, c-format msgid "'%s': need exactly one merge base" msgstr "\"%s\": behöver precis en sammanslagningsbas" -#: builtin/rebase.c:1903 +#: builtin/rebase.c:1893 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "Pekar inte på en giltig incheckning: \"%s\"" -#: builtin/rebase.c:1931 +#: builtin/rebase.c:1921 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\"" -#: builtin/rebase.c:1939 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:2414 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2415 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/rebase.c:1950 +#: builtin/rebase.c:1940 msgid "Could not resolve HEAD to a revision" msgstr "Kunde inte bestämma HEAD:s incheckning" -#: builtin/rebase.c:1971 +#: builtin/rebase.c:1961 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: builtin/rebase.c:2007 +#: builtin/rebase.c:1997 #, c-format msgid "could not switch to %s" msgstr "kunde inte växla till %s" -#: builtin/rebase.c:2018 +#: builtin/rebase.c:2008 msgid "HEAD is up to date." msgstr "HEAD är à jour." -#: builtin/rebase.c:2020 +#: builtin/rebase.c:2010 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Aktuell gren %s är à jour.\n" -#: builtin/rebase.c:2028 +#: builtin/rebase.c:2018 msgid "HEAD is up to date, rebase forced." msgstr "HEAD är à jour, ombasering framtvingad." -#: builtin/rebase.c:2030 +#: builtin/rebase.c:2020 #, 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:2038 +#: builtin/rebase.c:2028 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: builtin/rebase.c:2045 +#: builtin/rebase.c:2035 #, c-format msgid "Changes to %s:\n" msgstr "Ändringar till %s:\n" -#: builtin/rebase.c:2048 +#: builtin/rebase.c:2038 #, c-format msgid "Changes from %s to %s:\n" msgstr "Ändringar från %s till %s:\n" -#: builtin/rebase.c:2073 +#: builtin/rebase.c:2063 #, 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:2082 +#: builtin/rebase.c:2072 msgid "Could not detach HEAD" msgstr "Kunde inte koppla från HEAD" -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2081 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Snabbspolade %s till %s.\n" @@ -20013,11 +20316,11 @@ msgstr "" "\n" "För att undvika detta meddelande kan du sätta det till \"refuse\"." -#: builtin/receive-pack.c:2481 +#: builtin/receive-pack.c:2479 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:2495 +#: builtin/receive-pack.c:2493 msgid "You must specify a directory." msgstr "Du måste ange en katalog." @@ -20252,7 +20555,7 @@ msgstr "" "\t%s:%d\n" "anger nu den icke-existerande fjärren \"%s\"" -#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946 +#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943 #, c-format msgid "No such remote: '%s'" msgstr "Ingen sådan fjärr: \"%s\"" @@ -20606,7 +20909,7 @@ msgstr "" 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:270 builtin/repack.c:446 +#: builtin/repack.c:270 builtin/repack.c:630 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." @@ -20615,104 +20918,127 @@ msgstr "" 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:322 +#: builtin/repack.c:309 +#, c-format +msgid "cannot open index for %s" +msgstr "kunde inte öppna indexet för %s" + +#: builtin/repack.c:368 +#, c-format +msgid "pack %s too large to consider in geometric progression" +msgstr "paketet %s för stort för att tas med i geometriskt förlopp" + +#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413 +#, c-format +msgid "pack %s too large to roll up" +msgstr "paketet %s för stort att rulla upp" + +#: builtin/repack.c:460 msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" -#: builtin/repack.c:324 +#: builtin/repack.c:462 msgid "same as -a, and turn unreachable objects loose" msgstr "samma som -a, och gör onåbara objekt lösa" -#: builtin/repack.c:327 +#: builtin/repack.c:465 msgid "remove redundant packs, and run git-prune-packed" msgstr "ta bort överflödiga paket, och kör git-prune-packed" -#: builtin/repack.c:329 +#: builtin/repack.c:467 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "sänd --no-reuse-delta till git-pack-objects" -#: builtin/repack.c:331 +#: builtin/repack.c:469 msgid "pass --no-reuse-object to git-pack-objects" msgstr "sänd --no-reuse-object till git-pack-objects" -#: builtin/repack.c:333 +#: builtin/repack.c:471 msgid "do not run git-update-server-info" msgstr "kör inte git-update-server-info" -#: builtin/repack.c:336 +#: builtin/repack.c:474 msgid "pass --local to git-pack-objects" msgstr "sänd --local till git-pack-objects" -#: builtin/repack.c:338 +#: builtin/repack.c:476 msgid "write bitmap index" msgstr "skriv bitkartindex" -#: builtin/repack.c:340 +#: builtin/repack.c:478 msgid "pass --delta-islands to git-pack-objects" msgstr "sänd --delta-islands till git-pack-objects" -#: builtin/repack.c:341 +#: builtin/repack.c:479 msgid "approxidate" msgstr "cirkadatum" -#: builtin/repack.c:342 +#: builtin/repack.c:480 msgid "with -A, do not loosen objects older than this" msgstr "med -A, lös inte upp objekt äldre än detta" -#: builtin/repack.c:344 +#: builtin/repack.c:482 msgid "with -a, repack unreachable objects" msgstr "med -a, packa om onåbara objekt" -#: builtin/repack.c:346 +#: builtin/repack.c:484 msgid "size of the window used for delta compression" msgstr "storlek på fönster använt för deltakomprimering" -#: builtin/repack.c:347 builtin/repack.c:353 +#: builtin/repack.c:485 builtin/repack.c:491 msgid "bytes" msgstr "byte" -#: builtin/repack.c:348 +#: builtin/repack.c:486 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:350 +#: builtin/repack.c:488 msgid "limits the maximum delta depth" msgstr "begränsa maximalt deltadjup" -#: builtin/repack.c:352 +#: builtin/repack.c:490 msgid "limits the maximum number of threads" msgstr "begränsar maximalt antal trådar" -#: builtin/repack.c:354 +#: builtin/repack.c:492 msgid "maximum size of each packfile" msgstr "maximal storlek på varje paketfil" -#: builtin/repack.c:356 +#: builtin/repack.c:494 msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:358 +#: builtin/repack.c:496 msgid "do not repack this pack" msgstr "packa inte om detta paket" -#: builtin/repack.c:368 +#: builtin/repack.c:498 +msgid "find a geometric progression with factor <N>" +msgstr "hitta ett geometrisk förlopp med faktor <N>" + +#: builtin/repack.c:508 msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" -#: builtin/repack.c:372 +#: builtin/repack.c:512 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable och -A kan inte användas samtidigt" -#: builtin/repack.c:455 +#: builtin/repack.c:527 +msgid "--geometric is incompatible with -A, -a" +msgstr "--geometric är inkompatibel med -A, -a" + +#: builtin/repack.c:639 msgid "Nothing new to pack." msgstr "Inget nytt att packa." -#: builtin/repack.c:485 +#: builtin/repack.c:669 #, c-format msgid "missing required file: %s" msgstr "nödvändig fil saknas: %s" -#: builtin/repack.c:487 +#: builtin/repack.c:671 #, c-format msgid "could not unlink: %s" msgstr "kunde inte ta bort: \"%s\"" @@ -21045,8 +21371,8 @@ msgstr "HEAD är nu på %s" 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:295 builtin/stash.c:587 builtin/stash.c:661 -#: builtin/stash.c:685 +#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663 +#: builtin/stash.c:687 msgid "be quiet, only report errors" msgstr "var tyst, rapportera endast fel" @@ -21130,19 +21456,19 @@ msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-list.c:534 +#: builtin/rev-list.c:538 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "kan inte kombinera --exclude-promisor-objects och --missing" -#: builtin/rev-list.c:595 +#: builtin/rev-list.c:599 msgid "object filtering requires --objects" msgstr "objektfiltrering kräver --objects" -#: builtin/rev-list.c:651 +#: builtin/rev-list.c:659 msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" -#: builtin/rev-list.c:656 +#: builtin/rev-list.c:664 msgid "marked counting is incompatible with --objects" msgstr "markerad räkning är inkompatibelt med --objects" @@ -21255,19 +21581,19 @@ msgstr "behåll incheckningar som börjar som tomma" msgid "keep redundant, empty commits" msgstr "behåll redundanta, tomma incheckningar" -#: builtin/revert.c:239 +#: builtin/revert.c:237 msgid "revert failed" msgstr "\"revert\" misslyckades" -#: builtin/revert.c:252 +#: builtin/revert.c:250 msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" -#: builtin/rm.c:19 +#: builtin/rm.c:20 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<flaggor>] [--] <fil>..." -#: builtin/rm.c:207 +#: builtin/rm.c:208 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -21279,7 +21605,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:212 +#: builtin/rm.c:213 msgid "" "\n" "(use -f to force removal)" @@ -21287,13 +21613,13 @@ msgstr "" "\n" "(använd -f för att tvinga borttagning)" -#: builtin/rm.c:216 +#: builtin/rm.c:217 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:220 builtin/rm.c:229 +#: builtin/rm.c:221 builtin/rm.c:230 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -21301,47 +21627,47 @@ msgstr "" "\n" "(använd --cached för att behålla filen eller -f för att tvinga borttagning)" -#: builtin/rm.c:226 +#: builtin/rm.c:227 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:243 +#: builtin/rm.c:244 msgid "do not list removed files" msgstr "lista inte borttagna filer" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "only remove from the index" msgstr "ta bara bort från indexet" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "override the up-to-date check" msgstr "överstyr àjour-testet" -#: builtin/rm.c:246 +#: builtin/rm.c:247 msgid "allow recursive removal" msgstr "tillåt rekursiv borttagning" -#: builtin/rm.c:248 +#: builtin/rm.c:249 msgid "exit with a zero status even if nothing matched" msgstr "avsluta med nollstatus även om inget träffades" -#: builtin/rm.c:282 +#: builtin/rm.c:283 msgid "No pathspec was given. Which files should I remove?" msgstr "Ingen sökvägsangivelse gavs. Vilka filer ska jag ta bort?" -#: builtin/rm.c:305 +#: builtin/rm.c:310 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:323 +#: builtin/rm.c:331 #, c-format msgid "not removing '%s' recursively without -r" msgstr "tar inte bort \"%s\" rekursivt utan -r" -#: builtin/rm.c:362 +#: builtin/rm.c:379 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: kan inte ta bort %s" @@ -21619,103 +21945,111 @@ msgstr "visa inte resultat på standard ut (användbart med --verify)" 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/sparse-checkout.c:21 +#: builtin/sparse-checkout.c:22 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <flaggor>" -#: builtin/sparse-checkout.c:45 +#: builtin/sparse-checkout.c:46 msgid "git sparse-checkout list" msgstr "git sparse-checkout list" -#: builtin/sparse-checkout.c:71 +#: builtin/sparse-checkout.c:72 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" "arbetskatalogen är inte glest (sparse-checkout-filen kanske inte finns)" -#: builtin/sparse-checkout.c:223 +#: builtin/sparse-checkout.c:227 msgid "failed to create directory for sparse-checkout file" msgstr "misslyckades skapa katalog för \"sparse-checkout\"-filen" -#: builtin/sparse-checkout.c:264 +#: builtin/sparse-checkout.c:268 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "kunde inte uppgradera arkivformat för att aktivera worktreeConfig" -#: builtin/sparse-checkout.c:266 +#: builtin/sparse-checkout.c:270 msgid "failed to set extensions.worktreeConfig setting" msgstr "misslyckades ändra inställningen extensions.worktreeConfig" -#: builtin/sparse-checkout.c:283 -msgid "git sparse-checkout init [--cone]" -msgstr "git sparse-checkout init [--cone]" +#: builtin/sparse-checkout.c:290 +msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" +msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" -#: builtin/sparse-checkout.c:302 +#: builtin/sparse-checkout.c:310 msgid "initialize the sparse-checkout in cone mode" msgstr "initiera sparse-checkout i konläge" -#: builtin/sparse-checkout.c:339 +#: builtin/sparse-checkout.c:312 +msgid "toggle the use of a sparse index" +msgstr "slå på/av använding av glest index" + +#: builtin/sparse-checkout.c:340 +msgid "failed to modify sparse-index config" +msgstr "misslyckades ändra inställning för sparse-index" + +#: builtin/sparse-checkout.c:361 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: builtin/sparse-checkout.c:396 +#: builtin/sparse-checkout.c:419 #, c-format msgid "could not normalize path %s" msgstr "kunde inte normalisera sökvägen \"%s\"" -#: builtin/sparse-checkout.c:408 +#: builtin/sparse-checkout.c:431 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <mönster>)" -#: builtin/sparse-checkout.c:433 +#: builtin/sparse-checkout.c:456 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "kan inte ta bort citering av C-sträng \"%s\"" -#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511 +#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534 msgid "unable to load existing sparse-checkout patterns" msgstr "kunde inte läsa in existerande mönster för gles utcheckning" -#: builtin/sparse-checkout.c:556 +#: builtin/sparse-checkout.c:579 msgid "read patterns from standard in" msgstr "läs mönster från standard in" -#: builtin/sparse-checkout.c:571 +#: builtin/sparse-checkout.c:594 msgid "git sparse-checkout reapply" msgstr "git sparse-checkout reapply" -#: builtin/sparse-checkout.c:590 +#: builtin/sparse-checkout.c:613 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:618 +#: builtin/sparse-checkout.c:644 msgid "error while refreshing working directory" msgstr "fel vid uppdatering av arbetskatalog" -#: builtin/stash.c:22 builtin/stash.c:38 +#: builtin/stash.c:24 builtin/stash.c:40 msgid "git stash list [<options>]" msgstr "git stash list [<flaggor>]" -#: builtin/stash.c:23 builtin/stash.c:43 +#: builtin/stash.c:25 builtin/stash.c:45 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<flaggor>] [<stash>]" -#: builtin/stash.c:24 builtin/stash.c:48 +#: builtin/stash.c:26 builtin/stash.c:50 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<stash>]" -#: builtin/stash.c:25 +#: builtin/stash.c:27 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:63 +#: builtin/stash.c:28 builtin/stash.c:65 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <grennamn> [<stash>]" -#: builtin/stash.c:27 builtin/stash.c:68 +#: builtin/stash.c:29 builtin/stash.c:70 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 +#: builtin/stash.c:30 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" @@ -21727,7 +22061,7 @@ msgstr "" " [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n" " [--] [<sökväg>...]]" -#: builtin/stash.c:32 builtin/stash.c:85 +#: builtin/stash.c:34 builtin/stash.c:87 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" @@ -21735,19 +22069,19 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<meddelande>]" -#: builtin/stash.c:53 +#: builtin/stash.c:55 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:58 +#: builtin/stash.c:60 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:73 +#: builtin/stash.c:75 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <meddelande>] [-q|--quiet] <incheckning>" -#: builtin/stash.c:78 +#: builtin/stash.c:80 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" @@ -21757,30 +22091,30 @@ msgstr "" " [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n" " [--] [<sökväg>...]]" -#: builtin/stash.c:128 +#: builtin/stash.c:130 #, c-format msgid "'%s' is not a stash-like commit" msgstr "\"%s\" är inte en \"stash\"-liknande incheckning" -#: builtin/stash.c:148 +#: builtin/stash.c:150 #, c-format msgid "Too many revisions specified:%s" msgstr "För många revisioner angivna:%s" -#: builtin/stash.c:162 +#: builtin/stash.c:164 msgid "No stash entries found." msgstr "Inga \"stash\"-poster hittades." -#: builtin/stash.c:176 +#: builtin/stash.c:178 #, c-format msgid "%s is not a valid reference" msgstr "%s är inte en giltigt referens" -#: builtin/stash.c:225 +#: builtin/stash.c:227 msgid "git stash clear with arguments is unimplemented" msgstr "\"git stash clear\" med argument har inte implementerats" -#: builtin/stash.c:429 +#: builtin/stash.c:431 #, c-format msgid "" "WARNING: Untracked file in way of tracked file! Renaming\n" @@ -21791,150 +22125,166 @@ msgstr "" " %s -> %s\n" " för att lämna plats.\n" -#: builtin/stash.c:490 +#: builtin/stash.c:492 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:501 +#: builtin/stash.c:503 #, c-format msgid "could not generate diff %s^!." msgstr "kunde inte skapa diff %s^!." -#: builtin/stash.c:508 +#: builtin/stash.c:510 msgid "conflicts in index. Try without --index." msgstr "konflikter i indexet. Testa utan --index." -#: builtin/stash.c:514 +#: builtin/stash.c:516 msgid "could not save index tree" msgstr "kunde inte spara indexträd" -#: builtin/stash.c:523 +#: builtin/stash.c:525 msgid "could not restore untracked files from stash" msgstr "kunde inte återställa ospårade filer från stash-post" -#: builtin/stash.c:537 +#: builtin/stash.c:539 #, c-format msgid "Merging %s with %s" msgstr "Slår ihop %s med %s" -#: builtin/stash.c:547 +#: builtin/stash.c:549 msgid "Index was not unstashed." msgstr "Indexet har inte tagits upp ur \"stash\":en" -#: builtin/stash.c:589 builtin/stash.c:687 +#: builtin/stash.c:591 builtin/stash.c:689 msgid "attempt to recreate the index" msgstr "försök återskapa indexet" -#: builtin/stash.c:633 +#: builtin/stash.c:635 #, c-format msgid "Dropped %s (%s)" msgstr "Kastade %s (%s)" -#: builtin/stash.c:636 +#: builtin/stash.c:638 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Kunde inte kasta \"stash\"-post" -#: builtin/stash.c:649 +#: builtin/stash.c:651 #, c-format msgid "'%s' is not a stash reference" msgstr "\"%s\" är inte en \"stash\"-referens" -#: builtin/stash.c:699 +#: builtin/stash.c:701 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:722 +#: builtin/stash.c:724 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: builtin/stash.c:866 builtin/stash.c:903 +#: builtin/stash.c:808 +msgid "failed to parse tree" +msgstr "misslyckades tolka träd" + +#: builtin/stash.c:819 +msgid "failed to unpack trees" +msgstr "misslyckades packa upp träd" + +#: builtin/stash.c:839 +msgid "include untracked files in the stash" +msgstr "ta med ospårade filer i \"stash\"" + +#: builtin/stash.c:842 +msgid "only show untracked files in the stash" +msgstr "visa bara ospårade filer i \"stash\"" + +#: builtin/stash.c:932 builtin/stash.c:969 #, c-format msgid "Cannot update %s with %s" msgstr "Kan inte uppdatera %s med %s" -#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603 +#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671 msgid "stash message" msgstr "\"stash\"-meddelande" -#: builtin/stash.c:894 +#: builtin/stash.c:960 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" kräver ett <incheckning>-argument" -#: builtin/stash.c:1109 +#: builtin/stash.c:1175 msgid "No changes selected" msgstr "Inga ändringar valda" -#: builtin/stash.c:1209 +#: builtin/stash.c:1275 msgid "You do not have the initial commit yet" msgstr "Du har inte den första incheckningen ännu" -#: builtin/stash.c:1236 +#: builtin/stash.c:1302 msgid "Cannot save the current index state" msgstr "Kan inte spara aktuellt tillstånd för indexet" -#: builtin/stash.c:1245 +#: builtin/stash.c:1311 msgid "Cannot save the untracked files" msgstr "Kan inte spara ospårade filer" -#: builtin/stash.c:1256 builtin/stash.c:1265 +#: builtin/stash.c:1322 builtin/stash.c:1331 msgid "Cannot save the current worktree state" msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" -#: builtin/stash.c:1293 +#: builtin/stash.c:1359 msgid "Cannot record working tree state" msgstr "Kan inte registrera tillstånd för arbetskatalog" -#: builtin/stash.c:1342 +#: builtin/stash.c:1408 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:1358 +#: builtin/stash.c:1426 msgid "Did you forget to 'git add'?" msgstr "Glömde du använda \"git add\"?" -#: builtin/stash.c:1373 +#: builtin/stash.c:1441 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" -#: builtin/stash.c:1380 +#: builtin/stash.c:1448 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: builtin/stash.c:1395 +#: builtin/stash.c:1463 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" -#: builtin/stash.c:1400 +#: builtin/stash.c:1468 #, c-format msgid "Saved working directory and index state %s" msgstr "Sparade arbetskatalogen och indexstatus %s" -#: builtin/stash.c:1490 +#: builtin/stash.c:1558 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: builtin/stash.c:1529 builtin/stash.c:1594 +#: builtin/stash.c:1597 builtin/stash.c:1662 msgid "keep index" msgstr "behåll indexet" -#: builtin/stash.c:1531 builtin/stash.c:1596 +#: builtin/stash.c:1599 builtin/stash.c:1664 msgid "stash in patch mode" msgstr "\"stash\" i \"patch\"-läge" -#: builtin/stash.c:1532 builtin/stash.c:1597 +#: builtin/stash.c:1600 builtin/stash.c:1665 msgid "quiet mode" msgstr "tyst läge" -#: builtin/stash.c:1534 builtin/stash.c:1599 +#: builtin/stash.c:1602 builtin/stash.c:1667 msgid "include untracked files in stash" msgstr "ta med ospårade filer i \"stash\"" -#: builtin/stash.c:1536 builtin/stash.c:1601 +#: builtin/stash.c:1604 builtin/stash.c:1669 msgid "include ignore files" msgstr "ta med ignorerade filer" -#: builtin/stash.c:1636 +#: builtin/stash.c:1704 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -21958,7 +22308,7 @@ msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken" msgid "prepend comment character and space to each line" msgstr "lägg in kommentarstecken och blanksteg först på varje rad" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" @@ -21972,7 +22322,7 @@ msgstr "submodule--helper print-default-remote tar inga argument" msgid "cannot strip one component off url '%s'" msgstr "kan inte ta bort en komponent från url:en \"%s\"" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" @@ -21980,18 +22330,18 @@ msgstr "alternativa ankare för relativa sökvägar" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:652 +#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:653 #, 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:524 +#: builtin/submodule--helper.c:525 #, c-format msgid "Entering '%s'\n" msgstr "Går in i \"%s\"\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:528 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -22000,7 +22350,7 @@ msgstr "" "run_command returnerade icke-nollstatus för %s\n" "." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:550 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -22011,20 +22361,20 @@ msgstr "" "undermoduler för %s\n" "." -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:566 msgid "suppress output of entering each submodule command" msgstr "dölj utdata från för varje undermodulskommando som startas" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 -#: builtin/submodule--helper.c:1487 +#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:1488 msgid "recurse into nested submodules" msgstr "rekursera in i nästlade undermoduler" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:573 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:600 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -22033,54 +22383,54 @@ msgstr "" "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget " "officiella uppström." -#: builtin/submodule--helper.c:666 +#: builtin/submodule--helper.c:667 #, 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:670 +#: builtin/submodule--helper.c:671 #, 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:680 +#: builtin/submodule--helper.c:681 #, 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:687 +#: builtin/submodule--helper.c:688 #, 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:709 +#: builtin/submodule--helper.c:710 msgid "suppress output for initializing a submodule" msgstr "dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:714 +#: builtin/submodule--helper.c:715 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<flaggor>] [<sökväg>]" -#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 +#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923 #, 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:835 +#: builtin/submodule--helper.c:836 #, 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:862 builtin/submodule--helper.c:1457 +#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "misslyckades rekursera in i undermodulen \"%s\"" -#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 +#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624 msgid "suppress submodule status output" msgstr "hindra statusutskrift för undermodul" -#: builtin/submodule--helper.c:887 +#: builtin/submodule--helper.c:888 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -22088,100 +22438,100 @@ msgstr "" "visa incheckning från indexet istället för den som lagrats i undermodulens " "HEAD" -#: builtin/submodule--helper.c:893 +#: builtin/submodule--helper.c:894 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]" -#: builtin/submodule--helper.c:917 +#: builtin/submodule--helper.c:918 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sökväg>" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:990 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodule)" -#: builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:993 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(submodule)->%s(blob)" -#: builtin/submodule--helper.c:1005 +#: builtin/submodule--helper.c:1006 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1056 #, c-format msgid "couldn't hash object from '%s'" msgstr "kunde inte hasha objekt från \"%s\"" -#: builtin/submodule--helper.c:1059 +#: builtin/submodule--helper.c:1060 #, c-format msgid "unexpected mode %o\n" msgstr "okänt läge %o\n" -#: builtin/submodule--helper.c:1300 +#: builtin/submodule--helper.c:1301 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "använd incechkning lagrad i indexet istället för undermodulens HEAD" -#: builtin/submodule--helper.c:1302 +#: builtin/submodule--helper.c:1303 msgid "to compare the commit in the index with that in the submodule HEAD" msgstr "" "för att jämföra incheckningen i indexet med den som lagrats i undermodulens " "HEAD" -#: builtin/submodule--helper.c:1304 +#: builtin/submodule--helper.c:1305 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "" "hoppa över undermoduler där värdet för \"ignore_config\" är satt till \"all\"" -#: builtin/submodule--helper.c:1306 +#: builtin/submodule--helper.c:1307 msgid "limit the summary size" msgstr "begränsa översiktsstorleken" -#: builtin/submodule--helper.c:1311 +#: builtin/submodule--helper.c:1312 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "" "git submodule--helper summary [<flaggor>] [<incheckning>] [--] [<sökväg>]" -#: builtin/submodule--helper.c:1335 +#: builtin/submodule--helper.c:1336 msgid "could not fetch a revision for HEAD" msgstr "kunde inte hämta en version för HEAD" -#: builtin/submodule--helper.c:1340 +#: builtin/submodule--helper.c:1341 msgid "--cached and --files are mutually exclusive" msgstr "--cached och --files är ömsesidigt uteslutande" -#: builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1408 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synkroniserar undermodul-url för \"%s\"\n" -#: builtin/submodule--helper.c:1413 +#: builtin/submodule--helper.c:1414 #, 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:1427 +#: builtin/submodule--helper.c:1428 #, 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:1438 +#: builtin/submodule--helper.c:1439 #, 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:1485 +#: builtin/submodule--helper.c:1486 msgid "suppress output of synchronizing submodule url" msgstr "dölj utdata från synkronisering av undermodul-url" -#: builtin/submodule--helper.c:1492 +#: builtin/submodule--helper.c:1493 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]" -#: builtin/submodule--helper.c:1546 +#: builtin/submodule--helper.c:1547 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -22190,7 +22540,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:1558 +#: builtin/submodule--helper.c:1559 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -22199,46 +22549,46 @@ msgstr "" "Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort " "dem" -#: builtin/submodule--helper.c:1566 +#: builtin/submodule--helper.c:1567 #, c-format msgid "Cleared directory '%s'\n" msgstr "Rensade katalogen \"%s\"\n" -#: builtin/submodule--helper.c:1568 +#: builtin/submodule--helper.c:1569 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n" -#: builtin/submodule--helper.c:1579 +#: builtin/submodule--helper.c:1580 #, c-format msgid "could not create empty submodule directory %s" msgstr "kunde inte skapa tom undermodulskatalog %s" -#: builtin/submodule--helper.c:1595 +#: builtin/submodule--helper.c:1596 #, 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:1624 +#: builtin/submodule--helper.c:1625 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:1625 +#: builtin/submodule--helper.c:1626 msgid "unregister all submodules" msgstr "avregistrera alla undermoduler" -#: builtin/submodule--helper.c:1630 +#: builtin/submodule--helper.c:1631 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]" -#: builtin/submodule--helper.c:1644 +#: builtin/submodule--helper.c:1645 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:1713 +#: builtin/submodule--helper.c:1714 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -22250,46 +22600,46 @@ msgstr "" "submodule.alternateErrorStrategy till \"info\" eller, likvärdigt, klona\n" "med \"--reference-if-able\" istället för \"--reference\"." -#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 +#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "undermodulen \"%s\" kan inte lägga till suppleant: %s" -#: builtin/submodule--helper.c:1791 +#: builtin/submodule--helper.c:1792 #, 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:1798 +#: builtin/submodule--helper.c:1799 #, 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:1822 +#: builtin/submodule--helper.c:1823 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen ska klonas till" -#: builtin/submodule--helper.c:1825 +#: builtin/submodule--helper.c:1826 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:1828 +#: builtin/submodule--helper.c:1829 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:1836 +#: builtin/submodule--helper.c:1837 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 +#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349 msgid "force cloning progress" msgstr "tvinga kloningsförlopp" -#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351 msgid "disallow cloning into non-empty directory" msgstr "förhindra kloning till icke-tom katalog" -#: builtin/submodule--helper.c:1848 +#: builtin/submodule--helper.c:1849 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22299,103 +22649,103 @@ msgstr "" "<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] --url <url> --" "path <sökväg>" -#: builtin/submodule--helper.c:1873 +#: builtin/submodule--helper.c:1874 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "vägrar skapa/använda \"%s\" i en annan undermoduls gitkatalog" -#: builtin/submodule--helper.c:1884 +#: builtin/submodule--helper.c:1885 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\"" -#: builtin/submodule--helper.c:1888 +#: builtin/submodule--helper.c:1889 #, c-format msgid "directory not empty: '%s'" msgstr "katalogen inte tom: \"%s\"" -#: builtin/submodule--helper.c:1900 +#: builtin/submodule--helper.c:1901 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" -#: builtin/submodule--helper.c:1936 +#: builtin/submodule--helper.c:1937 #, 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:1940 +#: builtin/submodule--helper.c:1941 #, 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:2041 +#: builtin/submodule--helper.c:2042 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:2045 +#: builtin/submodule--helper.c:2046 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:2075 +#: builtin/submodule--helper.c:2076 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:2104 +#: builtin/submodule--helper.c:2105 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" -#: builtin/submodule--helper.c:2254 +#: builtin/submodule--helper.c:2255 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" -#: builtin/submodule--helper.c:2265 +#: builtin/submodule--helper.c:2266 #, 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:2327 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:2330 +#: builtin/submodule--helper.c:2331 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:2334 +#: builtin/submodule--helper.c:2335 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:2340 +#: builtin/submodule--helper.c:2341 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:2343 +#: builtin/submodule--helper.c:2344 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:2345 +#: builtin/submodule--helper.c:2346 msgid "whether the initial clone should follow the shallow recommendation" msgstr "om den första klonen ska följa rekommendation för grund kloning" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2347 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:2357 +#: builtin/submodule--helper.c:2358 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:2370 +#: builtin/submodule--helper.c:2371 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:2418 +#: builtin/submodule--helper.c:2419 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -22404,84 +22754,84 @@ 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:2541 +#: builtin/submodule--helper.c:2542 #, 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:2574 +#: builtin/submodule--helper.c:2575 msgid "recurse into submodules" msgstr "rekursera ner i undermoduler" -#: builtin/submodule--helper.c:2580 +#: builtin/submodule--helper.c:2581 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]" -#: builtin/submodule--helper.c:2636 +#: builtin/submodule--helper.c:2637 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:2639 +#: builtin/submodule--helper.c:2640 msgid "unset the config in the .gitmodules file" msgstr "ta bort konfigurationen från .gitmodules-filen" -#: builtin/submodule--helper.c:2644 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <namn> [<värde>]" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <namn>" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2647 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2665 git-submodule.sh:150 +#: builtin/submodule--helper.c:2666 git-submodule.sh:150 #, 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:2681 +#: builtin/submodule--helper.c:2682 msgid "suppress output for setting url of a submodule" msgstr "dölj utdata från inställning av url för undermodul" -#: builtin/submodule--helper.c:2685 +#: builtin/submodule--helper.c:2686 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <sökväg> <nyurl>" -#: builtin/submodule--helper.c:2718 +#: builtin/submodule--helper.c:2719 msgid "set the default tracking branch to master" msgstr "välj master som förvald spårad gren" -#: builtin/submodule--helper.c:2720 +#: builtin/submodule--helper.c:2721 msgid "set the default tracking branch" msgstr "välj förvald spårad gren" -#: builtin/submodule--helper.c:2724 +#: builtin/submodule--helper.c:2725 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <sökväg>" -#: builtin/submodule--helper.c:2725 +#: builtin/submodule--helper.c:2726 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--brand) <gren> <sökväg>" -#: builtin/submodule--helper.c:2732 +#: builtin/submodule--helper.c:2733 msgid "--branch or --default required" msgstr "--branch eller --default krävs" -#: builtin/submodule--helper.c:2735 +#: builtin/submodule--helper.c:2736 msgid "--branch and --default are mutually exclusive" msgstr "--branch och --default är ömsesidigt uteslutande" -#: builtin/submodule--helper.c:2792 git.c:441 git.c:714 +#: builtin/submodule--helper.c:2793 git.c:449 git.c:724 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" -#: builtin/submodule--helper.c:2798 +#: builtin/submodule--helper.c:2799 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -22494,24 +22844,24 @@ msgstr "git symbolic-ref [<flaggor>] <namn> [<ref>]" msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <namn>" -#: builtin/symbolic-ref.c:40 +#: builtin/symbolic-ref.c:42 msgid "suppress error message for non-symbolic (detached) refs" msgstr "" "undertryck felmeddelanden för icke-symboliska (frånkopplade) referenser" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:43 msgid "delete symbolic ref" msgstr "ta bort symbolisk referens" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:44 msgid "shorten ref output" msgstr "förkorta ref-utdata" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 +#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 msgid "reason" msgstr "skäl" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 +#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 msgid "reason of the update" msgstr "skäl till uppdateringen" @@ -22543,17 +22893,17 @@ msgstr "" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<format>] <taggnamn>..." -#: builtin/tag.c:89 +#: builtin/tag.c:100 #, c-format msgid "tag '%s' not found." msgstr "taggen \"%s\" hittades inte." -#: builtin/tag.c:124 +#: builtin/tag.c:135 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tog bort tagg \"%s\" (var %s)\n" -#: builtin/tag.c:159 +#: builtin/tag.c:170 #, c-format msgid "" "\n" @@ -22566,7 +22916,7 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/tag.c:163 +#: builtin/tag.c:174 #, c-format msgid "" "\n" @@ -22581,11 +22931,11 @@ msgstr "" "Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n" "du vill.\n" -#: builtin/tag.c:230 +#: builtin/tag.c:241 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:248 +#: builtin/tag.c:259 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -22598,139 +22948,139 @@ msgstr "" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:264 +#: builtin/tag.c:275 msgid "bad object type." msgstr "felaktig objekttyp." -#: builtin/tag.c:317 +#: builtin/tag.c:328 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:324 +#: builtin/tag.c:335 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:435 +#: builtin/tag.c:446 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:437 +#: builtin/tag.c:448 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:439 +#: builtin/tag.c:450 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:440 +#: builtin/tag.c:451 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:442 +#: builtin/tag.c:453 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:444 +#: builtin/tag.c:455 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:446 +#: builtin/tag.c:457 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:448 +#: builtin/tag.c:459 msgid "force edit of tag message" msgstr "tvinga redigering av incheckningsmeddelande" -#: builtin/tag.c:449 +#: builtin/tag.c:460 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:452 +#: builtin/tag.c:463 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:453 +#: builtin/tag.c:464 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:454 builtin/update-ref.c:505 +#: builtin/tag.c:465 builtin/update-ref.c:505 msgid "create a reflog" msgstr "skapa en reflog" -#: builtin/tag.c:456 +#: builtin/tag.c:467 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:457 +#: builtin/tag.c:468 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:458 builtin/tag.c:460 +#: builtin/tag.c:469 builtin/tag.c:471 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:459 builtin/tag.c:461 +#: builtin/tag.c:470 builtin/tag.c:472 msgid "print only tags that don't contain the commit" msgstr "visa endast taggar som inte innehåller incheckningen" -#: builtin/tag.c:462 +#: builtin/tag.c:473 msgid "print only tags that are merged" msgstr "visa endast taggar som slagits samman" -#: builtin/tag.c:463 +#: builtin/tag.c:474 msgid "print only tags that are not merged" msgstr "visa endast taggar som ej slagits samman" -#: builtin/tag.c:467 +#: builtin/tag.c:478 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:515 +#: builtin/tag.c:526 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" -#: builtin/tag.c:537 +#: builtin/tag.c:548 msgid "-n option is only allowed in list mode" msgstr "Flaggan -n är endast tillåten i listläge" -#: builtin/tag.c:539 +#: builtin/tag.c:550 msgid "--contains option is only allowed in list mode" msgstr "Flaggan --contains är endast tillåten i listläge" -#: builtin/tag.c:541 +#: builtin/tag.c:552 msgid "--no-contains option is only allowed in list mode" msgstr "Flaggan --no-contains är endast tillåten i listläge" -#: builtin/tag.c:543 +#: builtin/tag.c:554 msgid "--points-at option is only allowed in list mode" msgstr "Flaggan --points-at är endast tillåten i listläge" -#: builtin/tag.c:545 +#: builtin/tag.c:556 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:556 +#: builtin/tag.c:567 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:581 +#: builtin/tag.c:592 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:586 +#: builtin/tag.c:597 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:617 +#: builtin/tag.c:628 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" -#: builtin/unpack-objects.c:502 +#: builtin/unpack-objects.c:504 msgid "Unpacking objects" msgstr "Packar upp objekt" @@ -22794,143 +23144,143 @@ msgstr " OK" msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<flaggor>] [--] [<fil>...]" -#: builtin/update-index.c:974 +#: builtin/update-index.c:976 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är àjour" -#: builtin/update-index.c:977 +#: builtin/update-index.c:979 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:980 +#: builtin/update-index.c:982 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:982 +#: builtin/update-index.c:984 msgid "let files replace directories and vice-versa" msgstr "låt filer ersätta kataloger och omvänt" -#: builtin/update-index.c:984 +#: builtin/update-index.c:986 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:986 +#: builtin/update-index.c:988 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" -#: builtin/update-index.c:989 +#: builtin/update-index.c:991 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:993 +#: builtin/update-index.c:995 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:997 +#: builtin/update-index.c:999 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1000 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1010 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1013 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1016 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1019 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:1020 +#: builtin/update-index.c:1022 msgid "do not touch index-only entries" msgstr "rör inte \"endast index\"-poster" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1024 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:1024 +#: builtin/update-index.c:1026 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:1026 +#: builtin/update-index.c:1028 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1030 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:1032 +#: builtin/update-index.c:1034 msgid "add entries from standard input to the index" msgstr "lägg poster från standard in till indexet" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1038 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:1040 +#: builtin/update-index.c:1042 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1046 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1049 msgid "report actions to standard output" msgstr "rapportera åtgärder på standard ut" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1051 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1055 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1057 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1059 msgid "enable/disable untracked cache" msgstr "aktivera/inaktivera ospårad cache" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1061 msgid "test if the filesystem supports untracked cache" msgstr "testa om filsystemet stöder ospårad cache" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1063 msgid "enable untracked cache without testing the filesystem" msgstr "aktivera ospårad cache utan att testa filsystemet" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1065 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:1065 +#: builtin/update-index.c:1067 msgid "enable or disable file system monitor" msgstr "aktivera eller inaktivera filsystemsövervakning" -#: builtin/update-index.c:1067 +#: builtin/update-index.c:1069 msgid "mark files as fsmonitor valid" msgstr "markera filer som \"fsmonitor valid\"" -#: builtin/update-index.c:1070 +#: builtin/update-index.c:1072 msgid "clear fsmonitor valid bit" msgstr "töm \"fsmonitor valid\"-bit" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1175 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -22938,7 +23288,7 @@ msgstr "" "core.splitIndex är satt till false; ta bort eller ändra det om du verkligen " "vill aktivera delat index" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1184 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -22946,7 +23296,7 @@ msgstr "" "core.splitIndex är satt till true; ta bort eller ändra det om du verkligen " "vill inaktivera delat index" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1196 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -22954,11 +23304,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:1198 +#: builtin/update-index.c:1200 msgid "Untracked cache disabled" msgstr "Ospårad cache är inaktiverad" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1208 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -22966,26 +23316,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:1210 +#: builtin/update-index.c:1212 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Ospårad cache är aktiverad för \"%s\"" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1220 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:1222 +#: builtin/update-index.c:1224 msgid "fsmonitor enabled" msgstr "fsmonitor aktiverat" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1227 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:1229 +#: builtin/update-index.c:1231 msgid "fsmonitor disabled" msgstr "fsmonitor inaktiverat" @@ -23105,7 +23455,7 @@ msgstr "git worktree remove [<flaggor>] <arbetskatalog>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <sökväg>" -#: builtin/worktree.c:61 builtin/worktree.c:933 +#: builtin/worktree.c:61 builtin/worktree.c:935 #, c-format msgid "failed to delete '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -23178,104 +23528,104 @@ msgstr "Förbereder arbetskatalog (checkar ut \"%s\")" msgid "Preparing worktree (detached HEAD %s)" msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)" -#: builtin/worktree.c:480 +#: builtin/worktree.c:482 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:483 +#: builtin/worktree.c:485 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:485 +#: builtin/worktree.c:487 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:487 +#: builtin/worktree.c:489 msgid "populate the new working tree" msgstr "befolka den nya arbetskatalogen" -#: builtin/worktree.c:488 +#: builtin/worktree.c:490 msgid "keep the new working tree locked" msgstr "låt arbetskatalogen förbli låst" -#: builtin/worktree.c:491 +#: builtin/worktree.c:493 msgid "set up tracking mode (see git-branch(1))" msgstr "ställ in spårningsläge (se git-branch(1))" -#: builtin/worktree.c:494 +#: builtin/worktree.c:496 msgid "try to match the new branch name with a remote-tracking branch" msgstr "försök träffa namn på ny gren mot en fjärrspårande gren" -#: builtin/worktree.c:502 +#: builtin/worktree.c:504 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" -#: builtin/worktree.c:563 +#: builtin/worktree.c:565 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:680 +#: builtin/worktree.c:682 msgid "show extended annotations and reasons, if available" msgstr "visa utökade annoteringar och grunder, om tillgängliga" -#: builtin/worktree.c:682 +#: builtin/worktree.c:684 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "" "lägg till \"prunable\"-annoteringar till arbetskataloger äldre än <tid>" -#: builtin/worktree.c:691 +#: builtin/worktree.c:693 msgid "--verbose and --porcelain are mutually exclusive" msgstr "--verbose och --porcelain är ömsesidigt uteslutande" -#: builtin/worktree.c:718 +#: builtin/worktree.c:720 msgid "reason for locking" msgstr "orsak till lås" -#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837 -#: builtin/worktree.c:961 +#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839 +#: builtin/worktree.c:963 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:732 builtin/worktree.c:765 +#: builtin/worktree.c:734 builtin/worktree.c:767 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:737 +#: builtin/worktree.c:739 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:739 +#: builtin/worktree.c:741 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:767 +#: builtin/worktree.c:769 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" -#: builtin/worktree.c:808 +#: builtin/worktree.c:810 msgid "working trees containing submodules cannot be moved or removed" msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort" -#: builtin/worktree.c:816 +#: builtin/worktree.c:818 msgid "force move even if worktree is dirty or locked" msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst" -#: builtin/worktree.c:839 builtin/worktree.c:963 +#: builtin/worktree.c:841 builtin/worktree.c:965 #, c-format msgid "'%s' is a main working tree" msgstr "\"%s\" är inte en huvudarbetskatalog" -#: builtin/worktree.c:844 +#: builtin/worktree.c:846 #, c-format msgid "could not figure out destination name from '%s'" msgstr "kunde inte lista ut målnamn från \"%s\"" -#: builtin/worktree.c:857 +#: builtin/worktree.c:859 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -23284,7 +23634,7 @@ msgstr "" "kan inte flytta en låst arbetskatalog, orsak till lås: %s\n" "använd \"move -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:859 +#: builtin/worktree.c:861 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -23292,38 +23642,38 @@ msgstr "" "kan inte flytta en låst arbetskatalog;\n" "använd \"move -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:862 +#: builtin/worktree.c:864 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s" -#: builtin/worktree.c:867 +#: builtin/worktree.c:869 #, c-format msgid "failed to move '%s' to '%s'" msgstr "misslyckades flytta \"%s\" till \"%s\"" -#: builtin/worktree.c:913 +#: builtin/worktree.c:915 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "misslyckades köra \"git status\" på \"%s\"" -#: builtin/worktree.c:917 +#: builtin/worktree.c:919 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" "\"%s\" innehåller ändrade eller ospårade filer, använd --force för att ta " "bort det" -#: builtin/worktree.c:922 +#: builtin/worktree.c:924 #, 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:945 +#: builtin/worktree.c:947 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:968 +#: builtin/worktree.c:970 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -23332,7 +23682,7 @@ msgstr "" "kan inte ta bort en låst arbetskatalog, orsak till låset: %s\n" "använd \"remove -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:970 +#: builtin/worktree.c:972 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -23340,17 +23690,17 @@ 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:973 +#: builtin/worktree.c:975 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s" -#: builtin/worktree.c:997 +#: builtin/worktree.c:999 #, c-format msgid "repair: %s: %s" msgstr "reparera: %s: %s" -#: builtin/worktree.c:1000 +#: builtin/worktree.c:1002 #, c-format msgid "error: %s: %s" msgstr "fel: %s: %s" @@ -23371,49 +23721,6 @@ msgstr "visa trädobjekt för underkatalogen <prefix>" msgid "only useful for debugging" msgstr "endast användbart vid felsökning" -#: http-fetch.c:118 -#, c-format -msgid "argument to --packfile must be a valid hash (got '%s')" -msgstr "" -"argumentet till --packfile måste vara ett giltigt hashvärde (fick '%s')" - -#: http-fetch.c:128 -msgid "not a git repository" -msgstr "inte ett git-arkiv" - -#: http-fetch.c:134 -msgid "--packfile requires --index-pack-args" -msgstr "--packfile kräver --index-pack-args" - -#: http-fetch.c:143 -msgid "--index-pack-args can only be used with --packfile" -msgstr "--index-pack-args kan endast användas med --packfile" - -#: t/helper/test-fast-rebase.c:141 -msgid "unhandled options" -msgstr "flaggor som inte hanterats" - -#: t/helper/test-fast-rebase.c:146 -msgid "error preparing revisions" -msgstr "fel när revisioner skulle förberedas" - -#: t/helper/test-reach.c:154 -#, c-format -msgid "commit %s is not marked reachable" -msgstr "incheckning %s är inte märkt nåbar" - -#: t/helper/test-reach.c:164 -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:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" @@ -23470,22 +23777,27 @@ msgstr "inget prefix angavs för --super-prefix\n" msgid "-c expects a configuration string\n" msgstr "-c förväntar en konfigurationssträng\n" -#: git.c:292 +#: git.c:260 +#, c-format +msgid "no config key given for --config-env\n" +msgstr "ingen konfigurationsnyckel angavs för --config-env\n" + +#: git.c:300 #, c-format msgid "no directory given for -C\n" msgstr "ingen katalog angavs för -C\n" -#: git.c:318 +#: git.c:326 #, c-format msgid "unknown option: %s\n" msgstr "okänd flagga: %s\n" -#: git.c:367 +#: git.c:375 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "vid expandering av aliaset \"%s\": \"%s\"" -#: git.c:376 +#: git.c:384 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -23494,39 +23806,39 @@ msgstr "" "aliaset \"%s\" ändrar miljövariabler.\n" "Du kan använda \"!git\" i aliaset för att göra det" -#: git.c:383 +#: git.c:391 #, c-format msgid "empty alias for %s" msgstr "tomt alias för %s" -#: git.c:386 +#: git.c:394 #, c-format msgid "recursive alias: %s" msgstr "rekursivt alias: %s" -#: git.c:468 +#: git.c:476 msgid "write failure on standard output" msgstr "skrivfel på standard ut" -#: git.c:470 +#: git.c:478 msgid "unknown write failure on standard output" msgstr "okänt skrivfel på standard ut" -#: git.c:472 +#: git.c:480 msgid "close failed on standard output" msgstr "stäng misslyckades på standard ut" -#: git.c:823 +#: git.c:833 #, 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:873 +#: git.c:883 #, c-format msgid "cannot handle %s as a builtin" msgstr "kan inte hantera %s som inbyggd" -#: git.c:886 +#: git.c:896 #, c-format msgid "" "usage: %s\n" @@ -23535,17 +23847,167 @@ msgstr "" "användning: %s\n" "\n" -#: git.c:906 +#: git.c:916 #, 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:918 +#: git.c:928 #, c-format msgid "failed to run command '%s': %s\n" msgstr "misslyckades köra kommandot \"%s\": %s\n" +#: http-fetch.c:118 +#, c-format +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "" +"argumentet till --packfile måste vara ett giltigt hashvärde (fick '%s')" + +#: http-fetch.c:128 +msgid "not a git repository" +msgstr "inte ett git-arkiv" + +#: http-fetch.c:134 +msgid "--packfile requires --index-pack-args" +msgstr "--packfile kräver --index-pack-args" + +#: http-fetch.c:143 +msgid "--index-pack-args can only be used with --packfile" +msgstr "--index-pack-args kan endast användas med --packfile" + +#: t/helper/test-fast-rebase.c:141 +msgid "unhandled options" +msgstr "flaggor som inte hanterats" + +#: t/helper/test-fast-rebase.c:146 +msgid "error preparing revisions" +msgstr "fel när revisioner skulle förberedas" + +#: t/helper/test-reach.c:154 +#, c-format +msgid "commit %s is not marked reachable" +msgstr "incheckning %s är inte märkt nåbar" + +#: t/helper/test-reach.c:164 +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" + +#: t/helper/test-simple-ipc.c:262 +#, c-format +msgid "socket/pipe already in use: '%s'" +msgstr "uttag/rör används redan: \"%s\"" + +#: t/helper/test-simple-ipc.c:264 +#, c-format +msgid "could not start server on: '%s'" +msgstr "kunde inte starta server på: \"%s\"" + +#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331 +msgid "could not spawn daemon in the background" +msgstr "kunde inte starta serverprocess i bakgrunden" + +#: t/helper/test-simple-ipc.c:356 +msgid "waitpid failed" +msgstr "\"waitpid\" misslyckades" + +#: t/helper/test-simple-ipc.c:376 +msgid "daemon not online yet" +msgstr "serverprocessen ännu inte operativ" + +#: t/helper/test-simple-ipc.c:406 +msgid "daemon failed to start" +msgstr "serverprocessen kunde inte startas" + +#: t/helper/test-simple-ipc.c:410 +msgid "waitpid is confused" +msgstr "waitpid är förvirrad" + +#: t/helper/test-simple-ipc.c:541 +msgid "daemon has not shutdown yet" +msgstr "serverprocessen har ännu inte avslutats" + +#: t/helper/test-simple-ipc.c:682 +msgid "test-helper simple-ipc is-active [<name>] [<options>]" +msgstr "test-helper simple-ipc is-active [<namn>] [<flaggor>]" + +#: t/helper/test-simple-ipc.c:683 +msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]" +msgstr "test-helper simple-ipc run-daemon [<namn>] [<trådar>]" + +#: t/helper/test-simple-ipc.c:684 +msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]" +msgstr "" +"test-helper simple-ipc start-daemon [<namn>] [<trådar>] [<max-väntetid>]" + +#: t/helper/test-simple-ipc.c:685 +msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]" +msgstr "test-helper simple-ipc stop-daemon [<namn>] [<max-väntetid>]" + +#: t/helper/test-simple-ipc.c:686 +msgid "test-helper simple-ipc send [<name>] [<token>]" +msgstr "test-helper simple-ipc send [<namn>] [<igenkänningstecken>]" + +#: t/helper/test-simple-ipc.c:687 +msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]" +msgstr "test-helper simple-ipc sendbytes [<namn>] [<antal-byte>] [<byte>]" + +#: t/helper/test-simple-ipc.c:688 +msgid "" +"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " +"[<batchsize>]" +msgstr "" +"test-helper simple-ipc multiple [<namn>] [<trådar>] [<antal-byte>] " +"[<buntstorlek>]" + +#: t/helper/test-simple-ipc.c:696 +msgid "name or pathname of unix domain socket" +msgstr "namn eller sövkäg till unixdomän-uttag" + +#: t/helper/test-simple-ipc.c:698 +msgid "named-pipe name" +msgstr "namn på namngivet rör" + +#: t/helper/test-simple-ipc.c:700 +msgid "number of threads in server thread pool" +msgstr "antal trådar i serverns trådpool" + +#: t/helper/test-simple-ipc.c:701 +msgid "seconds to wait for daemon to start or stop" +msgstr "sekunder att vänta på att serverprocessen startar eller stoppar" + +#: t/helper/test-simple-ipc.c:703 +msgid "number of bytes" +msgstr "antal byte" + +#: t/helper/test-simple-ipc.c:704 +msgid "number of requests per thread" +msgstr "antal frågor per tråd" + +#: t/helper/test-simple-ipc.c:706 +msgid "byte" +msgstr "byte" + +#: t/helper/test-simple-ipc.c:706 +msgid "ballast character" +msgstr "ballasttecken" + +#: t/helper/test-simple-ipc.c:707 +msgid "token" +msgstr "igenkänningstecken" + +#: t/helper/test-simple-ipc.c:707 +msgid "command token to send to the server" +msgstr "igenkänningstecken för kommando att sända till servern" + #: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" @@ -23582,7 +24044,7 @@ msgstr "Kan inte sätta SSL-bakända till \"%s\": cURL byggdes utan SSL-bakändo msgid "Could not set SSL backend to '%s': already set" msgstr "Kunde inte sätta SSL-bakända till \"%s\": redan valt" -#: http.c:2025 +#: http.c:2035 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -23733,43 +24195,43 @@ msgstr "ingen kompilatorinformation tillgänglig\n" msgid "no libc information available\n" msgstr "ingen libc-information tillgänglig\n" -#: list-objects-filter-options.h:91 +#: list-objects-filter-options.h:94 msgid "args" msgstr "argument" -#: list-objects-filter-options.h:92 +#: list-objects-filter-options.h:95 msgid "object filtering" msgstr "objektfiltrering" -#: parse-options.h:183 +#: parse-options.h:184 msgid "expiry-date" msgstr "giltig-till" -#: parse-options.h:197 +#: parse-options.h:198 msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakåtkompatibilitet)" -#: parse-options.h:309 +#: parse-options.h:310 msgid "be more verbose" msgstr "var mer pratsam" -#: parse-options.h:311 +#: parse-options.h:312 msgid "be more quiet" msgstr "var mer tyst" -#: parse-options.h:317 +#: parse-options.h:318 msgid "use <n> digits to display object names" msgstr "använd <n> siffror för att visa objektnamn" -#: parse-options.h:336 +#: parse-options.h:337 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer ska tas bort från meddelande" -#: parse-options.h:337 +#: parse-options.h:338 msgid "read pathspec from file" msgstr "läs sökvägsangivelse från fil" -#: parse-options.h:338 +#: parse-options.h:339 msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "med --pathspec-from-file, sökvägsangivelser avdelas med NUL-tecken" @@ -25422,27 +25884,32 @@ msgstr "lokal zon skiljer sig från GMT med delar av minuter\n" msgid "local time offset greater than or equal to 24 hours\n" msgstr "lokal tidszonförskjutning större än eller lika med 24 timmar\n" -#: git-send-email.perl:223 git-send-email.perl:229 +#: git-send-email.perl:222 +#, perl-format +msgid "fatal: command '%s' died with exit code %d" +msgstr "ödesdigert: kommandot \"%s\" dog med slutkoden %d" + +#: git-send-email.perl:235 msgid "the editor exited uncleanly, aborting everything" msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting" -#: git-send-email.perl:312 +#: git-send-email.perl:321 #, 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:317 +#: git-send-email.perl:326 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "\"%s.final\" innehåller det skrivna brevet.\n" -#: git-send-email.perl:410 +#: git-send-email.perl:419 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-alias är inkompatibelt med andra flaggor\n" -#: git-send-email.perl:484 +#: git-send-email.perl:493 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -25454,11 +25921,11 @@ msgstr "" "Sätt sendemail.forbidSendmailVariables till false för att inaktivera denna " "kontroll.\n" -#: git-send-email.perl:489 git-send-email.perl:691 +#: git-send-email.perl:498 git-send-email.perl:700 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:492 +#: git-send-email.perl:501 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -25466,37 +25933,37 @@ msgstr "" "\"batch-size\" och \"relogin\" måste anges tillsammans (via kommandorad " "eller konfigurationsflagga)\n" -#: git-send-email.perl:505 +#: git-send-email.perl:514 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Okänt fält i --suppress-cc: \"%s\"\n" -#: git-send-email.perl:536 +#: git-send-email.perl:545 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Okänd inställning i --confirm: \"%s\"\n" -#: git-send-email.perl:564 +#: git-send-email.perl:573 #, 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:566 +#: git-send-email.perl:575 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "varning: \":include:\" stöds inte: %s\n" -#: git-send-email.perl:568 +#: git-send-email.perl:577 #, 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:573 +#: git-send-email.perl:582 #, 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:657 +#: git-send-email.perl:666 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -25511,21 +25978,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:678 +#: git-send-email.perl:687 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Misslyckades utföra opendir %s: %s" -#: git-send-email.perl:702 -#, perl-format -msgid "" -"fatal: %s: %s\n" -"warning: no patches were sent\n" -msgstr "" -"ödesdigert: %s: %s\n" -"varning: inga patchar har sänts\n" - -#: git-send-email.perl:713 +#: git-send-email.perl:720 msgid "" "\n" "No patch files specified!\n" @@ -25535,17 +25993,17 @@ msgstr "" "Inga patchfiler angavs!\n" "\n" -#: git-send-email.perl:726 +#: git-send-email.perl:733 #, perl-format msgid "No subject line in %s?" msgstr "Ingen ärenderad i %s?" -#: git-send-email.perl:736 +#: git-send-email.perl:743 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Kunde inte öppna för skrivning %s: %s" -#: git-send-email.perl:747 +#: git-send-email.perl:754 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -25559,38 +26017,38 @@ msgstr "" "\n" "Rensa brevkroppen om du inte vill sända någon sammanfattning.\n" -#: git-send-email.perl:771 +#: git-send-email.perl:778 #, perl-format msgid "Failed to open %s: %s" msgstr "Misslyckades öppna %s: %s" -#: git-send-email.perl:788 +#: git-send-email.perl:795 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Misslyckades öppna %s.final: %s" -#: git-send-email.perl:831 +#: git-send-email.perl:838 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:866 +#: git-send-email.perl:873 #, 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:921 +#: git-send-email.perl:928 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:926 +#: git-send-email.perl:933 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Vilken åttabitarsteckenkodning ska jag ange [UTF-8]? " -#: git-send-email.perl:934 +#: git-send-email.perl:941 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -25603,21 +26061,21 @@ msgstr "" "har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen " "vill sända.\n" -#: git-send-email.perl:953 +#: git-send-email.perl:960 msgid "To whom should the emails be sent (if anyone)?" msgstr "Till vem ska breven sändas (om någon)?" -#: git-send-email.perl:971 +#: git-send-email.perl:978 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n" -#: git-send-email.perl:983 +#: git-send-email.perl:990 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:1041 git-send-email.perl:1049 +#: git-send-email.perl:1048 git-send-email.perl:1056 #, 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" @@ -25625,16 +26083,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:1053 +#: git-send-email.perl:1060 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:1370 +#: git-send-email.perl:1377 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA-sökvägen \"%s\" finns inte" -#: git-send-email.perl:1453 +#: git-send-email.perl:1460 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -25661,124 +26119,139 @@ 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:1468 +#: git-send-email.perl:1475 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:1471 +#: git-send-email.perl:1478 msgid "Send this email reply required" msgstr "Svar krävs på frågan \"Sända brevet?\"" -#: git-send-email.perl:1499 +#: git-send-email.perl:1506 msgid "The required SMTP server is not properly defined." msgstr "Nödvändig SMTP-server har inte angivits korrekt." -#: git-send-email.perl:1546 +#: git-send-email.perl:1553 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Servern stöder inte SMARTTLS! %s" -#: git-send-email.perl:1551 git-send-email.perl:1555 +#: git-send-email.perl:1558 git-send-email.perl:1562 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS misslyckades! %s" -#: git-send-email.perl:1564 +#: git-send-email.perl:1571 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:1582 +#: git-send-email.perl:1589 #, perl-format msgid "Failed to send %s\n" msgstr "Misslyckades sända %s\n" -#: git-send-email.perl:1585 +#: git-send-email.perl:1592 #, perl-format msgid "Dry-Sent %s\n" msgstr "Test-Sände %s\n" -#: git-send-email.perl:1585 +#: git-send-email.perl:1592 #, perl-format msgid "Sent %s\n" msgstr "Sände %s\n" -#: git-send-email.perl:1587 +#: git-send-email.perl:1594 msgid "Dry-OK. Log says:\n" msgstr "Test-OK. Loggen säger:\n" -#: git-send-email.perl:1587 +#: git-send-email.perl:1594 msgid "OK. Log says:\n" msgstr "OK. Loggen säger:\n" -#: git-send-email.perl:1599 +#: git-send-email.perl:1606 msgid "Result: " msgstr "Resultat: " -#: git-send-email.perl:1602 +#: git-send-email.perl:1609 msgid "Result: OK\n" msgstr "Resultat: OK\n" -#: git-send-email.perl:1620 +#: git-send-email.perl:1627 #, perl-format msgid "can't open file %s" msgstr "kan inte öppna filen %s" -#: git-send-email.perl:1667 git-send-email.perl:1687 +#: git-send-email.perl:1674 git-send-email.perl:1694 #, 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:1673 +#: git-send-email.perl:1680 #, 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:1730 +#: git-send-email.perl:1737 #, 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:1765 +#: git-send-email.perl:1772 #, 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:1876 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Kunde inte köra \"%s\"" -#: git-send-email.perl:1883 +#: git-send-email.perl:1890 #, 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:1887 +#: git-send-email.perl:1894 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) misslyckades stänga röret till \"%s\"" -#: git-send-email.perl:1917 +#: git-send-email.perl:1924 msgid "cannot send message as 7bit" msgstr "kan inte sända brev som sjubitars" -#: git-send-email.perl:1925 +#: git-send-email.perl:1932 msgid "invalid transfer encoding" msgstr "ogiltig överföringskondning" -#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 +#: git-send-email.perl:1966 +#, perl-format +msgid "" +"fatal: %s: rejected by sendemail-validate hook\n" +"%s\n" +"warning: no patches were sent\n" +msgstr "" +"ödesdigert: %s: refuserad av sendemail-validate-kroken\n" +"%s\n" +"varning: inga patchar har sänts\n" + +#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039 #, perl-format msgid "unable to open %s: %s\n" msgstr "kunde inte öppna %s: %s\n" -#: git-send-email.perl:1969 +#: git-send-email.perl:1979 #, perl-format -msgid "%s: patch contains a line longer than 998 characters" -msgstr "%s: patchen innehåller en rad längre än 998 tecken" +msgid "" +"fatal: %s:%d is longer than 998 characters\n" +"warning: no patches were sent\n" +msgstr "" +"ödesdigert: %s:%d är längre än 998 tecken\n" +"varning: inga patchar har sänts\n" -#: git-send-email.perl:1986 +#: git-send-email.perl:1997 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" @@ -25786,11 +26259,42 @@ msgstr "" "säkerhetskopior.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1990 +#: git-send-email.perl:2001 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "--cached and --3way cannot be used together." +#~ msgstr "--cached och --3way kan inte användas samtidigt." + +#~ msgid "both" +#~ msgstr "båda" + +#~ msgid "one" +#~ msgstr "en" + +#~ msgid "Already up to date!" +#~ msgstr "Redan à jour!" + +#~ msgid "Already up to date. Yeeah!" +#~ msgstr "Redan à jour. Toppen!" + +#~ msgid "--batch-size option is only for 'repack' subcommand" +#~ msgstr "flaggan --batch-size används bara i underkommandot \"repack\"" + +#~ msgid "Percentage by which creation is weighted" +#~ msgstr "Procent som skapelse vägs med" + +#~ 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." + +#~ msgid "%s: patch contains a line longer than 998 characters" +#~ msgstr "%s: patchen innehåller en rad längre än 998 tecken" + #~ msgid "repository contains replace objects; skipping commit-graph" #~ msgstr "arkivet innehåller replace-objekt; hoppar över incheckningsgraf" @@ -26798,9 +27302,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "commit object" #~ msgstr "incheckningsobjekt" -#~ msgid "tree object" -#~ msgstr "trädobjekt" - #~ msgid "blob object" #~ msgstr "blob-objekt" @@ -26841,9 +27342,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "insanely long object directory %.*s" #~ msgstr "tokigt lång objektkatalog %.*s" -#~ msgid "git merge [<options>] <msg> HEAD <commit>" -#~ msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>" - #~ msgid "tag name too long: %.*s..." #~ msgstr "taggnamnet för långt: %.*s..." @@ -26944,9 +27442,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: ogiltig " #~ "enhet" -#~ msgid "This is the 2nd commit message:" -#~ msgstr "Det här är 2:a incheckningsmeddelandet:" - #~ msgid "This is the 3rd commit message:" #~ msgstr "Det här är 3:e incheckningsmeddelandet:" @@ -26983,9 +27478,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "This is the ${n}rd commit message:" #~ msgstr "Det här är ${n}:e incheckningsmeddelandet:" -#~ msgid "The 1st commit message will be skipped:" -#~ msgstr "1:a incheckningsmeddelandet kommer hoppas över:" - #~ msgid "The 2nd commit message will be skipped:" #~ msgstr "2:a incheckningsmeddelandet kommer hoppas över:" |