diff options
| author |  Peter Krefting <peter@softwolves.pp.se> | 2019-07-31 12:44:47 +0200 |
|---|---|---|
| committer | Peter Krefting <peter@softwolves.pp.se> | 2019-07-31 12:46:31 +0200 |
| commit | 2613f067dcae7d8feee5e054c6f6885ff3d454d0 (patch) | |
| tree | 50888a2929992cee50f31e0c795ecdd2f297de1b | |
| parent | l10n: git.pot: v2.23.0 round 1 (130 new, 35 removed) (diff) | |
| download | tgif-2613f067dcae7d8feee5e054c6f6885ff3d454d0.tar.xz | |
l10n: sv.po: Update Swedish translation (4676t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
| -rw-r--r-- | po/sv.po | 6565 |
1 files changed, 3586 insertions, 2979 deletions
@@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.22.0\n" +"Project-Id-Version: git 2.23.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-05-14 17:09+0800\n" -"PO-Revision-Date: 2019-05-14 15:44+0100\n" +"POT-Creation-Date: 2019-07-30 09:59+0800\n" +"PO-Revision-Date: 2019-07-31 12:40+0200\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -16,49 +16,49 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 2.91.7\n" +"X-Generator: Poedit 2.0.2\n" -#: advice.c:103 +#: advice.c:109 #, c-format msgid "%shint: %.*s%s\n" msgstr "%stips: %.*s%s\n" -#: advice.c:156 +#: advice.c:162 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:158 +#: advice.c:164 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:160 +#: advice.c:166 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:162 +#: advice.c:168 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:164 +#: advice.c:170 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:166 +#: advice.c:172 #, 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:174 +#: advice.c:180 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -66,49 +66,63 @@ 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:182 +#: advice.c:188 msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:187 builtin/merge.c:1320 +#: advice.c:193 builtin/merge.c:1327 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: advice.c:189 +#: advice.c:195 msgid "Please, commit your changes before merging." msgstr "Checka in dina ändringar innan du utför sammanslagningen." -#: advice.c:190 +#: advice.c:196 msgid "Exiting because of unfinished merge." msgstr "Avslutar på grund av ofullbordad sammanslagning." -#: advice.c:196 +#: advice.c:202 #, c-format msgid "" -"Note: checking out '%s'.\n" +"Note: switching to '%s'.\n" "\n" "You are in 'detached HEAD' state. You can look around, make experimental\n" "changes and commit them, and you can discard any commits you make in this\n" -"state without impacting any branches by performing another checkout.\n" +"state without impacting any branches by switching back to a branch.\n" "\n" "If you want to create a new branch to retain commits you create, you may\n" -"do so (now or later) by using -b with the checkout command again. Example:\n" +"do so (now or later) by using -c with the switch command. Example:\n" +"\n" +" git switch -c <new-branch-name>\n" "\n" -" git checkout -b <new-branch-name>\n" +"Or undo this operation with:\n" +"\n" +" git switch -\n" +"\n" +"Turn off this advice by setting config variable advice.detachedHead to " +"false\n" "\n" msgstr "" "Observera: checkar ut \"%s\".\n" "\n" "Du har nu ett \"frånkopplat HEAD\". Du kan se dig omkring, experimentera\n" "med ändringar och checka in dem, och du kan kasta incheckningar du gör\n" -"i det här läget utan att det påverkar grenar genom att checka ut på\n" -"nytt.\n" +"i det här läget utan att det påverkar grenar genom att växla tillbaka\n" +"till en gren.\n" "\n" "Om du vill skapa en ny gren för att behålla ändringarna du skapar, kan\n" -"du göra det (nu eller senare) genom att använda checkout-kommandot igen\n" -"med -b. Till exempel:\n" +"du göra det (nu eller senare) genom att använda switch-kommandot med -c.\n" +"Exempel:\n" +"\n" +" git switch -c <namn-på-ny-gren>\n" +"\n" +"Eller gör den här ändringen ogjord med:\n" "\n" -" git checkout -b <namn-på-ny-gren>\n" +" git switch -\n" +"\n" +"Stäng av den här hjälptexten genom att sätta konfigurationsvariabeln\n" +"advice.detachedHead till false\n" "\n" #: alias.c:50 @@ -119,92 +133,92 @@ msgstr "kommandorad avslutas med \\" msgid "unclosed quote" msgstr "citat ej stängt" -#: apply.c:63 +#: apply.c:69 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "okänt alternativ för whitespace: \"%s\"" -#: apply.c:79 +#: apply.c:85 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: apply.c:129 +#: apply.c:135 msgid "--reject and --3way cannot be used together." msgstr "--reject och --3way kan inte användas samtidigt." -#: apply.c:131 +#: apply.c:137 msgid "--cached and --3way cannot be used together." msgstr "--cached och --3way kan inte användas samtidigt." -#: apply.c:134 +#: apply.c:140 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: apply.c:145 +#: apply.c:151 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: apply.c:148 +#: apply.c:154 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: apply.c:829 +#: apply.c:801 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: apply.c:838 +#: apply.c:810 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: apply.c:912 +#: apply.c:884 #, c-format msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen på rad %d" -#: apply.c:950 +#: apply.c:922 #, 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:956 +#: apply.c:928 #, 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:957 +#: apply.c:929 #, 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:962 +#: apply.c:934 #, 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:991 +#: apply.c:963 #, c-format msgid "invalid mode on line %d: %s" msgstr "ogiltigt läge på rad %d: %s" -#: apply.c:1310 +#: apply.c:1282 #, c-format msgid "inconsistent header lines %d and %d" msgstr "huvudet är inkonsekvent mellan rad %d och %d" -#: apply.c:1482 +#: apply.c:1460 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: apply.c:1551 +#: apply.c:1529 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: apply.c:1571 +#: apply.c:1551 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -220,82 +234,82 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: apply.c:1584 +#: apply.c:1564 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)" -#: apply.c:1772 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: apply.c:1774 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: apply.c:1808 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: apply.c:1845 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: apply.c:1847 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: apply.c:1850 +#: 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:1997 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: apply.c:2034 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: apply.c:2196 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: apply.c:2282 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: apply.c:2286 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: apply.c:2945 +#: apply.c:2925 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: apply.c:3066 +#: apply.c:3046 #, 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:3078 +#: apply.c:3058 #, 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:3084 +#: apply.c:3064 #, c-format msgid "" "while searching for:\n" @@ -304,25 +318,25 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: apply.c:3106 +#: apply.c:3086 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: apply.c:3114 +#: apply.c:3094 #, 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:3161 +#: apply.c:3141 #, 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:3171 +#: apply.c:3151 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -330,426 +344,426 @@ msgstr "" "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande " "innehållet." -#: apply.c:3179 +#: apply.c:3159 #, 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:3197 +#: apply.c:3177 #, 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:3210 +#: apply.c:3190 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: apply.c:3216 +#: apply.c:3196 #, 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:3237 +#: apply.c:3217 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: apply.c:3360 +#: apply.c:3340 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279 +#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" -#: apply.c:3420 +#: apply.c:3400 #, 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:3449 apply.c:3692 +#: apply.c:3429 apply.c:3672 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: apply.c:3535 apply.c:3707 +#: apply.c:3515 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: apply.c:3544 apply.c:3715 +#: apply.c:3524 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: apply.c:3579 +#: apply.c:3559 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:3582 +#: apply.c:3562 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Faller tillbaka på trevägssammanslagning...\n" -#: apply.c:3598 apply.c:3602 +#: apply.c:3578 apply.c:3582 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kunde inte läsa aktuellt innehåll i \"%s\"" -#: apply.c:3614 +#: apply.c:3594 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n" -#: apply.c:3628 +#: apply.c:3608 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Applicerade patchen på \"%s\" med konflikter.\n" -#: apply.c:3633 +#: apply.c:3613 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Tillämpade patchen på \"%s\" rent.\n" -#: apply.c:3659 +#: apply.c:3639 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: apply.c:3732 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: apply.c:3734 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856 +#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 #: read-cache.c:1309 #, c-format msgid "invalid path '%s'" -msgstr "ogiltig sökväg ”%s”" +msgstr "ogiltig sökväg \"%s\"" -#: apply.c:3943 +#: apply.c:3923 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: apply.c:3946 +#: apply.c:3926 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: apply.c:3966 +#: apply.c:3946 #, 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:3971 +#: apply.c:3951 #, 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:3991 +#: apply.c:3971 #, 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:3995 +#: apply.c:3975 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: apply.c:4010 +#: apply.c:3990 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: apply.c:4102 +#: apply.c:4082 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s" -#: apply.c:4109 +#: apply.c:4089 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "nytt läge för %s, som inte finns i nuvarande HEAD" -#: apply.c:4112 +#: apply.c:4092 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller är oanvändbar (%s)." -#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143 +#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: apply.c:4121 +#: apply.c:4101 #, c-format msgid "could not add %s to temporary index" msgstr "kunde inte lägga till %s till temporärt index" -#: apply.c:4131 +#: apply.c:4111 #, c-format msgid "could not write temporary index to %s" msgstr "kunde inte skriva temporärt index till %s" -#: apply.c:4269 +#: apply.c:4249 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: apply.c:4303 +#: apply.c:4283 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: apply.c:4309 +#: apply.c:4289 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: apply.c:4317 +#: apply.c:4297 #, 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:4323 apply.c:4468 +#: apply.c:4303 apply.c:4448 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: apply.c:4366 +#: apply.c:4346 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" -#: apply.c:4370 +#: apply.c:4350 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: apply.c:4440 +#: apply.c:4420 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: apply.c:4538 +#: apply.c:4518 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: apply.c:4546 +#: apply.c:4526 msgid "internal error" msgstr "internt fel" -#: apply.c:4549 +#: apply.c:4529 #, 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:4560 +#: apply.c:4540 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118 +#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" -#: apply.c:4582 +#: apply.c:4562 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: apply.c:4586 +#: apply.c:4566 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4696 +#: apply.c:4676 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4704 +#: apply.c:4684 msgid "unrecognized input" msgstr "indata känns inte igen" -#: apply.c:4724 +#: apply.c:4704 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4879 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4906 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "undertryckte %d fel i blanksteg" msgstr[1] "undertryckte %d fel i blanksteg" -#: apply.c:4912 apply.c:4927 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d rad lägger till fel i blanksteg." msgstr[1] "%d rader lägger till fel i blanksteg." -#: apply.c:4920 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg." msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg." -#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213 -#: builtin/clone.c:123 builtin/fetch.c:118 builtin/merge.c:271 -#: builtin/pull.c:207 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369 -#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852 -#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197 +#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 +#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 +#: builtin/pull.c:208 builtin/submodule--helper.c:407 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 msgid "path" msgstr "sökväg" -#: apply.c:4964 +#: apply.c:4944 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:4967 +#: apply.c:4947 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:4969 builtin/am.c:2219 +#: apply.c:4949 builtin/am.c:2217 msgid "num" msgstr "antal" -#: apply.c:4970 +#: apply.c:4950 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:4973 +#: apply.c:4953 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:4975 +#: apply.c:4955 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:4979 +#: apply.c:4959 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:4981 +#: apply.c:4961 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:4983 +#: apply.c:4963 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:4985 +#: apply.c:4965 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:4987 +#: apply.c:4967 msgid "mark new files with `git add --intent-to-add`" msgstr "markera nya filer med \"git add --intent-to-add\"" -#: apply.c:4989 +#: apply.c:4969 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:4991 +#: apply.c:4971 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:4994 +#: apply.c:4974 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:4996 +#: apply.c:4976 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:4998 +#: apply.c:4978 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: apply.c:5003 +#: apply.c:4983 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97 -#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101 -#: builtin/pack-objects.c:3317 builtin/rebase.c:1415 +#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 +#: builtin/pack-objects.c:3319 builtin/rebase.c:1421 msgid "action" msgstr "åtgärd" -#: apply.c:5005 +#: apply.c:4985 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:5008 apply.c:5011 +#: apply.c:4988 apply.c:4991 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:5014 +#: apply.c:4994 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:5016 +#: apply.c:4996 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:5018 +#: apply.c:4998 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:5020 +#: apply.c:5000 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 +#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 +#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "var pratsam" -#: apply.c:5023 +#: apply.c:5003 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:5026 +#: apply.c:5006 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:5028 builtin/am.c:2207 +#: apply.c:5008 builtin/am.c:2205 msgid "root" msgstr "rot" -#: apply.c:5029 +#: apply.c:5009 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" @@ -792,98 +806,98 @@ msgstr "objektnamnet är inte giltigt: %s" msgid "not a tree object: %s" msgstr "inte ett trädobjekt: %s" -#: archive.c:424 +#: archive.c:426 msgid "current working directory is untracked" msgstr "aktuell arbetskatalog är inte spårad" -#: archive.c:455 +#: archive.c:457 msgid "fmt" msgstr "fmt" -#: archive.c:455 +#: archive.c:457 msgid "archive format" msgstr "arkivformat" -#: archive.c:456 builtin/log.c:1557 +#: archive.c:458 builtin/log.c:1597 msgid "prefix" msgstr "prefix" -#: archive.c:457 +#: archive.c:459 msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091 -#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105 +#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 +#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 #: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:176 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 msgid "file" msgstr "fil" -#: archive.c:459 builtin/archive.c:90 +#: archive.c:461 builtin/archive.c:90 msgid "write the archive to this file" msgstr "skriv arkivet till filen" -#: archive.c:461 +#: archive.c:463 msgid "read .gitattributes in working directory" msgstr "läs .gitattributes i arbetskatalogen" -#: archive.c:462 +#: archive.c:464 msgid "report archived files on stderr" msgstr "rapportera arkiverade filer på standard fel" -#: archive.c:463 +#: archive.c:465 msgid "store only" msgstr "endast spara" -#: archive.c:464 +#: archive.c:466 msgid "compress faster" msgstr "komprimera snabbare" -#: archive.c:472 +#: archive.c:474 msgid "compress better" msgstr "komprimera bättre" -#: archive.c:475 +#: archive.c:477 msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:477 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 msgid "repo" msgstr "arkiv" -#: archive.c:478 builtin/archive.c:92 +#: archive.c:480 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:713 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 #: builtin/notes.c:498 msgid "command" msgstr "kommando" -#: archive.c:480 builtin/archive.c:94 +#: archive.c:482 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:487 +#: archive.c:489 msgid "Unexpected option --remote" msgstr "Oväntad flagga --remote" -#: archive.c:489 +#: archive.c:491 msgid "Option --exec can only be used together with --remote" msgstr "Flaggan --exec kan endast användas tillsammans med --remote" -#: archive.c:491 +#: archive.c:493 msgid "Unexpected option --output" msgstr "Oväntad flagga --output" -#: archive.c:513 +#: archive.c:515 #, c-format msgid "Unknown archive format '%s'" msgstr "Okänt arkivformat \"%s\"" -#: archive.c:520 +#: archive.c:522 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumentet stöd inte för formatet \"%s\": -%d" @@ -1030,12 +1044,12 @@ msgstr "Bisect: en sammanslagningsbas måste testas\n" msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: bisect.c:928 builtin/merge.c:146 +#: bisect.c:928 builtin/merge.c:148 #, c-format msgid "could not read file '%s'" msgstr "kunde inte läsa filen \"%s\"" @@ -1075,41 +1089,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:1794 +#: blame.c:2697 msgid "--contents and --reverse do not blend well." msgstr "--contents och --reverse fungerar inte så bra tillsammans." -#: blame.c:1808 +#: blame.c:2711 msgid "cannot use --contents with final commit object name" msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt" -#: blame.c:1829 +#: blame.c:2732 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:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030 -#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940 -#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415 -#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155 +#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:404 builtin/log.c:980 +#: builtin/log.c:1468 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 +#: builtin/pack-objects.c:3142 builtin/pack-objects.c:3157 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" -#: blame.c:1856 +#: blame.c:2759 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:1867 +#: blame.c:2770 #, c-format msgid "no such path %s in %s" msgstr "sökvägen %s i %s finns inte" -#: blame.c:1878 +#: blame.c:2781 #, c-format msgid "cannot read blob %s for path %s" msgstr "kan inte läsa objektet %s för sökvägen %s" @@ -1196,7 +1210,7 @@ msgstr "\"%s\" är inte ett giltigt grennamn." #: branch.c:208 #, c-format msgid "A branch named '%s' already exists." -msgstr "Det finns redan en gren som heter ”%s”." +msgstr "Det finns redan en gren som heter \"%s\"." #: branch.c:213 msgid "Cannot force update the current branch." @@ -1245,14 +1259,14 @@ msgstr "Objektnamnet är tvetydigt: \"%s\"." #: branch.c:306 #, c-format msgid "Not a valid branch point: '%s'." -msgstr "Avgreningspunkten är inte giltig: ”%s”." +msgstr "Avgreningspunkten är inte giltig: \"%s\"." -#: branch.c:359 +#: branch.c:364 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "\"%s\" är redan utcheckad på \"%s\"" -#: branch.c:382 +#: branch.c:387 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD i arbetskatalogen %s har inte uppdaterats" @@ -1267,8 +1281,8 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil" msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916 -#: builtin/commit.c:788 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 +#: builtin/commit.c:791 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -1277,60 +1291,64 @@ msgstr "kunde inte öppna \"%s\"" msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:194 +#: bundle.c:146 +msgid "need a repository to verify a bundle" +msgstr "behöver ett arkiv för att verifiera ett paket (bundle)." + +#: bundle.c:197 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Paketet (bundlen) innehåller denna referens:" msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:" -#: bundle.c:201 +#: bundle.c:204 msgid "The bundle records a complete history." msgstr "Paketet (bundlen) beskriver en komplett historik." -#: bundle.c:203 +#: bundle.c:206 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Paketet (bundlen) kräver denna referens:" msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:" -#: bundle.c:269 +#: bundle.c:272 msgid "unable to dup bundle descriptor" msgstr "kan inte duplicera pakethandtag" -#: bundle.c:276 +#: bundle.c:279 msgid "Could not spawn pack-objects" msgstr "Kunde inte starta pack-objects" -#: bundle.c:287 +#: bundle.c:290 msgid "pack-objects died" msgstr "pack-objects misslyckades" -#: bundle.c:329 +#: bundle.c:332 msgid "rev-list died" msgstr "rev-list dog" -#: bundle.c:378 +#: bundle.c:381 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" -#: bundle.c:465 +#: bundle.c:468 msgid "Refusing to create empty bundle." msgstr "Vägrar skapa ett tomt paket (bundle)." -#: bundle.c:475 +#: bundle.c:478 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:500 +#: bundle.c:503 msgid "index-pack died" msgstr "index-pack dog" @@ -1339,8 +1357,8 @@ msgstr "index-pack dog" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399 -#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455 +#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 +#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -1350,7 +1368,7 @@ msgstr "kunde inte tolka %s" msgid "%s %s is not a commit!" msgstr "%s %s är inte en incheckning!" -#: commit.c:193 +#: commit.c:192 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -1370,29 +1388,29 @@ msgstr "" "Slå av detta meddelande genom att skriva\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1128 +#: commit.c:1127 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s." -#: commit.c:1131 +#: commit.c:1130 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s." -#: commit.c:1134 +#: commit.c:1133 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: commit.c:1137 +#: commit.c:1136 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n" -#: commit.c:1391 +#: commit.c:1390 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" @@ -1402,177 +1420,232 @@ msgstr "" "Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n" "i18n.commitencoding till den teckenkodning som används i ditt projekt.\n" -#: commit-graph.c:105 +#: commit-graph.c:127 msgid "commit-graph file is too small" msgstr "incheckningsgraffilen %s är för liten" -#: commit-graph.c:170 +#: commit-graph.c:192 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X" -#: commit-graph.c:177 +#: commit-graph.c:199 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "incheckningsgrafens version %X stämmer inte med versionen %X" -#: commit-graph.c:184 +#: commit-graph.c:206 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X" -#: commit-graph.c:207 +#: commit-graph.c:229 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" "incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara " "ofullständig" -#: commit-graph.c:218 +#: commit-graph.c:240 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen" -#: commit-graph.c:255 +#: commit-graph.c:283 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger" -#: commit-graph.c:388 +#: commit-graph.c:347 +msgid "commit-graph has no base graphs chunk" +msgstr "incheckningsgrafen har inga bas-graf-stycken" + +#: commit-graph.c:357 +msgid "commit-graph chain does not match" +msgstr "incheckningsgrafens kedja stämmer inte" + +#: commit-graph.c:404 +#, 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:430 +msgid "unable to find all commit-graph files" +msgstr "kan inte hitta alla incheckingsgraffiler" + +#: commit-graph.c:553 commit-graph.c:613 +msgid "invalid commit position. commit-graph is likely corrupt" +msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig" + +#: commit-graph.c:574 #, c-format msgid "could not find commit %s" msgstr "kunde inte hitta incheckningen %s" -#: commit-graph.c:730 builtin/pack-objects.c:2649 +#: commit-graph.c:1001 builtin/pack-objects.c:2651 #, c-format msgid "unable to get type of object %s" msgstr "kunde inte hämta typ för objektet %s" -#: commit-graph.c:763 +#: commit-graph.c:1033 msgid "Loading known commits in commit graph" msgstr "Läser in kända incheckningar i incheckningsgraf" -#: commit-graph.c:779 +#: commit-graph.c:1050 msgid "Expanding reachable commits in commit graph" msgstr "Expanderar nåbara incheckningar i incheckningsgraf" -#: commit-graph.c:791 +#: commit-graph.c:1069 msgid "Clearing commit marks in commit graph" msgstr "Rensar incheckningsmärken i incheckningsgraf" -#: commit-graph.c:811 +#: commit-graph.c:1088 msgid "Computing commit graph generation numbers" msgstr "Beräknar generationsvärden för incheckningsgraf" -#: commit-graph.c:928 +#: commit-graph.c:1162 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket" msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket" -#: commit-graph.c:941 +#: commit-graph.c:1175 #, c-format msgid "error adding pack %s" msgstr "fel vid tillägg av paketet %s" -#: commit-graph.c:943 +#: commit-graph.c:1179 #, c-format msgid "error opening index for %s" msgstr "fel vid öppning av indexet för %s" -#: commit-graph.c:957 +#: commit-graph.c:1203 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "Söker incheckningar för incheckingsgraf från %d referens" msgstr[1] "Söker incheckningar för incheckingsgraf från %d referenser" -#: commit-graph.c:989 +#: commit-graph.c:1237 msgid "Finding commits for commit graph among packed objects" msgstr "Söker incheckningar för incheckingsgraf i packade objekt" -#: commit-graph.c:1002 +#: commit-graph.c:1252 msgid "Counting distinct commits in commit graph" msgstr "Räknar olika incheckningar i incheckningsgraf" -#: commit-graph.c:1015 -#, c-format -msgid "the commit graph format cannot write %d commits" -msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar" - -#: commit-graph.c:1024 +#: commit-graph.c:1283 msgid "Finding extra edges in commit graph" msgstr "Söker ytterligare kanter i incheckingsgraf" -#: commit-graph.c:1048 -msgid "too many commits to write graph" -msgstr "för många incheckningar för att skriva graf" +#: commit-graph.c:1331 +msgid "failed to write correct number of base graph ids" +msgstr "kunde inte skriva korrekt antal bas-graf-id:n" -#: commit-graph.c:1055 midx.c:805 +#: commit-graph.c:1364 midx.c:811 #, c-format msgid "unable to create leading directories of %s" msgstr "kunde inte skapa inledande kataloger för %s" -#: commit-graph.c:1095 +#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251 +#, c-format +msgid "unable to create '%s'" +msgstr "kunde inte skapa \"%s\"" + +#: commit-graph.c:1436 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Skriver ut incheckningsgraf i %d pass" msgstr[1] "Skriver ut incheckningsgraf i %d pass" -#: commit-graph.c:1160 +#: commit-graph.c:1477 +msgid "unable to open commit-graph chain file" +msgstr "Kunde inte öppna incheckningsgrafkedjefilen" + +#: commit-graph.c:1489 +msgid "failed to rename base commit-graph file" +msgstr "kunde inte byta namn på bas-incheckingsgraffilen" + +#: commit-graph.c:1509 +msgid "failed to rename temporary commit-graph file" +msgstr "kunde inte byta namn på temporär incheckningsgraffil" + +#: commit-graph.c:1620 +msgid "Scanning merged commits" +msgstr "Söker sammanslagna incheckningar" + +#: commit-graph.c:1631 +#, c-format +msgid "unexpected duplicate commit id %s" +msgstr "oväntat duplicerat inchecknings-id %s" + +#: commit-graph.c:1656 +msgid "Merging commit-graph" +msgstr "Slår ihop incheckningsgraf" + +#: commit-graph.c:1842 +#, c-format +msgid "the commit graph format cannot write %d commits" +msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar" + +#: commit-graph.c:1853 +msgid "too many commits to write graph" +msgstr "för många incheckningar för att skriva graf" + +#: commit-graph.c:1943 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig" -#: commit-graph.c:1170 +#: commit-graph.c:1953 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s" -#: commit-graph.c:1180 commit-graph.c:1195 +#: commit-graph.c:1963 commit-graph.c:1978 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u" -#: commit-graph.c:1187 +#: commit-graph.c:1970 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "kunde inte tolka incheckning %s från incheckningsgraf" -#: commit-graph.c:1204 +#: commit-graph.c:1987 msgid "Verifying commits in commit graph" msgstr "Bekräftar incheckningar i incheckningsgrafen" -#: commit-graph.c:1217 +#: commit-graph.c:2000 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf" -#: commit-graph.c:1224 +#: commit-graph.c:2007 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s" -#: commit-graph.c:1234 +#: commit-graph.c:2017 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång" -#: commit-graph.c:1240 +#: commit-graph.c:2026 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "incheckningsgrafens förälder för %s är %s != %s" -#: commit-graph.c:1253 +#: commit-graph.c:2039 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt" -#: commit-graph.c:1258 +#: commit-graph.c:2044 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -1580,7 +1653,7 @@ msgstr "" "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-" "noll på annan plats" -#: commit-graph.c:1262 +#: commit-graph.c:2048 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -1588,12 +1661,12 @@ msgstr "" "incheckningsgrafen har generationsnummer skilt från noll för incheckningen " "%s, men noll på annan plats" -#: commit-graph.c:1277 +#: commit-graph.c:2063 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "incheckningsgrafens generation för incheckningen %s är %u != %u" -#: commit-graph.c:1283 +#: commit-graph.c:2069 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -1604,7 +1677,7 @@ msgstr "" msgid "memory exhausted" msgstr "minnet slut" -#: config.c:123 +#: config.c:124 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -1619,302 +1692,302 @@ msgstr "" "\t%s\n" "Det kan bero på cirkulära inkluderingar." -#: config.c:139 +#: config.c:140 #, c-format msgid "could not expand include path '%s'" msgstr "kunde inte expandera inkluderingssökväg \"%s\"" -#: config.c:150 +#: config.c:151 msgid "relative config includes must come from files" msgstr "relativa konfigureringsinkluderingar måste komma från filer" -#: config.c:190 +#: config.c:197 msgid "relative config include conditionals must come from files" msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer" -#: config.c:348 +#: config.c:375 #, c-format msgid "key does not contain a section: %s" msgstr "nyckeln innehåller inte ett stycke: %s" -#: config.c:354 +#: config.c:381 #, c-format msgid "key does not contain variable name: %s" msgstr "nyckeln innehåller inte variabelnamn: %s" -#: config.c:378 sequencer.c:2459 +#: config.c:405 sequencer.c:2463 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" -#: config.c:384 +#: config.c:411 #, c-format msgid "invalid key (newline): %s" msgstr "ogiltig nyckel (nyradstecken): %s" -#: config.c:420 config.c:432 +#: config.c:447 config.c:459 #, c-format msgid "bogus config parameter: %s" msgstr "falsk konfigureringsparameter: %s" -#: config.c:467 +#: config.c:494 #, c-format msgid "bogus format in %s" msgstr "felaktigt format i %s" -#: config.c:793 +#: config.c:820 #, c-format msgid "bad config line %d in blob %s" msgstr "felaktig konfigurationsfil rad %d i blob:en %s" -#: config.c:797 +#: config.c:824 #, c-format msgid "bad config line %d in file %s" msgstr "felaktig konfigurationsfil rad %d i filen %s" -#: config.c:801 +#: config.c:828 #, c-format msgid "bad config line %d in standard input" msgstr "felaktig konfigurationsfil rad %d i standard in" -#: config.c:805 +#: config.c:832 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s" -#: config.c:809 +#: config.c:836 #, c-format msgid "bad config line %d in command line %s" msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s" -#: config.c:813 +#: config.c:840 #, c-format msgid "bad config line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:952 +#: config.c:977 msgid "out of range" msgstr "utanför intervallet" -#: config.c:952 +#: config.c:977 msgid "invalid unit" msgstr "ogiltig enhet" -#: config.c:958 +#: config.c:978 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:963 +#: config.c:997 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s" -#: config.c:966 +#: config.c:1000 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s" -#: config.c:969 +#: config.c:1003 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s" -#: config.c:972 +#: config.c:1006 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:" "en %s: %s" -#: config.c:975 +#: config.c:1009 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden " "%s: %s" -#: config.c:978 +#: config.c:1012 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s" -#: config.c:1073 +#: config.c:1107 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:1082 +#: config.c:1116 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" -#: config.c:1173 +#: config.c:1207 #, c-format msgid "abbrev length out of range: %d" msgstr "förkortningslängd utanför intervallet: %d" -#: config.c:1187 config.c:1198 +#: config.c:1221 config.c:1232 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:1290 +#: config.c:1324 msgid "core.commentChar should only be one character" msgstr "core.commentChar kan bara vara ett tecken" -#: config.c:1323 +#: config.c:1357 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1395 +#: config.c:1429 #, c-format msgid "malformed value for %s" msgstr "felformat värde för %s" -#: config.c:1421 +#: config.c:1455 #, c-format msgid "malformed value for %s: %s" msgstr "felformat värde för %s: %s" -#: config.c:1422 +#: config.c:1456 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "måste vara en av nothing, matching, simple, upstream eller current" -#: config.c:1483 builtin/pack-objects.c:3397 +#: config.c:1517 builtin/pack-objects.c:3399 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1604 +#: config.c:1638 #, c-format msgid "unable to load config blob object '%s'" msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\"" -#: config.c:1607 +#: config.c:1641 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referensen \"%s\" pekar inte på en blob" -#: config.c:1624 +#: config.c:1658 #, c-format msgid "unable to resolve config blob '%s'" msgstr "kan inte slå upp konfigurerings-bloben \"%s\"" -#: config.c:1654 +#: config.c:1688 #, c-format msgid "failed to parse %s" msgstr "kunde inte tolka %s" -#: config.c:1710 +#: config.c:1744 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:2059 +#: config.c:2093 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2229 +#: config.c:2263 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:2272 +#: config.c:2306 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\"" -#: config.c:2298 +#: config.c:2332 #, 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:2344 +#: config.c:2378 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2346 +#: config.c:2380 #, 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:2427 +#: config.c:2461 #, c-format msgid "invalid section name '%s'" msgstr "felaktigt sektionsnamn \"%s\"" -#: config.c:2459 +#: config.c:2493 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2488 +#: config.c:2522 #, c-format msgid "failed to write new configuration file %s" msgstr "kan inte skriva nya konfigurationsfilen \"%s\"" -#: config.c:2740 config.c:3064 +#: config.c:2774 config.c:3098 #, c-format msgid "could not lock config file %s" msgstr "kunde inte låsa konfigurationsfilen %s" -#: config.c:2751 +#: config.c:2785 #, c-format msgid "opening %s" msgstr "öppnar %s" -#: config.c:2786 builtin/config.c:328 +#: config.c:2820 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "ogiltigt mönster: %s" -#: config.c:2811 +#: config.c:2845 #, c-format msgid "invalid config file %s" msgstr "ogiltig konfigurationsfil: \"%s\"" -#: config.c:2824 config.c:3077 +#: config.c:2858 config.c:3111 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:2835 +#: config.c:2869 #, c-format msgid "unable to mmap '%s'" msgstr "kunde inte utföra mmap på \"%s\"" -#: config.c:2844 config.c:3082 +#: config.c:2878 config.c:3116 #, c-format msgid "chmod on %s failed" msgstr "chmod misslyckades på %s" -#: config.c:2929 config.c:3179 +#: config.c:2963 config.c:3213 #, c-format msgid "could not write config file %s" msgstr "kunde inte skriva konfigurationsfilen %s" -#: config.c:2963 +#: config.c:2997 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:2965 builtin/remote.c:782 +#: config.c:2999 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" -#: config.c:3055 +#: config.c:3089 #, c-format msgid "invalid section name: %s" msgstr "felaktigt namn på stycke: %s" -#: config.c:3222 +#: config.c:3256 #, c-format msgid "missing value for '%s'" msgstr "värde saknas för \"%s\"" @@ -2080,19 +2153,19 @@ msgstr "kunde inte grena (fork)" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" -#: connected.c:97 +#: connected.c:98 msgid "Could not run 'git rev-list'" msgstr "Kunde inte köra \"git rev-list\"" -#: connected.c:117 +#: connected.c:118 msgid "failed write to rev-list" msgstr "kunde inte skriva till rev-list" -#: connected.c:124 +#: connected.c:125 msgid "failed to close rev-list's stdin" msgstr "kunde inte stänga rev-list:s standard in" @@ -2311,7 +2384,7 @@ msgstr "kunde inte hämta ö-regex för \"%s\": %s" msgid "island regex from config has too many capture groups (max=%d)" msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)" -#: delta-islands.c:466 +#: delta-islands.c:467 #, c-format msgid "Marked %d islands, done.\n" msgstr "Markerade %d öar, klar.\n" @@ -2387,35 +2460,35 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:4210 +#: diff.c:4215 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:4555 +#: diff.c:4560 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" -#: diff.c:4558 +#: diff.c:4563 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S och --find-object är ömsesidigt uteslutande" -#: diff.c:4636 +#: diff.c:4641 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:4684 +#: diff.c:4689 #, c-format msgid "invalid --stat value: %s" msgstr "ogiltigt värde för --stat: %s" -#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5216 -#: parse-options.c:200 +#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 +#: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "%s förväntar ett numeriskt värde" -#: diff.c:4721 +#: diff.c:4726 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2424,42 +2497,42 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:4806 +#: diff.c:4811 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s" -#: diff.c:4830 +#: diff.c:4835 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "okänt värde efter ws-error-highlight=%.*s" -#: diff.c:4844 +#: diff.c:4849 #, c-format msgid "unable to resolve '%s'" msgstr "kunde inte slå upp \"%s\"" -#: diff.c:4894 diff.c:4900 +#: diff.c:4899 diff.c:4905 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s förväntar formen <n>/<m>" -#: diff.c:4912 +#: diff.c:4917 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s förväntar ett tecken, fick \"%s\"" -#: diff.c:4933 +#: diff.c:4938 #, c-format msgid "bad --color-moved argument: %s" msgstr "felaktigt argument till --color-moved: %s" -#: diff.c:4952 +#: diff.c:4957 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "ogiltigt läge %s\" i --color-moved-ws" -#: diff.c:4992 +#: diff.c:4997 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -2467,149 +2540,149 @@ msgstr "" "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och " "\"histogram\"" -#: diff.c:5028 diff.c:5048 +#: diff.c:5033 diff.c:5053 #, c-format msgid "invalid argument to %s" msgstr "ogiltigt argument för %s" -#: diff.c:5186 +#: diff.c:5191 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:5240 +#: diff.c:5247 #, c-format msgid "bad --word-diff argument: %s" msgstr "felaktigt argument --word-diff: %s" -#: diff.c:5263 +#: diff.c:5270 msgid "Diff output format options" msgstr "Formatflaggor för diff-utdata" -#: diff.c:5265 diff.c:5271 +#: diff.c:5272 diff.c:5278 msgid "generate patch" msgstr "skapar patch" -#: diff.c:5268 builtin/log.c:167 +#: diff.c:5275 builtin/log.c:182 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: diff.c:5273 diff.c:5387 diff.c:5394 +#: diff.c:5280 diff.c:5394 diff.c:5401 msgid "<n>" msgstr "<n>" -#: diff.c:5274 diff.c:5277 +#: diff.c:5281 diff.c:5284 msgid "generate diffs with <n> lines context" msgstr "skapa diffar med <n> rader sammanhang" -#: diff.c:5279 +#: diff.c:5286 msgid "generate the diff in raw format" msgstr "generera diff i råformat" -#: diff.c:5282 +#: diff.c:5289 msgid "synonym for '-p --raw'" msgstr "synonym till \"-p --raw\"" -#: diff.c:5286 +#: diff.c:5293 msgid "synonym for '-p --stat'" msgstr "synonym till \"-p --stat\"" -#: diff.c:5290 +#: diff.c:5297 msgid "machine friendly --stat" msgstr "maskinläsbar --stat" -#: diff.c:5293 +#: diff.c:5300 msgid "output only the last line of --stat" msgstr "skriv bara ut den sista raden för --stat" -#: diff.c:5295 diff.c:5303 +#: diff.c:5302 diff.c:5310 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5296 +#: diff.c:5303 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "skriv ut distributionen av relativa mängder ändringar för varje underkatalog" -#: diff.c:5300 +#: diff.c:5307 msgid "synonym for --dirstat=cumulative" msgstr "synonym för --dirstat=cumulative" -#: diff.c:5304 +#: diff.c:5311 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonym för --dirstat=filer,param1,param2..." -#: diff.c:5308 +#: diff.c:5315 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel" -#: diff.c:5311 +#: diff.c:5318 msgid "condensed summary such as creations, renames and mode changes" msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen" -#: diff.c:5314 +#: diff.c:5321 msgid "show only names of changed files" msgstr "visa endast namnen på ändrade filer" -#: diff.c:5317 +#: diff.c:5324 msgid "show only names and status of changed files" msgstr "visa endast namn och status för ändrade filer" -#: diff.c:5319 +#: diff.c:5326 msgid "<width>[,<name-width>[,<count>]]" msgstr "<bredd>[,<namn-bredd>[,<antal>]]" -#: diff.c:5320 +#: diff.c:5327 msgid "generate diffstat" msgstr "skapa diffstat" -#: diff.c:5322 diff.c:5325 diff.c:5328 +#: diff.c:5329 diff.c:5332 diff.c:5335 msgid "<width>" msgstr "<bredd>" -#: diff.c:5323 +#: diff.c:5330 msgid "generate diffstat with a given width" msgstr "generera en diffstat med given bredd" -#: diff.c:5326 +#: diff.c:5333 msgid "generate diffstat with a given name width" msgstr "generera en diffstat med given namnbredd" -#: diff.c:5329 +#: diff.c:5336 msgid "generate diffstat with a given graph width" msgstr "generera en diffstat med given grafbredd" -#: diff.c:5331 +#: diff.c:5338 msgid "<count>" msgstr "<antal>" -#: diff.c:5332 +#: diff.c:5339 msgid "generate diffstat with limited lines" msgstr "generera diffstat med begränsade rader" -#: diff.c:5335 +#: diff.c:5342 msgid "generate compact summary in diffstat" msgstr "skapa kompakt översikt i diffstat" -#: diff.c:5338 +#: diff.c:5345 msgid "output a binary diff that can be applied" msgstr "skapa en binärdiff som kan appliceras" -#: diff.c:5341 +#: diff.c:5348 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "visa fullständiga objektnamn i \"index\"-rader för läget både före och efter" -#: diff.c:5343 +#: diff.c:5350 msgid "show colored diff" msgstr "visa färgad diff" -#: diff.c:5344 +#: diff.c:5351 msgid "<kind>" msgstr "<typ>" -#: diff.c:5345 +#: diff.c:5352 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -2617,7 +2690,7 @@ msgstr "" "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller " "\"new\" (nya) rader i diffen" -#: diff.c:5348 +#: diff.c:5355 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2625,87 +2698,87 @@ msgstr "" "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw " "eller --numstat" -#: diff.c:5351 diff.c:5354 diff.c:5357 diff.c:5463 +#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 msgid "<prefix>" msgstr "<prefix>" -#: diff.c:5352 +#: diff.c:5359 msgid "show the given source prefix instead of \"a/\"" msgstr "visa givet källprefix istället för \"a/\"" -#: diff.c:5355 -msgid "show the given source prefix instead of \"b/\"" -msgstr "visa givet källprefix istället för \"b/\"" +#: diff.c:5362 +msgid "show the given destination prefix instead of \"b/\"" +msgstr "visa givet målprefix istället för \"b/\"" -#: diff.c:5358 +#: diff.c:5365 msgid "prepend an additional prefix to every line of output" msgstr "lägg till ytterligare prefix på alla rader i utdata" -#: diff.c:5361 +#: diff.c:5368 msgid "do not show any source or destination prefix" msgstr "visa inte käll- eller målprefix" -#: diff.c:5364 +#: diff.c:5371 msgid "show context between diff hunks up to the specified number of lines" msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader" -#: diff.c:5368 diff.c:5373 diff.c:5378 +#: diff.c:5375 diff.c:5380 diff.c:5385 msgid "<char>" msgstr "<tecken>" -#: diff.c:5369 +#: diff.c:5376 msgid "specify the character to indicate a new line instead of '+'" msgstr "ange tecken för att ange ny rad istället för \"+\"" -#: diff.c:5374 +#: diff.c:5381 msgid "specify the character to indicate an old line instead of '-'" msgstr "ange tecken för att ange gammal rad istället för \"-\"" -#: diff.c:5379 +#: diff.c:5386 msgid "specify the character to indicate a context instead of ' '" msgstr "ange tecken för att ange sammanhang istället för \" \"" -#: diff.c:5382 +#: diff.c:5389 msgid "Diff rename options" msgstr "Diff-namnbytesflaggor" -#: diff.c:5383 +#: diff.c:5390 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5384 +#: diff.c:5391 msgid "break complete rewrite changes into pairs of delete and create" msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par" -#: diff.c:5388 +#: diff.c:5395 msgid "detect renames" msgstr "detektera namnändringar" -#: diff.c:5392 +#: diff.c:5399 msgid "omit the preimage for deletes" msgstr "ta bort för-version för borttagningar" -#: diff.c:5395 +#: diff.c:5402 msgid "detect copies" msgstr "detektera kopior" -#: diff.c:5399 +#: diff.c:5406 msgid "use unmodified files as source to find copies" msgstr "använd oförändrade som källa för att hitta kopior" -#: diff.c:5401 +#: diff.c:5408 msgid "disable rename detection" msgstr "inaktivera detektering av namnbyten" -#: diff.c:5404 +#: diff.c:5411 msgid "use empty blobs as rename source" msgstr "använd tomma blob:ar som namnändringskälla" -#: diff.c:5406 +#: diff.c:5413 msgid "continue listing the history of a file beyond renames" msgstr "fortsätt lista historiken för en fil bortom namnändringar" -#: diff.c:5409 +#: diff.c:5416 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -2713,159 +2786,159 @@ msgstr "" "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver " "given gräns" -#: diff.c:5411 +#: diff.c:5418 msgid "Diff algorithm options" msgstr "Alternativ för diff-algoritm" -#: diff.c:5413 +#: diff.c:5420 msgid "produce the smallest possible diff" msgstr "skapa minsta möjliga diff" -#: diff.c:5416 +#: diff.c:5423 msgid "ignore whitespace when comparing lines" msgstr "ignorera blanktecken vid radjämförelse" -#: diff.c:5419 +#: diff.c:5426 msgid "ignore changes in amount of whitespace" msgstr "ignorera ändringar i antal blanktecken vid radjämförelse" -#: diff.c:5422 +#: diff.c:5429 msgid "ignore changes in whitespace at EOL" msgstr "ignorera blanktecken vid radslut" -#: diff.c:5425 +#: diff.c:5432 msgid "ignore carrier-return at the end of line" msgstr "ignorera CR-tecken vid radslut" -#: diff.c:5428 +#: diff.c:5435 msgid "ignore changes whose lines are all blank" msgstr "ignorera ändringar i rader som är helt blanka" -#: diff.c:5431 +#: diff.c:5438 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "heuristik för att flytta diff-gränser för lättare läsning" -#: diff.c:5434 +#: diff.c:5441 msgid "generate diff using the \"patience diff\" algorithm" msgstr "skapa diffar med algoritmen \"patience diff\"" -#: diff.c:5438 +#: diff.c:5445 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "skapa diffar med algoritmen \"histogram diff\"" -#: diff.c:5440 +#: diff.c:5447 msgid "<algorithm>" msgstr "<algoritm>" -#: diff.c:5441 +#: diff.c:5448 msgid "choose a diff algorithm" msgstr "välj en diff-algoritm" -#: diff.c:5443 +#: diff.c:5450 msgid "<text>" msgstr "<text>" -#: diff.c:5444 +#: diff.c:5451 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "skapa diffar med algoritmen \"anchored diff\"" -#: diff.c:5446 diff.c:5455 diff.c:5458 +#: diff.c:5453 diff.c:5462 diff.c:5465 msgid "<mode>" msgstr "<läge>" -#: diff.c:5447 +#: diff.c:5454 msgid "show word diff, using <mode> to delimit changed words" msgstr "visa orddiff, där <läge> avgränsar ändrade ord" -#: diff.c:5449 diff.c:5452 diff.c:5497 +#: diff.c:5456 diff.c:5459 diff.c:5504 msgid "<regex>" msgstr "<reguttr>" -#: diff.c:5450 +#: diff.c:5457 msgid "use <regex> to decide what a word is" msgstr "använd <reguttr> för att bestämma vad som är ett ord" -#: diff.c:5453 +#: diff.c:5460 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>" -#: diff.c:5456 -msgid "move lines of code are colored differently" +#: diff.c:5463 +msgid "moved lines of code are colored differently" msgstr "flyttade kodrader färgas på annat sätt" -#: diff.c:5459 +#: diff.c:5466 msgid "how white spaces are ignored in --color-moved" msgstr "hur blanktecken ignoreras i --color-moved" -#: diff.c:5462 -msgid "Diff other options" +#: diff.c:5469 +msgid "Other diff options" msgstr "Andra diff-flaggor" -#: diff.c:5464 +#: diff.c:5471 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "vid start från underkatalog, uteslut ändringar utanför och visa relativa " "sökvägar" -#: diff.c:5468 +#: diff.c:5475 msgid "treat all files as text" msgstr "hantera alla filer som text" -#: diff.c:5470 +#: diff.c:5477 msgid "swap two inputs, reverse the diff" msgstr "växla två indatafiler, vänd diffen" -#: diff.c:5472 +#: diff.c:5479 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "avsluta med 1 vid ändringar, annars 0" -#: diff.c:5474 +#: diff.c:5481 msgid "disable all output of the program" msgstr "slå av alla utdata från programmet" -#: diff.c:5476 +#: diff.c:5483 msgid "allow an external diff helper to be executed" msgstr "tillåt köra en extern diff-hjälpare" -#: diff.c:5478 +#: diff.c:5485 msgid "run external text conversion filters when comparing binary files" msgstr "kör externt textkonverteringsfiler när binärfiler jämförs" -#: diff.c:5480 +#: diff.c:5487 msgid "<when>" msgstr "<när>" -#: diff.c:5481 +#: diff.c:5488 msgid "ignore changes to submodules in the diff generation" msgstr "ignorera ändringar i undermoduler när diffen skapas" -#: diff.c:5484 +#: diff.c:5491 msgid "<format>" msgstr "<format>" -#: diff.c:5485 +#: diff.c:5492 msgid "specify how differences in submodules are shown" msgstr "ange hur ändringar i undermoduler visas" -#: diff.c:5489 +#: diff.c:5496 msgid "hide 'git add -N' entries from the index" msgstr "dölj \"git add -N\"-poster från indexet" -#: diff.c:5492 +#: diff.c:5499 msgid "treat 'git add -N' entries as real in the index" msgstr "tolka \"git add -N\"-poster som äkta i indexet" -#: diff.c:5494 +#: diff.c:5501 msgid "<string>" msgstr "<sträng>" -#: diff.c:5495 +#: diff.c:5502 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng" -#: diff.c:5498 +#: diff.c:5505 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -2873,54 +2946,54 @@ msgstr "" "se efter ändringar som ändrar antalet förekomster av angivet reguljärt " "uttryck" -#: diff.c:5501 +#: diff.c:5508 msgid "show all changes in the changeset with -S or -G" msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G" -#: diff.c:5504 +#: diff.c:5511 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:5507 +#: diff.c:5514 msgid "control the order in which files appear in the output" msgstr "styr ordningen i vilken filer visas i utdata" -#: diff.c:5508 +#: diff.c:5515 msgid "<object-id>" msgstr "<objekt-id>" -#: diff.c:5509 +#: diff.c:5516 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt" -#: diff.c:5511 +#: diff.c:5518 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5512 +#: diff.c:5519 msgid "select files by diff type" msgstr "välj filter efter diff-typ" -#: diff.c:5514 +#: diff.c:5521 msgid "<file>" msgstr "<fil>" -#: diff.c:5515 +#: diff.c:5522 msgid "Output to a specific file" msgstr "Skriv utdata till en specifik fil" -#: diff.c:6148 +#: diff.c:6177 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:6151 +#: diff.c:6180 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:6154 +#: diff.c:6183 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3021,34 +3094,34 @@ msgstr "kunde inte skriva till fjärren" #: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" -msgstr "--stateless-rpc kräver ”multi_ack_detailed”" +msgstr "--stateless-rpc kräver \"multi_ack_detailed\"" -#: fetch-pack.c:360 fetch-pack.c:1271 +#: fetch-pack.c:360 fetch-pack.c:1284 #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" -#: fetch-pack.c:366 fetch-pack.c:1277 +#: fetch-pack.c:366 fetch-pack.c:1290 #, c-format msgid "invalid unshallow line: %s" msgstr "ogiltig \"unshallow\"-rad: %s" -#: fetch-pack.c:368 fetch-pack.c:1279 +#: fetch-pack.c:368 fetch-pack.c:1292 #, c-format msgid "object not found: %s" msgstr "objektet hittades inte: %s" -#: fetch-pack.c:371 fetch-pack.c:1282 +#: fetch-pack.c:371 fetch-pack.c:1295 #, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" -#: fetch-pack.c:373 fetch-pack.c:1284 +#: fetch-pack.c:373 fetch-pack.c:1297 #, c-format msgid "no shallow found: %s" msgstr "ingen \"shallow\" hittades: %s" -#: fetch-pack.c:376 fetch-pack.c:1288 +#: fetch-pack.c:376 fetch-pack.c:1301 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "förväntade shallow/unshallow, fick %s" @@ -3067,7 +3140,7 @@ msgstr "ogiltig incheckning %s" msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:477 progress.c:284 +#: fetch-pack.c:477 progress.c:277 msgid "done" msgstr "klart" @@ -3108,155 +3181,131 @@ msgstr "%s misslyckades" msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:906 -msgid "Server does not support shallow clients" -msgstr "Servern stöder inte klienter med grunda arkiv" - -#: fetch-pack.c:910 -msgid "Server supports multi_ack_detailed" -msgstr "Servern stöder \"multi_ack_detailed\"" - -#: fetch-pack.c:913 -msgid "Server supports no-done" -msgstr "Servern stöder \"no-done\"" - -#: fetch-pack.c:919 -msgid "Server supports multi_ack" -msgstr "Servern stöder \"multi_ack\"" - -#: fetch-pack.c:923 -msgid "Server supports side-band-64k" -msgstr "Servern stöder \"side-band-64k\"" - -#: fetch-pack.c:927 -msgid "Server supports side-band" -msgstr "Servern stöder \"side-band\"" - -#: fetch-pack.c:931 -msgid "Server supports allow-tip-sha1-in-want" -msgstr "Servern stöder \"allow-tip-sha1-in-want\"" - -#: fetch-pack.c:935 -msgid "Server supports allow-reachable-sha1-in-want" -msgstr "Servern stöder \"allow-reachable-sha1-in-want\"" - -#: fetch-pack.c:945 -msgid "Server supports ofs-delta" -msgstr "Servern stöder \"ofs-delta\"" - -#: fetch-pack.c:951 fetch-pack.c:1144 -msgid "Server supports filter" -msgstr "Servern stöder filter" - -#: fetch-pack.c:959 +#: fetch-pack.c:908 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:965 +#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 +#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 +#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 +#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 +#, c-format +msgid "Server supports %s" +msgstr "Servern stöder %s" + +#: fetch-pack.c:915 +msgid "Server does not support shallow clients" +msgstr "Servern stöder inte klienter med grunda arkiv" + +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:969 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:971 +#: fetch-pack.c:984 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:988 +#: fetch-pack.c:1001 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:1000 fetch-pack.c:1449 +#: fetch-pack.c:1013 fetch-pack.c:1462 msgid "git fetch-pack: fetch failed." msgstr "git fetch-patch: hämtning misslyckades." -#: fetch-pack.c:1138 +#: fetch-pack.c:1151 msgid "Server does not support shallow requests" msgstr "Servern stöder inte grunda förfrågningar" -#: fetch-pack.c:1171 +#: fetch-pack.c:1157 +msgid "Server supports filter" +msgstr "Servern stöder filter" + +#: fetch-pack.c:1184 msgid "unable to write request to remote" msgstr "kunde inte skriva anrop till fjärren" -#: fetch-pack.c:1189 +#: fetch-pack.c:1202 #, c-format msgid "error reading section header '%s'" msgstr "fel vid läsning av styckehuvudet \"%s\"" -#: fetch-pack.c:1195 +#: fetch-pack.c:1208 #, c-format msgid "expected '%s', received '%s'" msgstr "förväntade \"%s\", tog emot \"%s\"" -#: fetch-pack.c:1234 +#: fetch-pack.c:1247 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "förväntade bekräftelserad: \"%s\"" -#: fetch-pack.c:1239 +#: fetch-pack.c:1252 #, c-format msgid "error processing acks: %d" msgstr "fel vid hantering av bekräftelser: %d" -#: fetch-pack.c:1249 +#: fetch-pack.c:1262 msgid "expected packfile to be sent after 'ready'" msgstr "väntade att paketfil skulle sändas efter \"ready\"" -#: fetch-pack.c:1251 +#: fetch-pack.c:1264 msgid "expected no other sections to be sent after no 'ready'" msgstr "" "väntade inte att några ytterligare sektioner skulle sändas efter \"ready\"" -#: fetch-pack.c:1293 +#: fetch-pack.c:1306 #, c-format msgid "error processing shallow info: %d" msgstr "fel vid hantering av grund (\"shallow\") info: %d" -#: fetch-pack.c:1340 +#: fetch-pack.c:1353 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "förväntade wanted-ref, fick %s" -#: fetch-pack.c:1345 +#: fetch-pack.c:1358 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "oväntad wanted-ref: \"%s\"" -#: fetch-pack.c:1350 +#: fetch-pack.c:1363 #, c-format msgid "error processing wanted refs: %d" msgstr "fel vid hantering av önskade referenser: %d" -#: fetch-pack.c:1676 +#: fetch-pack.c:1689 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1699 builtin/clone.c:676 +#: fetch-pack.c:1712 builtin/clone.c:686 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: fetch-pack.c:1726 +#: fetch-pack.c:1739 #, c-format msgid "no such remote ref %s" msgstr "ingen sådan fjärreferens: %s" -#: fetch-pack.c:1729 +#: fetch-pack.c:1742 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s" -#: gpg-interface.c:318 +#: gpg-interface.c:321 msgid "gpg failed to sign the data" msgstr "gpg misslyckades signera data" -#: gpg-interface.c:344 +#: gpg-interface.c:347 msgid "could not create temporary file" msgstr "kunde inte skapa temporära fil" -#: gpg-interface.c:347 +#: gpg-interface.c:350 #, c-format msgid "failed writing detached signature to '%s'" msgstr "misslyckades skriva fristående signatur till \"%s\"" @@ -3266,18 +3315,18 @@ msgstr "misslyckades skriva fristående signatur till \"%s\"" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors" -#: grep.c:2113 +#: grep.c:2117 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:2130 setup.c:164 builtin/clone.c:414 builtin/diff.c:82 +#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:2141 +#: grep.c:2145 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" @@ -3347,7 +3396,7 @@ msgstr "git-kommandon från andra platser i din $PATH" msgid "These are common Git commands used in various situations:" msgstr "Dessa vanliga Git-kommandon används i olika situationer:" -#: help.c:363 git.c:97 +#: help.c:363 git.c:98 #, c-format msgid "unsupported command listing type '%s'" msgstr "okänd kommandolisttyp \"%s\"" @@ -3389,13 +3438,13 @@ msgstr "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns." #: help.c:682 #, c-format msgid "Continuing under the assumption that you meant '%s'." -msgstr "Fortsätter under förutsättningen att du menade ”%s”." +msgstr "Fortsätter under förutsättningen att du menade \"%s\"." #: help.c:687 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" -"Fortsätter om %0.1f sekunder, under förutsättningen att du menade ”%s”." +"Fortsätter om %0.1f sekunder, under förutsättningen att du menade \"%s\"." #: help.c:695 #, c-format @@ -3493,7 +3542,7 @@ 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:436 builtin/commit.c:608 +#: ident.c:436 builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" @@ -3521,7 +3570,16 @@ msgstr "flera filterspecifikationer kan inte kombineras" msgid "expected 'tree:<depth>'" msgstr "förväntade \"tree:<djup>\"" -#: list-objects-filter-options.c:156 +#: list-objects-filter-options.c:84 +msgid "sparse:path filters support has been dropped" +msgstr "sparse:sökväg-filter stöds inte längre" + +#: list-objects-filter-options.c:94 +#, c-format +msgid "invalid filter-spec '%s'" +msgstr "felaktig filterspecifikation: \"%s\"" + +#: list-objects-filter-options.c:158 msgid "cannot change partial clone promisor remote" msgstr "kan inte ändra kontraktsfjärr för delvis kloning" @@ -3554,8 +3612,8 @@ msgstr "Kunde inte skapa \"%s.lock\": %s" msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921 -#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:776 +#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 +#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 #: builtin/stash.c:264 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" @@ -3581,94 +3639,94 @@ msgstr "" msgid "error building trees" msgstr "fel vid byggande av träd" -#: merge-recursive.c:861 +#: merge-recursive.c:863 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:872 +#: merge-recursive.c:874 #, 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:886 merge-recursive.c:905 +#: merge-recursive.c:888 merge-recursive.c:907 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:895 +#: merge-recursive.c:897 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:936 builtin/cat-file.c:40 +#: merge-recursive.c:938 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:939 +#: merge-recursive.c:941 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:963 +#: merge-recursive.c:965 #, c-format msgid "failed to open '%s': %s" msgstr "misslyckades öppna \"%s\": %s" -#: merge-recursive.c:974 +#: merge-recursive.c:976 #, c-format msgid "failed to symlink '%s': %s" msgstr "misslyckades skapa symboliska länken \"%s\": %s" -#: merge-recursive.c:979 +#: merge-recursive.c:981 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "vet inte hur %06o %s \"%s\" skall hanteras" -#: merge-recursive.c:1175 +#: merge-recursive.c:1177 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)" -#: merge-recursive.c:1182 +#: merge-recursive.c:1184 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)" -#: merge-recursive.c:1189 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Misslyckades slå ihop undermodulen %s (incheckningar följer inte " "sammanslagningsbasen)" -#: merge-recursive.c:1197 merge-recursive.c:1209 +#: merge-recursive.c:1199 merge-recursive.c:1211 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Snabbspolar undermodulen %s till följande incheckning:" -#: merge-recursive.c:1200 merge-recursive.c:1212 +#: merge-recursive.c:1202 merge-recursive.c:1214 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Snabbspolar undermodulen %s" -#: merge-recursive.c:1235 +#: merge-recursive.c:1237 #, 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:1239 +#: merge-recursive.c:1241 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)" -#: merge-recursive.c:1240 +#: merge-recursive.c:1242 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:1243 +#: merge-recursive.c:1245 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3685,32 +3743,32 @@ msgstr "" "\n" "vilket godtar lösningen.\n" -#: merge-recursive.c:1252 +#: merge-recursive.c:1254 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)" -#: merge-recursive.c:1325 +#: merge-recursive.c:1327 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:1330 +#: merge-recursive.c:1332 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:1362 +#: merge-recursive.c:1364 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1385 +#: merge-recursive.c:1387 #, 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:1457 +#: merge-recursive.c:1459 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3719,7 +3777,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:1462 +#: merge-recursive.c:1464 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3728,7 +3786,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:1469 +#: merge-recursive.c:1471 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3737,7 +3795,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:1474 +#: merge-recursive.c:1476 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3746,40 +3804,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:1509 +#: merge-recursive.c:1511 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1509 +#: merge-recursive.c:1511 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Vägrar förlora lortig fil vid \"%s\"" -#: merge-recursive.c:1599 +#: merge-recursive.c:1601 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen." -#: merge-recursive.c:1657 +#: merge-recursive.c:1659 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s" -#: merge-recursive.c:1687 +#: merge-recursive.c:1690 #, 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:1692 +#: merge-recursive.c:1695 #, 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:1711 +#: merge-recursive.c:1714 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3788,17 +3846,17 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1716 +#: merge-recursive.c:1719 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1825 +#: merge-recursive.c:1828 #, 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:2030 +#: merge-recursive.c:2035 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3809,7 +3867,7 @@ msgstr "" "katalogen %s bytte namn till flera andra kataloger, utan att någon " "destination fick en majoritet av filerna." -#: merge-recursive.c:2062 +#: merge-recursive.c:2067 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3818,7 +3876,7 @@ msgstr "" "KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för " "implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s." -#: merge-recursive.c:2072 +#: merge-recursive.c:2077 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3827,7 +3885,7 @@ msgstr "" "KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till " "%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s" -#: merge-recursive.c:2164 +#: merge-recursive.c:2169 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3836,7 +3894,7 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog " "%s->%s i %s" -#: merge-recursive.c:2408 +#: merge-recursive.c:2413 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -3845,52 +3903,52 @@ msgstr "" "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har " "bytt namn." -#: merge-recursive.c:2929 +#: merge-recursive.c:2937 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:2932 +#: merge-recursive.c:2940 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:2996 +#: merge-recursive.c:3004 msgid "modify" msgstr "ändra" -#: merge-recursive.c:2996 +#: merge-recursive.c:3004 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:3008 +#: merge-recursive.c:3016 msgid "content" msgstr "innehåll" -#: merge-recursive.c:3012 +#: merge-recursive.c:3020 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:3035 +#: merge-recursive.c:3043 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:3057 git-submodule.sh:937 +#: merge-recursive.c:3065 git-submodule.sh:937 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:3058 +#: merge-recursive.c:3066 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3088 +#: merge-recursive.c:3096 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:3170 +#: merge-recursive.c:3178 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -3899,7 +3957,7 @@ msgstr "" "Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; " "flyttar den till %s." -#: merge-recursive.c:3173 +#: merge-recursive.c:3181 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -3908,7 +3966,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-recursive.c:3177 +#: merge-recursive.c:3185 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -3917,7 +3975,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-recursive.c:3180 +#: merge-recursive.c:3188 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -3926,36 +3984,36 @@ msgstr "" "KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som " "bytte namn i %s; flyttar den till %s." -#: merge-recursive.c:3294 +#: merge-recursive.c:3302 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:3317 +#: merge-recursive.c:3325 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:3322 +#: merge-recursive.c:3330 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:3329 +#: merge-recursive.c:3337 #, 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:3338 +#: merge-recursive.c:3346 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:3347 +#: merge-recursive.c:3355 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3385 +#: merge-recursive.c:3393 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3965,175 +4023,188 @@ msgstr "" "sammanslagning:\n" " %s" -#: merge-recursive.c:3396 +#: merge-recursive.c:3404 msgid "Already up to date!" msgstr "Redan à jour!" -#: merge-recursive.c:3405 +#: merge-recursive.c:3413 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:3504 +#: merge-recursive.c:3512 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:3517 +#: merge-recursive.c:3525 #, 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:3556 +#: merge-recursive.c:3564 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:3622 +#: merge-recursive.c:3630 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873 +#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." -#: midx.c:66 +#: midx.c:69 #, c-format msgid "multi-pack-index file %s is too small" msgstr "multi-pack-indexfilen %s är för liten" -#: midx.c:82 +#: midx.c:85 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x" -#: midx.c:87 +#: midx.c:90 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-indexversionen %d stöds inte" -#: midx.c:92 +#: midx.c:95 #, c-format msgid "hash version %u does not match" msgstr "hash-versionen %u stämmer inte" -#: midx.c:106 +#: midx.c:109 msgid "invalid chunk offset (too large)" msgstr "felaktigt offset för stycke (för stort)" -#: midx.c:130 +#: midx.c:133 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "avslutande multi-pack-index-stycke-ID förekommer tidigare än förväntat" -#: midx.c:143 +#: midx.c:146 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index saknar krävd paketnamn-stycke" -#: midx.c:145 +#: midx.c:148 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index saknar krävt OID-utbredningsstycke" -#: midx.c:147 +#: midx.c:150 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke" -#: midx.c:149 +#: midx.c:152 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index saknar krävt objekt-offsetstycke" -#: midx.c:163 +#: midx.c:166 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\"" -#: midx.c:209 +#: midx.c:211 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "bad pack-int-id: %u (%u paket totalt)" -#: midx.c:250 +#: midx.c:261 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten" -#: midx.c:275 +#: midx.c:289 msgid "error preparing packfile from multi-pack-index" msgstr "fel när paketfiler från multi-pack-index skulle förberedas" -#: midx.c:443 +#: midx.c:470 #, c-format msgid "failed to add packfile '%s'" msgstr "misslyckades läsa paketfilen \"%s\"" -#: midx.c:449 +#: midx.c:476 #, c-format msgid "failed to open pack-index '%s'" msgstr "misslyckades öppna paketindexet \"%s\"" -#: midx.c:543 +#: midx.c:536 #, c-format msgid "failed to locate object %d in packfile" msgstr "misslyckades hitta objekt %d i paketfilen" -#: midx.c:979 +#: midx.c:865 +#, c-format +msgid "did not see pack-file %s to drop" +msgstr "såg inte paketfilen %s som skulle kastas" + +#: midx.c:1036 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "misslyckades städa multi-pack-index på %s" -#: midx.c:1034 +#: midx.c:1091 msgid "Looking for referenced packfiles" msgstr "Ser efter refererade packfiler" -#: midx.c:1049 +#: midx.c:1106 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" "oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1053 +#: midx.c:1110 msgid "Verifying OID order in MIDX" msgstr "Bekräftar OID-ordning i MIDX" -#: midx.c:1062 +#: midx.c:1119 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1081 +#: midx.c:1138 msgid "Sorting objects by packfile" msgstr "Sorterar objekt efter packfil" -#: midx.c:1087 +#: midx.c:1144 msgid "Verifying object offsets" msgstr "Bekräftar offset för objekt" -#: midx.c:1103 +#: midx.c:1160 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "misslyckades läsa paketpost för oid[%d] = %s" -#: midx.c:1109 +#: midx.c:1166 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "misslyckades läsa paketindex för paketfil %s" -#: midx.c:1118 +#: midx.c:1175 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: name-hash.c:531 +#: midx.c:1350 +msgid "could not start pack-objects" +msgstr "kunde inte starta pack-objects" + +#: midx.c:1369 +msgid "could not finish pack-objects" +msgstr "kunde inte avsluta pack-objects" + +#: name-hash.c:532 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "misslyckades skapa lazy_dir-tråd: %s" -#: name-hash.c:553 +#: name-hash.c:554 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "misslyckades skapa lazy_name-tråd: %s" -#: name-hash.c:559 +#: name-hash.c:560 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "misslyckades utföra join på lazy_name-tråd: %s" @@ -4203,16 +4274,16 @@ msgstr "kunde inte tolka objektet: %s" msgid "hash mismatch %s" msgstr "hashvärde stämmer inte överens %s" -#: packfile.c:617 +#: packfile.c:648 msgid "offset before end of packfile (broken .idx?)" msgstr "offset före slutet av packfilen (trasig .idx?)" -#: packfile.c:1880 +#: packfile.c:1899 #, 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:1884 +#: packfile.c:1903 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex för %s (trunkerat index?)" @@ -4232,7 +4303,7 @@ msgstr "%s är inkompatibel med %s" msgid "%s : incompatible with something else" msgstr "%s: inkompatibelt med något annat" -#: parse-options.c:92 parse-options.c:96 parse-options.c:287 +#: parse-options.c:92 parse-options.c:96 parse-options.c:319 #, c-format msgid "%s takes no value" msgstr "%s tar inget värde" @@ -4242,41 +4313,41 @@ msgstr "%s tar inget värde" msgid "%s isn't available" msgstr "%s är inte tillgängligt" -#: parse-options.c:216 +#: parse-options.c:219 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffix" -#: parse-options.c:356 +#: parse-options.c:389 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)" -#: parse-options.c:390 parse-options.c:398 +#: parse-options.c:423 parse-options.c:431 #, c-format msgid "did you mean `--%s` (with two dashes ?)" msgstr "menade du \"--%s\" (med två bindestreck?)" -#: parse-options.c:733 +#: parse-options.c:859 #, c-format msgid "unknown option `%s'" msgstr "okänd flagga \"%s\"" -#: parse-options.c:735 +#: parse-options.c:861 #, c-format msgid "unknown switch `%c'" msgstr "okänd flagga \"%c\"" -#: parse-options.c:737 +#: parse-options.c:863 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "okänd icke-ascii-flagga i strängen: \"%s\"" -#: parse-options.c:759 +#: parse-options.c:887 msgid "..." msgstr "..." -#: parse-options.c:778 +#: parse-options.c:906 #, c-format msgid "usage: %s" msgstr "användning: %s" @@ -4284,37 +4355,42 @@ msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:784 +#: parse-options.c:912 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:787 +#: parse-options.c:915 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:826 +#: parse-options.c:954 msgid "-NUM" msgstr "-TAL" -#: parse-options-cb.c:21 +#: parse-options.c:968 +#, c-format +msgid "alias of --%s" +msgstr "alias för --%s" + +#: parse-options-cb.c:20 parse-options-cb.c:24 #, c-format msgid "option `%s' expects a numerical value" msgstr "flaggan \"%s\" antar ett numeriskt värde" -#: parse-options-cb.c:38 +#: parse-options-cb.c:41 #, c-format msgid "malformed expiration date '%s'" -msgstr "trasigt utlöpsdatum: ”%s”" +msgstr "trasigt utlöpsdatum: \"%s\"" -#: parse-options-cb.c:51 +#: parse-options-cb.c:54 #, c-format msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "" "flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)" -#: parse-options-cb.c:127 parse-options-cb.c:144 +#: parse-options-cb.c:130 parse-options-cb.c:147 #, c-format msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" @@ -4371,7 +4447,7 @@ msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\"" #: pathspec.c:368 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" -msgstr "Ej implementerat sökvägsuttryckmagi ”%c” i ”%s”" +msgstr "Ej implementerat sökvägsuttryckmagi \"%c\" i \"%s\"" #: pathspec.c:427 #, c-format @@ -4462,24 +4538,29 @@ msgstr "kunde inte skapa trådad lstat: %s" msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" -#: range-diff.c:56 +#: range-diff.c:70 msgid "could not start `log`" msgstr "kunde inte starta \"log\"" -#: range-diff.c:59 +#: range-diff.c:72 msgid "could not read `log` output" msgstr "kunde inte läsa utdata från \"log\"" -#: range-diff.c:74 sequencer.c:4897 +#: range-diff.c:91 sequencer.c:5021 #, c-format msgid "could not parse commit '%s'" msgstr "kunde inte tolka incheckningen \"%s\"" -#: range-diff.c:224 +#: range-diff.c:117 +#, c-format +msgid "could not parse git header '%.*s'" +msgstr "kunde inte tolka git-huvudet \"%.*s\"" + +#: range-diff.c:274 msgid "failed to generate diff" msgstr "misslyckades skapa diff" -#: range-diff.c:455 range-diff.c:457 +#: range-diff.c:506 range-diff.c:508 #, c-format msgid "could not parse log for '%s'" msgstr "kunde inte tolka loggen för \"%s\"" @@ -4595,11 +4676,10 @@ msgid "unordered stage entries for '%s'" msgstr "osorterade köposter för \"%s\"" #: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358 -#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955 -#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498 -#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271 -#: builtin/submodule--helper.c:330 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 +#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 +#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 +#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "indexfilen trasig" @@ -4653,32 +4733,32 @@ msgstr "kunde inte uppdatera delat index \"%s\"" msgid "broken index, expect %s in %s, got %s" msgstr "trasigt index, förväntade %s i %s, fick %s" -#: read-cache.c:2988 wrapper.c:658 builtin/merge.c:1117 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: read-cache.c:3091 sequencer.c:2354 sequencer.c:3807 +#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" -#: read-cache.c:3104 +#: read-cache.c:3105 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte öppna git-katalog: %s" -#: read-cache.c:3116 +#: read-cache.c:3117 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort länken: %s" -#: read-cache.c:3141 +#: read-cache.c:3142 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "kan inte rätta behörighetsbitar på \"%s\"" -#: read-cache.c:3290 +#: read-cache.c:3291 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: kan inte återgå till kö 0" @@ -4741,7 +4821,7 @@ msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Ombasera %s på %s (%d kommando)" msgstr[1] "Ombasera %s på %s (%d kommandon)" -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173 +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -4750,7 +4830,7 @@ msgstr "" "Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en " "incheckning.\n" -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -4758,7 +4838,7 @@ msgstr "" "\n" "Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n" -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -4772,7 +4852,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -4782,12 +4862,12 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 msgid "Note that empty commits are commented out" msgstr "Observera att tomma incheckningar är utkommenterade" -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339 -#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 +#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format msgid "could not write '%s'" msgstr "kunde inte skriva \"%s\"" @@ -4826,97 +4906,98 @@ msgstr "" "\" (fel).\n" "\n" -#: refs.c:192 +#: refs.c:262 #, c-format msgid "%s does not point to a valid object!" msgstr "\"%s\" pekar inte på ett giltigt objekt!" -#: refs.c:597 +#: refs.c:667 #, c-format msgid "ignoring dangling symref %s" msgstr "ignorerar dinglande symbolisk referens %s" -#: refs.c:599 ref-filter.c:1982 +#: refs.c:669 ref-filter.c:2092 #, c-format msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" -#: refs.c:734 +#: refs.c:804 #, c-format msgid "could not open '%s' for writing: %s" msgstr "kunde inte öppna \"%s\" för skrivning: %s" -#: refs.c:744 refs.c:795 +#: refs.c:814 refs.c:865 #, c-format msgid "could not read ref '%s'" msgstr "Kunde inte läsa referensen \"%s\"" -#: refs.c:750 +#: refs.c:820 #, c-format msgid "ref '%s' already exists" msgstr "referensen \"%s\" finns redan" -#: refs.c:755 +#: refs.c:825 #, c-format msgid "unexpected object ID when writing '%s'" msgstr "oväntat objekt-id vid skrivning \"%s\"" -#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805 -#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656 +#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 +#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" -#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993 +#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 +#: builtin/rebase.c:1003 #, c-format msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" -#: refs.c:797 +#: refs.c:867 #, c-format msgid "unexpected object ID when deleting '%s'" msgstr "oväntat objekt-id vid borttagning \"%s\"" -#: refs.c:928 +#: refs.c:998 #, c-format msgid "log for ref %s has gap after %s" msgstr "loggen för referensen %s har lucka efter %s" -#: refs.c:934 +#: refs.c:1004 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "loggen för referensen %s slutade oväntat på %s" -#: refs.c:993 +#: refs.c:1063 #, c-format msgid "log for %s is empty" msgstr "loggen för %s är tom" -#: refs.c:1085 +#: refs.c:1155 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "vägrar uppdatera referens med trasigt namn \"%s\"" -#: refs.c:1161 +#: refs.c:1231 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref misslyckades för referensen \"%s\": %s" -#: refs.c:1942 +#: refs.c:2012 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "flera uppdateringar för referensen \"%s\" tillåts inte" -#: refs.c:1974 +#: refs.c:2044 msgid "ref updates forbidden inside quarantine environment" msgstr "referensuppdateringar förbjudna i karantänmiljö" -#: refs.c:2070 refs.c:2100 +#: refs.c:2140 refs.c:2170 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "\"%s\" finns; kan inte skapa \"%s\"" -#: refs.c:2076 refs.c:2111 +#: refs.c:2146 refs.c:2181 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt" @@ -4942,268 +5023,252 @@ msgstr "kunde inte ta bort referenser: %s" msgid "invalid refspec '%s'" msgstr "felaktig referensspecifikation: \"%s\"" -#: ref-filter.c:39 wt-status.c:1907 +#: ref-filter.c:42 wt-status.c:1934 msgid "gone" msgstr "försvunnen" -#: ref-filter.c:40 +#: ref-filter.c:43 #, c-format msgid "ahead %d" msgstr "före %d" -#: ref-filter.c:41 +#: ref-filter.c:44 #, c-format msgid "behind %d" msgstr "bakom %d" -#: ref-filter.c:42 +#: ref-filter.c:45 #, c-format msgid "ahead %d, behind %d" msgstr "före %d, bakom %d" -#: ref-filter.c:138 +#: ref-filter.c:162 #, c-format msgid "expected format: %%(color:<color>)" msgstr "förväntat format: %%(color:<color>)" -#: ref-filter.c:140 +#: ref-filter.c:164 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "okänd färg: %%(color:%s)" -#: ref-filter.c:162 +#: ref-filter.c:186 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Heltalsvärde förväntades refname:lstrip=%s" -#: ref-filter.c:166 +#: ref-filter.c:190 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Heltalsvärde förväntades refname:rstrip=%s" -#: ref-filter.c:168 +#: ref-filter.c:192 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "okänt %%(%s)-argument: %s" -#: ref-filter.c:223 +#: ref-filter.c:247 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) tar inte argument" -#: ref-filter.c:245 +#: ref-filter.c:269 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "okänt %%(objectsize)-argument: %s" -#: ref-filter.c:253 +#: ref-filter.c:277 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) tar inte argument" -#: ref-filter.c:265 +#: ref-filter.c:289 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) tar inte argument" -#: ref-filter.c:274 +#: ref-filter.c:298 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) tar inte argument" -#: ref-filter.c:296 +#: ref-filter.c:320 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "okänt %%(trailers)-argument: %s" -#: ref-filter.c:325 +#: ref-filter.c:349 #, c-format msgid "positive value expected contents:lines=%s" msgstr "positivt värde förväntat contents:lines=%s" -#: ref-filter.c:327 +#: ref-filter.c:351 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "okänt %%(contents)-argument: %s" -#: ref-filter.c:342 +#: ref-filter.c:366 #, c-format msgid "positive value expected objectname:short=%s" msgstr "positivt värde förväntat objectname:short=%s" -#: ref-filter.c:346 +#: ref-filter.c:370 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "okänt %%(objectname)-argument: %s" -#: ref-filter.c:376 +#: ref-filter.c:400 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "förväntat format: %%(align:<bredd>,<position>)" -#: ref-filter.c:388 +#: ref-filter.c:412 #, c-format msgid "unrecognized position:%s" msgstr "okänd position:%s" -#: ref-filter.c:395 +#: ref-filter.c:419 #, c-format msgid "unrecognized width:%s" msgstr "okänd bredd:%s" -#: ref-filter.c:404 +#: ref-filter.c:428 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "okänt %%(align)-argument: %s" -#: ref-filter.c:412 +#: ref-filter.c:436 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "positiv bredd förväntad med atomen %%(align)" -#: ref-filter.c:430 +#: ref-filter.c:454 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "okänt %%(if)-argument: %s" -#: ref-filter.c:531 +#: ref-filter.c:556 #, c-format msgid "malformed field name: %.*s" msgstr "felformat fältnamn: %.*s" -#: ref-filter.c:558 +#: ref-filter.c:583 #, c-format msgid "unknown field name: %.*s" msgstr "okänt fältnamn: %.*s" -#: ref-filter.c:562 +#: ref-filter.c:587 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" "inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata" -#: ref-filter.c:686 +#: ref-filter.c:711 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: atomen %%(if) använd utan en %%(then)-atom" -#: ref-filter.c:749 +#: ref-filter.c:774 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: atomen %%(then) använd utan en %%(if)-atom" -#: ref-filter.c:751 +#: ref-filter.c:776 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: atomen %%(then) använd mer än en gång" -#: ref-filter.c:753 +#: ref-filter.c:778 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atomen %%(then) använd efter %%(else)" -#: ref-filter.c:781 +#: ref-filter.c:806 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: atomen %%(else) använd utan en %%(if)-atom" -#: ref-filter.c:783 +#: ref-filter.c:808 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format: atomen %%(else) använd utan en %%(then)-atom" -#: ref-filter.c:785 +#: ref-filter.c:810 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format: atomen %%(else) använd mer än en gång" -#: ref-filter.c:800 +#: ref-filter.c:825 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: atomen %%(end) använd utan motsvarande atom" -#: ref-filter.c:857 +#: ref-filter.c:882 #, c-format msgid "malformed format string %s" msgstr "felformad formatsträng %s" -#: ref-filter.c:1453 -#, c-format -msgid "(no branch, rebasing %s)" -msgstr "(ingen gren, ombaserar %s)" - -#: ref-filter.c:1456 +#: ref-filter.c:1485 #, c-format -msgid "(no branch, rebasing detached HEAD %s)" -msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)" +msgid "no branch, rebasing %s" +msgstr "ingen gren, ombaserar %s" -#: ref-filter.c:1459 +#: ref-filter.c:1488 #, c-format -msgid "(no branch, bisect started on %s)" -msgstr "(ingen gren, \"bisect\" startad på %s)" +msgid "no branch, rebasing detached HEAD %s" +msgstr "ingen gren, ombaserar frånkopplat HEAD %s" -#. TRANSLATORS: make sure this matches "HEAD -#. detached at " in wt-status.c -#. -#: ref-filter.c:1467 -#, c-format -msgid "(HEAD detached at %s)" -msgstr "(HEAD frånkopplat vid %s)" - -#. TRANSLATORS: make sure this matches "HEAD -#. detached from " in wt-status.c -#. -#: ref-filter.c:1474 +#: ref-filter.c:1491 #, c-format -msgid "(HEAD detached from %s)" -msgstr "(HEAD frånkopplat från %s)" +msgid "no branch, bisect started on %s" +msgstr "ingen gren, \"bisect\" startad på %s" -#: ref-filter.c:1478 -msgid "(no branch)" -msgstr "(ingen gren)" +#: ref-filter.c:1501 +msgid "no branch" +msgstr "ingen gren" -#: ref-filter.c:1512 ref-filter.c:1669 +#: ref-filter.c:1537 ref-filter.c:1743 #, c-format msgid "missing object %s for %s" msgstr "objektet %s saknas för %s" -#: ref-filter.c:1522 +#: ref-filter.c:1547 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer misslyckades på %s för %s" -#: ref-filter.c:1888 +#: ref-filter.c:1998 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:1977 +#: ref-filter.c:2087 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:2263 +#: ref-filter.c:2382 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:2363 +#: ref-filter.c:2482 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "flaggan \"%s\" är inkompatibel med --merged" -#: ref-filter.c:2366 +#: ref-filter.c:2485 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "flaggan \"%s\" är inkompatibel med --no-merged" -#: ref-filter.c:2376 +#: ref-filter.c:2495 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: ref-filter.c:2381 +#: ref-filter.c:2500 #, c-format msgid "option `%s' must point to a commit" msgstr "flaggan \"%s\" måste peka på en incheckning" @@ -5545,8 +5610,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:881 submodule.c:2024 builtin/log.c:1750 -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1790 +#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" @@ -5580,20 +5645,20 @@ msgstr "Glömde lösning för \"%s\"\n" msgid "unable to open rr-cache directory" msgstr "kan inte uppdatera katalogen rr-cache" -#: revision.c:2476 +#: revision.c:2507 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2479 +#: revision.c:2510 #, 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:2679 +#: revision.c:2710 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" -#: revision.c:2683 +#: revision.c:2714 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" @@ -5663,24 +5728,29 @@ msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\"" msgid "could not delete '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:318 +#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#, c-format +msgid "could not remove '%s'" +msgstr "kunde inte ta bort \"%s\"" + +#: sequencer.c:321 msgid "revert" msgstr "revert" -#: sequencer.c:320 +#: sequencer.c:323 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:322 +#: sequencer.c:325 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:324 +#: sequencer.c:327 #, c-format msgid "unknown action: %d" msgstr "okänd funktion: %d" -#: sequencer.c:382 +#: sequencer.c:385 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -5688,7 +5758,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:385 +#: sequencer.c:388 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -5698,44 +5768,44 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:398 sequencer.c:2801 +#: sequencer.c:401 sequencer.c:2909 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:405 +#: sequencer.c:408 #, c-format msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821 -#: sequencer.c:3084 +#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 +#: sequencer.c:3192 #, c-format msgid "failed to finalize '%s'" msgstr "misslyckades färdigställa \"%s\"" -#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704 -#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760 -#: builtin/merge.c:1115 builtin/rebase.c:567 +#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 +#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 +#: builtin/merge.c:1112 builtin/rebase.c:567 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: sequencer.c:459 +#: sequencer.c:462 #, c-format msgid "your local changes would be overwritten by %s." msgstr "dina lokala ändringar skulle skrivas över av %s." -#: sequencer.c:463 +#: sequencer.c:466 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:495 +#: sequencer.c:498 #, c-format msgid "%s: fast-forward" msgstr "%s: snabbspola" -#: sequencer.c:534 builtin/tag.c:555 +#: sequencer.c:537 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" @@ -5743,70 +5813,70 @@ msgstr "Felaktigt städningsläge %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:629 +#: sequencer.c:632 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:646 +#: sequencer.c:649 msgid "unable to update cache tree" msgstr "kan inte uppdatera cacheträd" -#: sequencer.c:660 +#: sequencer.c:663 msgid "could not resolve HEAD commit" msgstr "kunde inte bestämma HEAD:s incheckning" -#: sequencer.c:740 +#: sequencer.c:743 #, c-format msgid "no key present in '%.*s'" msgstr "ingen nyckel i \"%.*s\"" -#: sequencer.c:751 +#: sequencer.c:754 #, c-format msgid "unable to dequote value of '%s'" msgstr "kan inte ta bort citering av värdet \"%s\"" -#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706 -#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035 +#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 +#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: sequencer.c:798 +#: sequencer.c:801 msgid "'GIT_AUTHOR_NAME' already given" msgstr "\"GIT_AUTHOR_NAME\" har redan angivits" -#: sequencer.c:803 +#: sequencer.c:806 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits" -#: sequencer.c:808 +#: sequencer.c:811 msgid "'GIT_AUTHOR_DATE' already given" msgstr "\"GIT_AUTHOR_DATE\" har redan angivits" -#: sequencer.c:812 +#: sequencer.c:815 #, c-format msgid "unknown variable '%s'" msgstr "okänd variabel \"%s\"" -#: sequencer.c:817 +#: sequencer.c:820 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "\"GIT_AUTHOR_NAME\" saknas" -#: sequencer.c:819 +#: sequencer.c:822 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "\"GIT_AUTHOR_EMAIL\" saknas" -#: sequencer.c:821 +#: sequencer.c:824 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "\"GIT_AUTHOR_DATE\" saknas" -#: sequencer.c:881 +#: sequencer.c:884 #, c-format msgid "invalid date format '%s' in '%s'" msgstr "ogiltigt datumformat \"%s\" i \"%s\"" -#: sequencer.c:898 +#: sequencer.c:901 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5835,15 +5905,15 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:992 +#: sequencer.c:995 msgid "writing root commit" msgstr "skriver rotincheckning" -#: sequencer.c:1213 +#: sequencer.c:1216 msgid "'prepare-commit-msg' hook failed" msgstr "kroken \"prepare-commit-msg\" misslyckades" -#: sequencer.c:1220 +#: sequencer.c:1223 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5870,7 +5940,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1233 +#: sequencer.c:1236 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5895,307 +5965,350 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1275 +#: sequencer.c:1278 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: sequencer.c:1277 +#: sequencer.c:1280 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: sequencer.c:1323 +#: sequencer.c:1326 msgid "unable to resolve HEAD after creating commit" msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning" -#: sequencer.c:1325 +#: sequencer.c:1328 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: sequencer.c:1329 +#: sequencer.c:1332 msgid " (root-commit)" msgstr " (rotincheckning)" -#: sequencer.c:1350 +#: sequencer.c:1353 msgid "could not parse HEAD" msgstr "kunde inte tolka HEAD" -#: sequencer.c:1352 +#: sequencer.c:1355 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s är inte en incheckning!" -#: sequencer.c:1356 builtin/commit.c:1551 +#: sequencer.c:1359 builtin/commit.c:1571 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: sequencer.c:1408 sequencer.c:2001 +#: sequencer.c:1411 sequencer.c:2004 msgid "unable to parse commit author" msgstr "kunde inte tolka incheckningens författare" -#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688 +#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: sequencer.c:1435 sequencer.c:1496 +#: sequencer.c:1438 sequencer.c:1499 #, c-format msgid "unable to read commit message from '%s'" msgstr "kunde inte läsa incheckningsmeddelande från \"%s\"" -#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882 -#: builtin/merge.c:906 +#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 +#: builtin/merge.c:903 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: sequencer.c:1523 +#: sequencer.c:1526 #, c-format msgid "could not parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: sequencer.c:1528 +#: sequencer.c:1531 #, c-format msgid "could not parse parent commit %s" msgstr "kunde inte tolka föräldraincheckningen %s" -#: sequencer.c:1602 sequencer.c:1712 +#: sequencer.c:1605 sequencer.c:1715 #, c-format msgid "unknown command: %d" msgstr "okänt kommando: %d" -#: sequencer.c:1659 sequencer.c:1684 +#: sequencer.c:1662 sequencer.c:1687 #, c-format msgid "This is a combination of %d commits." msgstr "Det här är en kombination av %d incheckningar." -#: sequencer.c:1669 +#: sequencer.c:1672 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:1671 sequencer.c:3111 +#: sequencer.c:1674 sequencer.c:3219 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:1673 +#: sequencer.c:1676 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:1679 +#: sequencer.c:1682 #, c-format msgid "cannot write '%s'" msgstr "kan inte skriva \"%s\"" -#: sequencer.c:1686 git-rebase--preserve-merges.sh:441 +#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Det här är 1:a incheckningsmeddelandet:" -#: sequencer.c:1694 +#: sequencer.c:1697 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:1701 +#: sequencer.c:1704 #, c-format msgid "This is the commit message #%d:" msgstr "Det här är incheckningsmeddelande %d:" -#: sequencer.c:1707 +#: sequencer.c:1710 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Incheckningsmeddelande %d kommer hoppas över:" -#: sequencer.c:1795 +#: sequencer.c:1798 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:1802 +#: sequencer.c:1805 msgid "cannot fixup root commit" msgstr "kan inte göra \"fixup\" på rotincheckning" -#: sequencer.c:1821 +#: sequencer.c:1824 #, 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:1829 sequencer.c:1837 +#: sequencer.c:1832 sequencer.c:1840 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:1843 +#: sequencer.c:1846 #, 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:1862 +#: sequencer.c:1865 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:1927 +#: sequencer.c:1930 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:1982 +#: sequencer.c:1985 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:1983 +#: sequencer.c:1986 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:2042 +#: sequencer.c:2045 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:2049 +#: sequencer.c:2052 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:2118 +#: sequencer.c:2128 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s tar inte argument: \"%s\"" -#: sequencer.c:2127 +#: sequencer.c:2137 #, c-format msgid "missing arguments for %s" msgstr "argument saknas för %s" -#: sequencer.c:2164 +#: sequencer.c:2174 #, c-format msgid "could not parse '%.*s'" msgstr "kunde inte tolka \"%.*s\"" -#: sequencer.c:2226 +#: sequencer.c:2228 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:2237 +#: sequencer.c:2239 #, c-format msgid "cannot '%s' without a previous commit" msgstr "kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178 +#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 #: builtin/rebase.c:204 builtin/rebase.c:229 #, c-format msgid "could not read '%s'." msgstr "kunde inte läsa \"%s\"." -#: sequencer.c:2360 +#: sequencer.c:2323 +msgid "cancelling a cherry picking in progress" +msgstr "avbryter pågående \"cherry-pick\"" + +#: sequencer.c:2330 +msgid "cancelling a revert in progress" +msgstr "avbryter pågående \"revert\"" + +#: sequencer.c:2364 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:2362 +#: sequencer.c:2366 #, c-format msgid "unusable instruction sheet: '%s'" -msgstr "oanvändbart manus: ”%s”" +msgstr "oanvändbart manus: \"%s\"" -#: sequencer.c:2367 +#: sequencer.c:2371 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:2378 +#: sequencer.c:2382 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:2380 +#: sequencer.c:2384 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:2462 +#: sequencer.c:2466 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:2549 +#: sequencer.c:2553 msgid "unusable squash-onto" msgstr "oanvändbar squash-onto" -#: sequencer.c:2565 +#: sequencer.c:2569 #, c-format msgid "malformed options sheet: '%s'" -msgstr "trasigt manus: ”%s”" +msgstr "trasigt manus: \"%s\"" -#: sequencer.c:2648 sequencer.c:4227 +#: sequencer.c:2652 sequencer.c:4351 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:2656 -msgid "a cherry-pick or revert is already in progress" -msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" +#: sequencer.c:2668 +msgid "revert is already in progress" +msgstr "en \"revert\" pågår redan" + +#: sequencer.c:2670 +#, c-format +msgid "try \"git revert (--continue | %s--abort | --quit)\"" +msgstr "testa \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2657 -msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" -msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" +#: sequencer.c:2673 +msgid "cherry-pick is already in progress" +msgstr "en \"cherry-pick\" pågår redan" -#: sequencer.c:2660 +#: sequencer.c:2675 +#, c-format +msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" +msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\"" + +#: sequencer.c:2689 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:2674 +#: sequencer.c:2704 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:2729 sequencer.c:3979 +#: sequencer.c:2764 sequencer.c:4103 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:2731 +#: sequencer.c:2766 sequencer.c:2777 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:2733 sequencer.c:2768 +#: sequencer.c:2768 sequencer.c:2812 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:2754 builtin/grep.c:732 +#: sequencer.c:2798 builtin/grep.c:734 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:2756 +#: sequencer.c:2800 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:2757 +#: sequencer.c:2801 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:2763 +#: sequencer.c:2807 #, 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:2774 +#: sequencer.c:2818 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:2903 sequencer.c:3894 +#: sequencer.c:2859 +msgid "no revert in progress" +msgstr "ingen \"revers\" pågår" + +#: sequencer.c:2867 +msgid "no cherry-pick in progress" +msgstr "ingen \"cherry-pick\" pågår" + +#: sequencer.c:2877 +msgid "failed to skip the commit" +msgstr "kunde inte hoppa över incheckningen" + +#: sequencer.c:2884 +msgid "there is nothing to skip" +msgstr "ingenting att hoppa över" + +#: sequencer.c:2887 +#, c-format +msgid "" +"have you committed already?\n" +"try \"git %s --continue\"" +msgstr "" +"har du redan checkat in?\n" +"testa \"git %s --continue\"" + +#: sequencer.c:3011 sequencer.c:4015 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:2941 sequencer.c:3874 +#: sequencer.c:3049 sequencer.c:3995 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:2958 +#: sequencer.c:3066 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "kan inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:2966 +#: sequencer.c:3074 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6214,27 +6327,27 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:2976 +#: sequencer.c:3084 #, c-format msgid "Could not apply %s... %.*s" msgstr "Kunde inte tillämpa %s... %.*s" -#: sequencer.c:2983 +#: sequencer.c:3091 #, c-format msgid "Could not merge %.*s" msgstr "Kunde inte slå ihop %.*s" -#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:639 +#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580 -#: builtin/rebase.c:1940 builtin/rebase.c:1995 +#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 +#: builtin/rebase.c:1953 builtin/rebase.c:2008 msgid "could not read index" msgstr "kunde inte läsa indexet" -#: sequencer.c:3028 +#: sequencer.c:3136 #, c-format msgid "" "execution failed: %s\n" @@ -6249,11 +6362,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3034 +#: sequencer.c:3142 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:3040 +#: sequencer.c:3148 #, c-format msgid "" "execution succeeded: %s\n" @@ -6270,76 +6383,76 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3101 +#: sequencer.c:3209 #, c-format msgid "illegal label name: '%.*s'" msgstr "ogiltigt etikettnamn: \"%.*s\"" -#: sequencer.c:3155 +#: sequencer.c:3263 msgid "writing fake root commit" msgstr "skriver fejkad rotincheckning" -#: sequencer.c:3160 +#: sequencer.c:3268 msgid "writing squash-onto" msgstr "skriver squash-onto" -#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850 +#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 #, c-format msgid "failed to find tree of %s" msgstr "kunde inte hitta trädet för %s." -#: sequencer.c:3216 builtin/rebase.c:863 +#: sequencer.c:3324 builtin/rebase.c:873 msgid "could not write index" msgstr "kunde inte skriva indexet" -#: sequencer.c:3243 +#: sequencer.c:3351 #, c-format msgid "could not resolve '%s'" msgstr "kunde inte upplösa \"%s\"" -#: sequencer.c:3271 +#: sequencer.c:3379 msgid "cannot merge without a current revision" msgstr "kan inte slå ihop utan en aktuell incheckning" -#: sequencer.c:3293 +#: sequencer.c:3401 #, c-format msgid "unable to parse '%.*s'" msgstr "kan inte tolka \"%.*s\"" -#: sequencer.c:3302 +#: sequencer.c:3410 #, c-format msgid "nothing to merge: '%.*s'" msgstr "inget att slå samman: \"%.*s\"" -#: sequencer.c:3314 +#: sequencer.c:3422 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]" -#: sequencer.c:3329 +#: sequencer.c:3437 #, c-format msgid "could not get commit message of '%s'" msgstr "kunde inte läsa incheckningsmeddelande för \"%s\"" -#: sequencer.c:3478 +#: sequencer.c:3590 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "kunde inte ens försöka slå ihop \"%.*s\"" -#: sequencer.c:3494 +#: sequencer.c:3606 msgid "merge: Unable to write new index file" msgstr "sammanslagning: Kunde inte skriva ny indexfil" -#: sequencer.c:3562 builtin/rebase.c:711 +#: sequencer.c:3675 builtin/rebase.c:711 #, c-format msgid "Applied autostash.\n" msgstr "Tillämpade autostash.\n" -#: sequencer.c:3574 +#: sequencer.c:3687 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:3577 builtin/rebase.c:727 +#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6350,31 +6463,31 @@ msgstr "" "Dina ändringar är säkra i stashen.\n" "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" -#: sequencer.c:3638 +#: sequencer.c:3751 #, c-format msgid "could not checkout %s" msgstr "kunde inte checka ut %s" -#: sequencer.c:3652 +#: sequencer.c:3765 #, c-format msgid "%s: not a valid OID" msgstr "%s: inte ett giltigt OID" -#: sequencer.c:3657 git-rebase--preserve-merges.sh:724 +#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" -#: sequencer.c:3672 +#: sequencer.c:3785 #, c-format msgid "Stopped at HEAD\n" msgstr "Stoppade på HEAD\n" -#: sequencer.c:3674 +#: sequencer.c:3787 #, c-format msgid "Stopped at %s\n" msgstr "Stoppade på %s\n" -#: sequencer.c:3682 +#: sequencer.c:3795 #, c-format msgid "" "Could not execute the todo command\n" @@ -6395,48 +6508,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3759 +#: sequencer.c:3877 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:3837 +#: sequencer.c:3958 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:3882 +#: sequencer.c:4003 msgid "could not read orig-head" msgstr "kunde inte läsa orig-head" -#: sequencer.c:3887 +#: sequencer.c:4008 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:3901 +#: sequencer.c:4022 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:3991 +#: sequencer.c:4115 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:4000 +#: sequencer.c:4124 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:4002 +#: sequencer.c:4126 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:4004 +#: sequencer.c:4128 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:4007 +#: sequencer.c:4131 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6446,42 +6559,42 @@ 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:4043 sequencer.c:4081 +#: sequencer.c:4167 sequencer.c:4205 #, c-format msgid "could not write file: '%s'" msgstr "kunde inte skriva fil: \"%s\"" -#: sequencer.c:4096 +#: sequencer.c:4220 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:4103 +#: sequencer.c:4227 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:4204 +#: sequencer.c:4328 #, c-format msgid "%s: can't cherry-pick a %s" -msgstr "%s: kan inte göra \"cherry-pick\" på typen ”%s”" +msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:4208 +#: sequencer.c:4332 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:4243 +#: sequencer.c:4367 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" -#: sequencer.c:4686 +#: sequencer.c:4810 msgid "make_script: unhandled options" msgstr "make_script: flaggor som inte stöds" -#: sequencer.c:4689 +#: sequencer.c:4813 msgid "make_script: error preparing revisions" msgstr "make_script: fel när revisioner skulle förberedas" -#: sequencer.c:4847 +#: sequencer.c:4971 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -6491,15 +6604,15 @@ msgstr "" "continue\".\n" "Avbryt ombaseringen med \"git rebase --abort\".\n" -#: sequencer.c:4959 sequencer.c:4976 +#: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "inget att göra" -#: sequencer.c:4990 +#: sequencer.c:5114 msgid "could not skip unnecessary pick commands" msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon" -#: sequencer.c:5073 +#: sequencer.c:5197 msgid "the script was already rearranged." msgstr "skriptet har redan omordnats." @@ -6719,215 +6832,220 @@ msgstr "referensarkivet \"%s\" är grunt" msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: sha1-file.c:846 +#: sha1-file.c:792 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "felaktig rad vid tolkning av alternativa referenser: %s" + +#: sha1-file.c:943 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>" -#: sha1-file.c:871 +#: sha1-file.c:968 msgid "mmap failed" msgstr "mmap misslyckades" -#: sha1-file.c:1035 +#: sha1-file.c:1132 #, c-format msgid "object file %s is empty" msgstr "objektfilen %s är tom" -#: sha1-file.c:1159 sha1-file.c:2297 +#: sha1-file.c:1256 sha1-file.c:2395 #, c-format msgid "corrupt loose object '%s'" msgstr "trasigt löst objekt \"%s\"" -#: sha1-file.c:1161 sha1-file.c:2301 +#: sha1-file.c:1258 sha1-file.c:2399 #, c-format msgid "garbage at end of loose object '%s'" msgstr "skräp i slutet av löst objekt \"%s\"" -#: sha1-file.c:1203 +#: sha1-file.c:1300 msgid "invalid object type" msgstr "felaktig objekttyp" -#: sha1-file.c:1287 +#: sha1-file.c:1384 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "kan inte packa upp %s-huvud med --allow-unknown-type" -#: sha1-file.c:1290 +#: sha1-file.c:1387 #, c-format msgid "unable to unpack %s header" msgstr "kan inte packa upp %s-huvudet" -#: sha1-file.c:1296 +#: sha1-file.c:1393 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "kan inte tolka %s-huvud med --allow-unknown-type" -#: sha1-file.c:1299 +#: sha1-file.c:1396 #, c-format msgid "unable to parse %s header" msgstr "kan inte tolka %s-huvud" -#: sha1-file.c:1490 +#: sha1-file.c:1587 #, c-format msgid "failed to read object %s" msgstr "misslyckades läsa objektet %s" -#: sha1-file.c:1494 +#: sha1-file.c:1591 #, c-format msgid "replacement %s not found for %s" msgstr "ersättningen %s hittades inte för %s" -#: sha1-file.c:1498 +#: sha1-file.c:1595 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "löst objekt %s (lagrat i %s) är trasigt" -#: sha1-file.c:1502 +#: sha1-file.c:1599 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "packat objekt %s (lagrat i %s) är trasigt" -#: sha1-file.c:1604 +#: sha1-file.c:1702 #, c-format msgid "unable to write file %s" msgstr "kunde inte skriva filen %s" -#: sha1-file.c:1611 +#: sha1-file.c:1709 #, c-format msgid "unable to set permission to '%s'" msgstr "kan inte sätta behörigheten till \"%s\"" -#: sha1-file.c:1618 +#: sha1-file.c:1716 msgid "file write error" msgstr "fel vid skrivning av fil" -#: sha1-file.c:1637 +#: sha1-file.c:1735 msgid "error when closing loose object file" msgstr "fel vid stängning av fil för löst objekt" -#: sha1-file.c:1702 +#: sha1-file.c:1800 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s" -#: sha1-file.c:1704 +#: sha1-file.c:1802 msgid "unable to create temporary file" msgstr "kan inte skapa temporär fil" -#: sha1-file.c:1728 +#: sha1-file.c:1826 msgid "unable to write loose object file" msgstr "kunde inte skriva fil för löst objekt" -#: sha1-file.c:1734 +#: sha1-file.c:1832 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)" -#: sha1-file.c:1738 +#: sha1-file.c:1836 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "\"deflateend\" på objektet %s misslyckades (%d)" -#: sha1-file.c:1742 +#: sha1-file.c:1840 #, c-format msgid "confused by unstable object source data for %s" msgstr "förvirrad av instabil objektkälldata för %s" -#: sha1-file.c:1752 builtin/pack-objects.c:920 +#: sha1-file.c:1850 builtin/pack-objects.c:920 #, c-format msgid "failed utime() on %s" msgstr "\"utime()\" misslyckades på %s" -#: sha1-file.c:1827 +#: sha1-file.c:1925 #, c-format msgid "cannot read object for %s" msgstr "kan inte läsa objekt för %s" -#: sha1-file.c:1867 +#: sha1-file.c:1965 msgid "corrupt commit" msgstr "trasik incheckning" -#: sha1-file.c:1875 +#: sha1-file.c:1973 msgid "corrupt tag" msgstr "trasig tagg" -#: sha1-file.c:1974 +#: sha1-file.c:2072 #, c-format msgid "read error while indexing %s" msgstr "läsfel vid indexering av %s" -#: sha1-file.c:1977 +#: sha1-file.c:2075 #, c-format msgid "short read while indexing %s" msgstr "för lite lästes vid indexering av %s" -#: sha1-file.c:2050 sha1-file.c:2059 +#: sha1-file.c:2148 sha1-file.c:2157 #, c-format msgid "%s: failed to insert into database" msgstr "%s: misslyckades lägga in i databasen" -#: sha1-file.c:2065 +#: sha1-file.c:2163 #, c-format msgid "%s: unsupported file type" msgstr "%s: filtypen stöds ej" -#: sha1-file.c:2089 +#: sha1-file.c:2187 #, c-format msgid "%s is not a valid object" msgstr "%s är inte ett giltigt objekt" -#: sha1-file.c:2091 +#: sha1-file.c:2189 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt \"%s\"-objekt" -#: sha1-file.c:2118 builtin/index-pack.c:154 +#: sha1-file.c:2216 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "kan inte öppna %s" -#: sha1-file.c:2308 sha1-file.c:2360 +#: sha1-file.c:2406 sha1-file.c:2458 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "hash stämmer inte för %s (förväntade %s)" -#: sha1-file.c:2332 +#: sha1-file.c:2430 #, c-format msgid "unable to mmap %s" msgstr "kan inte utföra \"mmap\" för %s" -#: sha1-file.c:2337 +#: sha1-file.c:2435 #, c-format msgid "unable to unpack header of %s" msgstr "kan inte packa upp huvud för %s" -#: sha1-file.c:2343 +#: sha1-file.c:2441 #, c-format msgid "unable to parse header of %s" msgstr "kan inte tolka huvud för %s" -#: sha1-file.c:2354 +#: sha1-file.c:2452 #, c-format msgid "unable to unpack contents of %s" msgstr "kan inte tolka innehåll i %s" -#: sha1-name.c:487 +#: sha1-name.c:490 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "kort SHA1 %s är tvetydig" -#: sha1-name.c:498 +#: sha1-name.c:501 msgid "The candidates are:" msgstr "Kandidaterna är:" -#: sha1-name.c:794 +#: sha1-name.c:800 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" "may be created by mistake. For example,\n" "\n" -" git checkout -b $br $(git rev-parse ...)\n" +" git switch -c $br $(git rev-parse ...)\n" "\n" "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" "examine these refs and maybe delete them. Turn this message off by\n" @@ -6937,12 +7055,64 @@ msgstr "" "tecken, då detta ignoreras när du anger 40-hex enbart. Dessa\n" "referenser kan skapas av misstag. Till exempel, för\n" "\n" -" git checkout -b $br $(git rev-parse ...)\n" +" git switch -c $br $(git rev-parse ...)\n" "\n" "där \"$br\" på något sätt blivit tomt och en 40-hex-referens skapats.\n" "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n" "genom att köra \"git config advice.objectNameWarning false\"" +#. TRANSLATORS: IEC 80000-13:2008 gibibyte +#: strbuf.c:821 +#, c-format +msgid "%u.%2.2u GiB" +msgstr "%u,%2.2u GiB" + +#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second +#: strbuf.c:823 +#, c-format +msgid "%u.%2.2u GiB/s" +msgstr "%u,%2.2u GiB/s" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte +#: strbuf.c:831 +#, c-format +msgid "%u.%2.2u MiB" +msgstr "%u,%2.2u MiB" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second +#: strbuf.c:833 +#, c-format +msgid "%u.%2.2u MiB/s" +msgstr "%u,%2.2u MiB/s" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte +#: strbuf.c:840 +#, c-format +msgid "%u.%2.2u KiB" +msgstr "%u,%2.2u KiB" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second +#: strbuf.c:842 +#, c-format +msgid "%u.%2.2u KiB/s" +msgstr "%u,%2.2u KiB/s" + +#. TRANSLATORS: IEC 80000-13:2008 byte +#: strbuf.c:848 +#, c-format +msgid "%u byte" +msgid_plural "%u bytes" +msgstr[0] "%u byte" +msgstr[1] "%u bytes" + +#. TRANSLATORS: IEC 80000-13:2008 byte/second +#: strbuf.c:850 +#, c-format +msgid "%u byte/s" +msgid_plural "%u bytes/s" +msgstr[0] "%u byte/s" +msgstr[1] "%u bytes/s" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -6978,7 +7148,7 @@ msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning" -#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens." @@ -7017,7 +7187,7 @@ msgstr "undermodulen \"%s\" har ett smutsigt index" msgid "Submodule '%s' could not be updated." msgstr "Undermoduler \"%s\" kunde inte uppdateras." -#: submodule.c:2008 +#: submodule.c:2007 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7025,12 +7195,12 @@ msgstr "" "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " "stöds ej" -#: submodule.c:2020 submodule.c:2076 +#: submodule.c:2019 submodule.c:2074 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" -#: submodule.c:2027 +#: submodule.c:2026 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7041,16 +7211,16 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:2111 +#: submodule.c:2109 #, c-format msgid "could not recurse into submodule '%s'" msgstr "kunde inte rekursera in i undermodulen \"%s\"" -#: submodule.c:2155 +#: submodule.c:2153 msgid "could not start ls-files in .." msgstr "kunde inte starta ls-files i .." -#: submodule.c:2194 +#: submodule.c:2192 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en oväntad returkod %d" @@ -7146,7 +7316,7 @@ msgstr "kunde inte läsa paketet (bundlen) \"%s\"" #: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" -msgstr "transport: ogiltig flagga för depth: ”%s”" +msgstr "transport: ogiltig flagga för depth: \"%s\"" #: transport.c:259 msgid "see protocol.version in 'git help config' for more details" @@ -7222,15 +7392,10 @@ msgstr "Avbryter." msgid "failed to push all needed submodules" msgstr "kunde inte sända alla nödvändiga undermoduler" -#: transport.c:1326 transport-helper.c:645 +#: transport.c:1340 transport-helper.c:645 msgid "operation not supported by protocol" msgstr "funktionen stöds inte av protokollet" -#: transport.c:1430 -#, c-format -msgid "invalid line while parsing alternate refs: %s" -msgstr "felaktig rad vid tolkning av alternativa referenser: %s" - #: transport-helper.c:51 transport-helper.c:80 msgid "full write to remote helper failed" msgstr "komplett skrivning till fjärrhjälpare misslyckades" @@ -7277,7 +7442,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:533 transport-helper.c:1099 +#: transport-helper.c:533 transport-helper.c:1105 #, c-format msgid "could not read ref %s" msgstr "kunde inte läsa referensen %s" @@ -7330,24 +7495,24 @@ msgstr "hjälparen %s stöder inte --signed=if-asked" msgid "helper %s does not support 'push-option'" msgstr "hjälparen %s stöder inte \"push-option\"" -#: transport-helper.c:939 +#: transport-helper.c:945 msgid "remote-helper doesn't support push; refspec needed" msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs" -#: transport-helper.c:944 +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'force'" msgstr "hjälparen %s stöder inte \"force\"" -#: transport-helper.c:991 +#: transport-helper.c:997 msgid "couldn't run fast-export" msgstr "kunde inte köra fast-export" -#: transport-helper.c:996 +#: transport-helper.c:1002 msgid "error while running fast-export" msgstr "fel vid körning av fast-export" -#: transport-helper.c:1021 +#: transport-helper.c:1027 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -7356,47 +7521,47 @@ msgstr "" "Inga gemensamma referenser och inga angavs; gör inget.\n" "Du kanske borde ange en gren såsom \"master\".\n" -#: transport-helper.c:1085 +#: transport-helper.c:1091 #, c-format msgid "malformed response in ref list: %s" msgstr "felformat svar i referenslistan: %s" -#: transport-helper.c:1238 +#: transport-helper.c:1244 #, c-format msgid "read(%s) failed" msgstr "läs(%s) misslyckades" -#: transport-helper.c:1265 +#: transport-helper.c:1271 #, c-format msgid "write(%s) failed" msgstr "skriv(%s) misslyckades" -#: transport-helper.c:1314 +#: transport-helper.c:1320 #, c-format msgid "%s thread failed" msgstr "%s-tråden misslyckades" -#: transport-helper.c:1318 +#: transport-helper.c:1324 #, c-format msgid "%s thread failed to join: %s" msgstr "%s-tråden misslyckades ansluta: %s" -#: transport-helper.c:1337 transport-helper.c:1341 +#: transport-helper.c:1343 transport-helper.c:1347 #, 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:1378 +#: transport-helper.c:1384 #, c-format msgid "%s process failed to wait" msgstr "processen %s misslyckades vänta" -#: transport-helper.c:1382 +#: transport-helper.c:1388 #, c-format msgid "%s process failed" msgstr "processen %s misslyckades" -#: transport-helper.c:1400 transport-helper.c:1409 +#: transport-helper.c:1406 transport-helper.c:1415 msgid "can't start thread for copying data" msgstr "kan inte skapa tråd för kopiering av data" @@ -7412,7 +7577,7 @@ msgstr "felformat läge i trädpost" msgid "empty filename in tree entry" msgstr "tomt filnamn i trädpost" -#: tree-walk.c:116 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "trädfil för kort" @@ -7649,8 +7814,8 @@ msgid "Aborting\n" msgstr "Avbryter\n" #: unpack-trees.c:318 -msgid "Checking out files" -msgstr "Checkar ut filer" +msgid "Updating files" +msgstr "Uppdaterar filer" #: unpack-trees.c:350 msgid "" @@ -7691,32 +7856,32 @@ msgstr "felaktigt portnummer" msgid "invalid '..' path segment" msgstr "felaktigt \"..\"-sökvägssegment" -#: worktree.c:255 builtin/am.c:2097 +#: worktree.c:258 builtin/am.c:2095 #, c-format msgid "failed to read '%s'" msgstr "misslyckades läsa \"%s\"" -#: worktree.c:301 +#: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen" -#: worktree.c:312 +#: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen" -#: worktree.c:324 +#: worktree.c:327 #, c-format msgid "'%s' does not exist" msgstr "\"%s\" finns inte" -#: worktree.c:330 +#: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "\"%s\" är inte en .git-fil, felkod %d" -#: worktree.c:338 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "\"%s\" pekar inte tillbaka till \"%s\"" @@ -7735,155 +7900,161 @@ msgstr "kan inte komma åt \"%s\"" msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" -#: wt-status.c:156 +#: wt-status.c:158 msgid "Unmerged paths:" msgstr "Ej sammanslagna sökvägar:" -#: wt-status.c:183 wt-status.c:210 +#: wt-status.c:187 wt-status.c:219 +msgid " (use \"git restore --staged <file>...\" to unstage)" +msgstr " (använd \"git restore --staged <fil>...\" för att ta bort från kö)" + +#: wt-status.c:190 wt-status.c:222 #, c-format -msgid " (use \"git reset %s <file>...\" to unstage)" -msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)" +msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" +msgstr "" +" (använd \"git restore --source=%s --staged <fil>...\" för att ta bort från " +"kö)" -#: wt-status.c:185 wt-status.c:212 +#: wt-status.c:193 wt-status.c:225 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)" -#: wt-status.c:189 +#: wt-status.c:197 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (använd \"git add <fil>...\" för att ange lösning)" -#: wt-status.c:191 wt-status.c:195 +#: wt-status.c:199 wt-status.c:203 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)" -#: wt-status.c:193 +#: wt-status.c:201 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:204 wt-status.c:1064 +#: wt-status.c:211 wt-status.c:1074 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:222 wt-status.c:1073 +#: wt-status.c:234 wt-status.c:1083 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" -#: wt-status.c:226 +#: wt-status.c:238 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)" -#: wt-status.c:228 +#: wt-status.c:240 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)" -#: wt-status.c:229 +#: wt-status.c:241 msgid "" -" (use \"git checkout -- <file>...\" to discard changes in working directory)" +" (use \"git restore <file>...\" to discard changes in working directory)" msgstr "" -" (använd \"git checkout -- <fil>...\" för att förkasta ändringar i " +" (använd \"git restore <fil>...\" för att förkasta ändringar i " "arbetskatalogen)" -#: wt-status.c:231 +#: wt-status.c:243 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)" -#: wt-status.c:243 +#: wt-status.c:254 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)" -#: wt-status.c:258 +#: wt-status.c:268 msgid "both deleted:" msgstr "borttaget av bägge:" -#: wt-status.c:260 +#: wt-status.c:270 msgid "added by us:" msgstr "tillagt av oss:" -#: wt-status.c:262 +#: wt-status.c:272 msgid "deleted by them:" msgstr "borttaget av dem:" -#: wt-status.c:264 +#: wt-status.c:274 msgid "added by them:" msgstr "tillagt av dem:" -#: wt-status.c:266 +#: wt-status.c:276 msgid "deleted by us:" msgstr "borttaget av oss:" -#: wt-status.c:268 +#: wt-status.c:278 msgid "both added:" msgstr "tillagt av bägge:" -#: wt-status.c:270 +#: wt-status.c:280 msgid "both modified:" msgstr "ändrat av bägge:" -#: wt-status.c:280 +#: wt-status.c:290 msgid "new file:" msgstr "ny fil:" -#: wt-status.c:282 +#: wt-status.c:292 msgid "copied:" msgstr "kopierad:" -#: wt-status.c:284 +#: wt-status.c:294 msgid "deleted:" msgstr "borttagen:" -#: wt-status.c:286 +#: wt-status.c:296 msgid "modified:" msgstr "ändrad:" -#: wt-status.c:288 +#: wt-status.c:298 msgid "renamed:" msgstr "namnbytt:" -#: wt-status.c:290 +#: wt-status.c:300 msgid "typechange:" msgstr "typbyte:" -#: wt-status.c:292 +#: wt-status.c:302 msgid "unknown:" msgstr "okänd:" -#: wt-status.c:294 +#: wt-status.c:304 msgid "unmerged:" msgstr "osammanslagen:" -#: wt-status.c:374 +#: wt-status.c:384 msgid "new commits, " msgstr "nya incheckningar, " -#: wt-status.c:376 +#: wt-status.c:386 msgid "modified content, " msgstr "ändrat innehåll, " -#: wt-status.c:378 +#: wt-status.c:388 msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:896 +#: wt-status.c:906 #, 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:928 +#: wt-status.c:938 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:930 +#: wt-status.c:940 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:1012 +#: wt-status.c:1022 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -7891,107 +8062,118 @@ msgstr "" "Raden ovan får inte ändras eller tas bort.\n" "Allt under den kommer tas bort." -#: wt-status.c:1119 +#: wt-status.c:1114 +#, c-format +msgid "" +"\n" +"It took %.2f seconds to compute the branch ahead/behind values.\n" +"You can use '--no-ahead-behind' to avoid this.\n" +msgstr "" +"\n" +"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:1144 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:1122 +#: wt-status.c:1147 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:1124 +#: wt-status.c:1149 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)" -#: wt-status.c:1128 +#: wt-status.c:1153 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:1131 +#: wt-status.c:1156 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:1140 +#: wt-status.c:1165 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:1143 +#: wt-status.c:1168 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:1147 +#: wt-status.c:1172 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:1149 +#: wt-status.c:1174 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:1151 +#: wt-status.c:1176 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:1282 +#: wt-status.c:1309 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo saknas." -#: wt-status.c:1284 +#: wt-status.c:1311 msgid "No commands done." msgstr "Inga kommandon utförda." -#: wt-status.c:1287 +#: wt-status.c:1314 #, 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:1298 +#: wt-status.c:1325 #, c-format msgid " (see more in file %s)" msgstr " (se fler i filen %s)" -#: wt-status.c:1303 +#: wt-status.c:1330 msgid "No commands remaining." msgstr "Inga kommandon återstår." -#: wt-status.c:1306 +#: wt-status.c:1333 #, 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:1314 +#: wt-status.c:1341 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:1326 +#: wt-status.c:1353 #, 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:1331 +#: wt-status.c:1358 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1344 +#: wt-status.c:1371 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1346 +#: wt-status.c:1373 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1348 +#: wt-status.c:1375 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:1355 +#: wt-status.c:1382 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1359 +#: wt-status.c:1386 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -7999,142 +8181,134 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1364 +#: wt-status.c:1391 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:1367 +#: wt-status.c:1394 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:1371 +#: wt-status.c:1398 #, 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:1376 +#: wt-status.c:1403 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:1379 +#: wt-status.c:1406 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:1381 +#: wt-status.c:1408 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:1392 +#: wt-status.c:1419 msgid "Cherry-pick currently in progress." msgstr "Cherry-pick pågår." -#: wt-status.c:1395 +#: wt-status.c:1422 #, 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:1402 +#: wt-status.c:1429 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1405 +#: wt-status.c:1432 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (kör \"git cherry-pick --continue\" för att fortsätta)" -#: wt-status.c:1408 +#: wt-status.c:1435 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1410 +#: wt-status.c:1437 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:1420 +#: wt-status.c:1447 msgid "Revert currently in progress." msgstr "Ångring pågår." -#: wt-status.c:1423 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1429 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1432 +#: wt-status.c:1459 msgid " (run \"git revert --continue\" to continue)" msgstr " (kör \"git revert --continue\" för att fortsätta)" -#: wt-status.c:1435 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1437 +#: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1447 +#: wt-status.c:1474 #, 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:1451 +#: wt-status.c:1478 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1454 +#: wt-status.c:1481 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:1663 +#: wt-status.c:1690 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1670 +#: wt-status.c:1697 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå " -#: wt-status.c:1672 +#: wt-status.c:1699 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå " -#: wt-status.c:1677 -msgid "HEAD detached at " -msgstr "HEAD frånkopplad vid " - -#: wt-status.c:1679 -msgid "HEAD detached from " -msgstr "HEAD frånkopplad från " - -#: wt-status.c:1682 +#: wt-status.c:1709 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1699 +#: wt-status.c:1726 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1700 +#: wt-status.c:1727 msgid "No commits yet" msgstr "Inga incheckningar ännu" -#: wt-status.c:1714 +#: wt-status.c:1741 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1716 +#: wt-status.c:1743 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1720 +#: wt-status.c:1747 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8146,32 +8320,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1726 +#: wt-status.c:1753 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1728 +#: wt-status.c:1755 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1734 +#: wt-status.c:1761 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1739 +#: wt-status.c:1766 #, 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:1742 +#: wt-status.c:1769 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1745 +#: wt-status.c:1772 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -8180,62 +8354,62 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1748 +#: wt-status.c:1775 #, 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:1751 +#: wt-status.c:1778 #, 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:1754 wt-status.c:1759 +#: wt-status.c:1781 wt-status.c:1786 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1757 +#: wt-status.c:1784 #, 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:1761 +#: wt-status.c:1788 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1874 +#: wt-status.c:1901 msgid "No commits yet on " msgstr "Inga incheckningar ännu på " -#: wt-status.c:1878 +#: wt-status.c:1905 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1909 +#: wt-status.c:1936 msgid "different" msgstr "olika" -#: wt-status.c:1911 wt-status.c:1919 +#: wt-status.c:1938 wt-status.c:1946 msgid "behind " msgstr "efter " -#: wt-status.c:1914 wt-status.c:1917 +#: wt-status.c:1941 wt-status.c:1944 msgid "ahead " msgstr "före " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2441 +#: wt-status.c:2466 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "kan inte %s: Du har oköade ändringar." -#: wt-status.c:2447 +#: wt-status.c:2472 msgid "additionally, your index contains uncommitted changes." msgstr "dessutom innehåller dit index ändringar som inte har checkats in." -#: wt-status.c:2449 +#: wt-status.c:2474 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in." @@ -8249,7 +8423,7 @@ msgstr "git add [<flaggor>] [--] <sökväg>..." msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:89 builtin/commit.c:285 +#: builtin/add.c:89 builtin/commit.c:288 msgid "updating files failed" msgstr "misslyckades uppdatera filer" @@ -8297,8 +8471,8 @@ msgstr "Kunde inte tillämpa \"%s\"" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" -#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560 +#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 #: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "testkörning" @@ -8307,7 +8481,7 @@ msgstr "testkörning" msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306 +#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 msgid "select hunks interactively" msgstr "välj stycken interaktivt" @@ -8388,7 +8562,7 @@ msgstr "" "\n" "\tgit rm --cached %s\n" "\n" -"Se ”git help submodule” för ytterligare information." +"Se \"git help submodule\" för ytterligare information." #: builtin/add.c:354 #, c-format @@ -8475,7 +8649,7 @@ msgstr "ogiltig tidszons-offset" msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:949 builtin/clone.c:412 +#: builtin/am.c:949 builtin/clone.c:407 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" @@ -8484,7 +8658,7 @@ msgstr "misslyckades skapa katalogen \"%s\"" msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1084 builtin/commit.c:371 +#: builtin/am.c:1084 builtin/commit.c:374 msgid "unable to write index file" msgstr "kan inte skriva indexfil" @@ -8523,17 +8697,17 @@ msgstr "ogiltig ident-rad: %.*s" msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: builtin/am.c:1495 +#: builtin/am.c:1496 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:1497 +#: builtin/am.c:1498 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1516 +#: builtin/am.c:1517 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -8541,30 +8715,25 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1522 +#: builtin/am.c:1523 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1548 +#: builtin/am.c:1549 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1580 +#: builtin/am.c:1581 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1627 builtin/am.c:1631 +#: builtin/am.c:1628 builtin/am.c:1632 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1647 -msgid "cannot be interactive without stdin connected to a terminal." -msgstr "" -"kan inte vara interaktiv om standard in inte är ansluten till en terminal." - -#: builtin/am.c:1652 +#: builtin/am.c:1650 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -8572,35 +8741,36 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1662 +#: builtin/am.c:1660 +#, 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:1712 +#: builtin/am.c:1710 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1752 builtin/am.c:1820 +#: builtin/am.c:1750 builtin/am.c:1818 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1769 +#: builtin/am.c:1767 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1775 +#: builtin/am.c:1773 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1779 +#: builtin/am.c:1777 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" "Använd \"git am --show-current-patch\" för att se patchen som misslyckades" -#: builtin/am.c:1823 +#: builtin/am.c:1821 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -8610,7 +8780,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:1830 +#: builtin/am.c:1828 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8618,21 +8788,21 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" "Du har fortfarande ej sammanslagna sökvägar i indexet.\n" -"Du bör köra ”git add” på filer med lösta konflikter för att ange dem som " +"Du bör köra \"git add\" på filer med lösta konflikter för att ange dem som " "lösta.\n" -"Du kan köra ”git rm” för att godta ”borttagen av dem” för den." +"Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den." -#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329 +#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 #: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." -msgstr "Kan inte tolka objektet ”%s”." +msgstr "Kan inte tolka objektet \"%s\"." -#: builtin/am.c:1989 +#: builtin/am.c:1987 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2033 +#: builtin/am.c:2031 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -8640,143 +8810,143 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2130 +#: builtin/am.c:2128 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt värde för --patch-format: %s" -#: builtin/am.c:2166 +#: builtin/am.c:2164 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2167 +#: builtin/am.c:2165 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2173 +#: builtin/am.c:2171 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2175 +#: builtin/am.c:2173 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2177 +#: builtin/am.c:2175 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:306 builtin/stash.c:805 +#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:307 builtin/stash.c:806 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2180 +#: builtin/am.c:2178 msgid "add a Signed-off-by line to the commit message" msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet" -#: builtin/am.c:2183 +#: builtin/am.c:2181 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2185 +#: builtin/am.c:2183 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2187 +#: builtin/am.c:2185 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2189 +#: builtin/am.c:2187 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2191 +#: builtin/am.c:2189 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:2194 +#: builtin/am.c:2192 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:2197 +#: builtin/am.c:2195 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208 -#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220 -#: builtin/am.c:2226 +#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 +#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 +#: builtin/am.c:2224 msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247 -#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412 -#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323 -#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:397 -#: parse-options.h:140 parse-options.h:161 parse-options.h:303 +#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 +#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 +#: builtin/repack.c:318 builtin/repack.c:322 builtin/repack.c:324 +#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 +#: parse-options.h:141 parse-options.h:162 parse-options.h:312 msgid "n" msgstr "n" -#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38 -#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39 +#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:39 msgid "format" msgstr "format" -#: builtin/am.c:2223 +#: builtin/am.c:2221 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2229 +#: builtin/am.c:2227 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2231 +#: builtin/am.c:2229 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2234 +#: builtin/am.c:2232 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2237 +#: builtin/am.c:2235 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2240 +#: builtin/am.c:2238 msgid "restore the original branch and abort the patching operation." msgstr "återställ originalgrenen och avbryt patchningen." -#: builtin/am.c:2243 +#: builtin/am.c:2241 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:2246 +#: builtin/am.c:2244 msgid "show the patch being applied." msgstr "visa patchen som tillämpas." -#: builtin/am.c:2250 +#: builtin/am.c:2248 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2252 +#: builtin/am.c:2250 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491 -#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489 -#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412 +#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 +#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 +#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454 +#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2258 +#: builtin/am.c:2256 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2276 +#: builtin/am.c:2274 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." @@ -8784,16 +8954,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:2283 +#: builtin/am.c:2281 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2298 +#: builtin/am.c:2296 #, 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:2322 +#: builtin/am.c:2320 #, c-format msgid "" "Stray %s directory found.\n" @@ -8802,10 +8972,14 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2328 +#: builtin/am.c:2326 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." +#: builtin/am.c:2336 +msgid "interactive mode requires patches on the command line" +msgstr "interaktivt läge kräver patchar på kommandoraden" + #: builtin/apply.c:8 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<flaggor>] [<patch>...]" @@ -9026,7 +9200,7 @@ msgstr "felaktigt HEAD - Jag behöver ett HEAD" #: builtin/bisect--helper.c:526 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." -msgstr "misslyckades checka ut ”%s”. Försök ”git bisect reset <giltig_gren>”." +msgstr "misslyckades checka ut \"%s\". Försök \"git bisect reset <giltig_gren>\"." # cogito-relaterat #: builtin/bisect--helper.c:547 @@ -9037,79 +9211,84 @@ msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts" msgid "bad HEAD - strange symbolic ref" msgstr "felaktigt HEAD - konstig symbolisk referens" -#: builtin/bisect--helper.c:627 +#: builtin/bisect--helper.c:574 +#, c-format +msgid "invalid ref: '%s'" +msgstr "ogiltig referens: \"%s\"" + +#: builtin/bisect--helper.c:630 msgid "perform 'git bisect next'" msgstr "utför 'git bisect next'" -#: builtin/bisect--helper.c:629 +#: builtin/bisect--helper.c:632 msgid "write the terms to .git/BISECT_TERMS" msgstr "skriv termerna i .git/BISECT_TERMS" -#: builtin/bisect--helper.c:631 +#: builtin/bisect--helper.c:634 msgid "cleanup the bisection state" msgstr "städar upp bisect-tillstånd" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:636 msgid "check for expected revs" msgstr "kontrollera för förväntade versioner" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:638 msgid "reset the bisection state" msgstr "återställ bisect-tillstånd" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:640 msgid "write out the bisection state in BISECT_LOG" msgstr "skriver bisect-tillståndet i BISECT_LOG" -#: builtin/bisect--helper.c:639 +#: builtin/bisect--helper.c:642 msgid "check and set terms in a bisection state" msgstr "visa och ange termer för bisect-tillstånd" -#: builtin/bisect--helper.c:641 +#: builtin/bisect--helper.c:644 msgid "check whether bad or good terms exist" msgstr "se efter om termer för rätt och fel finns" -#: builtin/bisect--helper.c:643 +#: builtin/bisect--helper.c:646 msgid "print out the bisect terms" msgstr "skriv ut termer för bisect" -#: builtin/bisect--helper.c:645 +#: builtin/bisect--helper.c:648 msgid "start the bisect session" msgstr "påbörja bisect-körningen" -#: builtin/bisect--helper.c:647 +#: builtin/bisect--helper.c:650 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning" -#: builtin/bisect--helper.c:649 +#: builtin/bisect--helper.c:652 msgid "no log for BISECT_WRITE" msgstr "ingen logg för BISECT_WRITE" -#: builtin/bisect--helper.c:666 +#: builtin/bisect--helper.c:669 msgid "--write-terms requires two arguments" msgstr "--write-terms kräver två argument" -#: builtin/bisect--helper.c:670 +#: builtin/bisect--helper.c:673 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state tar inga argument" -#: builtin/bisect--helper.c:677 +#: builtin/bisect--helper.c:680 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset kräver antingen inget argument eller en incheckning" -#: builtin/bisect--helper.c:681 +#: builtin/bisect--helper.c:684 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write kräver antingen 4 eller 5 argument" -#: builtin/bisect--helper.c:687 +#: builtin/bisect--helper.c:690 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms kräver tre argument" -#: builtin/bisect--helper.c:693 +#: builtin/bisect--helper.c:696 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check kräver 2 eller 3 argument" -#: builtin/bisect--helper.c:699 +#: builtin/bisect--helper.c:702 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms kräver noll eller ett argument" @@ -9121,133 +9300,150 @@ msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" -#: builtin/blame.c:407 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "förväntade en färg: %s" -#: builtin/blame.c:414 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "måste sluta med en färg" -#: builtin/blame.c:701 +#: builtin/blame.c:730 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "felaktig färg \"%s\" i color.blame.repeatedLines" -#: builtin/blame.c:719 +#: builtin/blame.c:748 msgid "invalid value for blame.coloring" msgstr "ogiltigt värde för blame.coloring" -#: builtin/blame.c:794 +#: builtin/blame.c:823 +#, c-format +msgid "cannot find revision %s to ignore" +msgstr "kan inte hitta revision %s att ignorera" + +#: builtin/blame.c:845 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:795 +#: builtin/blame.c:846 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" -#: builtin/blame.c:796 +#: builtin/blame.c:847 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:797 +#: builtin/blame.c:848 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:798 +#: builtin/blame.c:849 msgid "Force progress reporting" msgstr "Tvinga förloppsrapportering" -#: builtin/blame.c:799 +#: builtin/blame.c:850 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:800 +#: builtin/blame.c:851 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:801 +#: builtin/blame.c:852 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:802 +#: builtin/blame.c:853 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:803 +#: builtin/blame.c:854 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:804 +#: builtin/blame.c:855 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Använd samma utdataläge som git-annotate (Standard: av)" -#: builtin/blame.c:805 +#: builtin/blame.c:856 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:806 +#: builtin/blame.c:857 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:807 +#: builtin/blame.c:858 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:808 +#: builtin/blame.c:859 msgid "Show author email instead of name (Default: off)" msgstr "Visa författarens e-post istället för namn (Standard: av)" -#: builtin/blame.c:809 +#: builtin/blame.c:860 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:810 +#: builtin/blame.c:861 builtin/log.c:1646 +msgid "rev" +msgstr "rev" + +#: builtin/blame.c:861 +msgid "Ignore <rev> when blaming" +msgstr "ignorera <rev> vid klandren" + +#: builtin/blame.c:862 +msgid "Ignore revisions from <file>" +msgstr "ignorera revisioner från <fil>" + +#: builtin/blame.c:863 msgid "color redundant metadata from previous line differently" msgstr "färglägg redundant metadata från tidigare rader annorlunda" -#: builtin/blame.c:811 +#: builtin/blame.c:864 msgid "color lines by age" msgstr "färglägg rader efter ålder" -#: builtin/blame.c:818 +#: builtin/blame.c:871 msgid "Use an experimental heuristic to improve diffs" msgstr "Använd en experimentell algoritm för att förbättra diffar" -#: builtin/blame.c:820 +#: builtin/blame.c:873 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:821 +#: builtin/blame.c:874 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list" -#: builtin/blame.c:822 +#: builtin/blame.c:875 msgid "Use <file>'s contents as the final image" msgstr "Använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:823 builtin/blame.c:824 +#: builtin/blame.c:876 builtin/blame.c:877 msgid "score" msgstr "poäng" -#: builtin/blame.c:823 +#: builtin/blame.c:876 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:824 +#: builtin/blame.c:877 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:825 +#: builtin/blame.c:878 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:825 +#: builtin/blame.c:878 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med början på 1" -#: builtin/blame.c:876 +#: builtin/blame.c:929 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress kan inte användas med --incremental eller porslinsformat" @@ -9259,18 +9455,18 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:927 +#: builtin/blame.c:980 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" -#: builtin/blame.c:1031 +#: builtin/blame.c:1087 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "filen %s har bara %lu rad" msgstr[1] "filen %s har bara %lu rader" -#: builtin/blame.c:1077 +#: builtin/blame.c:1133 msgid "Blaming lines" msgstr "Klandra rader" @@ -9302,7 +9498,7 @@ msgstr "git branch [<flaggor>] [-r | -a] [--points-at]" msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<flaggor>] [-r | -a] [--format]" -#: builtin/branch.c:151 +#: builtin/branch.c:154 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -9311,7 +9507,7 @@ msgstr "" "tar bort grenen \"%s\" som har slagits ihop med\n" " \"%s\", men ännu inte slagits ihop med HEAD." -#: builtin/branch.c:155 +#: builtin/branch.c:158 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -9320,12 +9516,12 @@ msgstr "" "tar inte bort grenen \"%s\" som inte har slagits ihop med\n" " \"%s\", trots att den har slagits ihop med HEAD." -#: builtin/branch.c:169 +#: builtin/branch.c:172 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" -#: builtin/branch.c:173 +#: builtin/branch.c:176 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -9334,122 +9530,122 @@ msgstr "" "Grenen \"%s\" har inte slagits samman i sin helhet.\n" "Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"." -#: builtin/branch.c:186 +#: builtin/branch.c:189 msgid "Update of config-file failed" msgstr "Misslyckades uppdatera konfigurationsfil" -#: builtin/branch.c:217 +#: builtin/branch.c:220 msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -#: builtin/branch.c:223 +#: builtin/branch.c:226 msgid "Couldn't look up commit object for HEAD" msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" -#: builtin/branch.c:237 +#: builtin/branch.c:240 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\"" -#: builtin/branch.c:252 +#: builtin/branch.c:255 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "fjärrspårande grenen \"%s\" hittades inte." -#: builtin/branch.c:253 +#: builtin/branch.c:256 #, c-format msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." -#: builtin/branch.c:268 +#: builtin/branch.c:271 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\"" -#: builtin/branch.c:269 +#: builtin/branch.c:272 #, c-format msgid "Error deleting branch '%s'" msgstr "Fel vid borttagning av grenen \"%s\"" -#: builtin/branch.c:276 +#: builtin/branch.c:279 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Tog bort fjärrspårande grenen %s (var %s).\n" -#: builtin/branch.c:277 +#: builtin/branch.c:280 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:421 builtin/tag.c:60 +#: builtin/branch.c:429 builtin/tag.c:61 msgid "unable to parse format string" msgstr "kan inte tolka formatsträng" -#: builtin/branch.c:452 +#: builtin/branch.c:460 msgid "could not resolve HEAD" msgstr "kunde inte slå upp HEAD" -#: builtin/branch.c:458 +#: builtin/branch.c:466 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) pekar utenför refs/heads/" -#: builtin/branch.c:473 +#: builtin/branch.c:481 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Grenen %s ombaseras på %s" -#: builtin/branch.c:477 +#: builtin/branch.c:485 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" på %s" -#: builtin/branch.c:494 +#: builtin/branch.c:502 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:496 +#: builtin/branch.c:504 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:507 +#: builtin/branch.c:515 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:534 +#: builtin/branch.c:542 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:536 +#: builtin/branch.c:544 msgid "Branch copy failed" msgstr "Misslyckades kopiera gren" -#: builtin/branch.c:540 +#: builtin/branch.c:548 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Skapade kopia av felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:543 +#: builtin/branch.c:551 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:549 +#: builtin/branch.c:557 #, 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:558 +#: builtin/branch.c:566 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:560 +#: builtin/branch.c:568 msgid "Branch is copied, but update of config-file failed" msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:576 +#: builtin/branch.c:584 #, c-format msgid "" "Please edit the description for the branch\n" @@ -9460,217 +9656,219 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/branch.c:610 +#: builtin/branch.c:618 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:612 +#: builtin/branch.c:620 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:613 +#: builtin/branch.c:621 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:614 +#: builtin/branch.c:622 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:616 +#: builtin/branch.c:624 msgid "do not use" msgstr "använd ej" -#: builtin/branch.c:618 builtin/rebase.c:485 +#: builtin/branch.c:626 builtin/rebase.c:485 msgid "upstream" msgstr "uppströms" -#: builtin/branch.c:618 +#: builtin/branch.c:626 msgid "change the upstream info" msgstr "ändra uppströmsinformationen" -#: builtin/branch.c:619 +#: builtin/branch.c:627 msgid "Unset the upstream info" msgstr "Ta bort uppströmsinformationen" -#: builtin/branch.c:620 +#: builtin/branch.c:628 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:621 +#: builtin/branch.c:629 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:623 builtin/branch.c:625 +#: builtin/branch.c:631 builtin/branch.c:633 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:624 builtin/branch.c:626 +#: builtin/branch.c:632 builtin/branch.c:634 msgid "print only branches that don't contain the commit" msgstr "visa endast grenar som inte innehåller incheckningen" -#: builtin/branch.c:629 +#: builtin/branch.c:637 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:630 +#: builtin/branch.c:638 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:632 +#: builtin/branch.c:640 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:633 +#: builtin/branch.c:641 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:634 +#: builtin/branch.c:642 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:635 +#: builtin/branch.c:643 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:636 +#: builtin/branch.c:644 msgid "copy a branch and its reflog" msgstr "kopiera en gren och dess reflogg" -#: builtin/branch.c:637 +#: builtin/branch.c:645 msgid "copy a branch, even if target exists" msgstr "kopiera en gren, även om målet finns" -#: builtin/branch.c:638 +#: builtin/branch.c:646 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:639 +#: builtin/branch.c:647 msgid "show current branch name" msgstr "visa namn på aktuell gren" -#: builtin/branch.c:640 +#: builtin/branch.c:648 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:642 +#: builtin/branch.c:650 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:643 +#: builtin/branch.c:651 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:644 +#: builtin/branch.c:652 msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:645 +#: builtin/branch.c:653 msgid "print only branches that are not merged" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:646 +#: builtin/branch.c:654 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:427 +#: builtin/tag.c:433 msgid "object" msgstr "objekt" -#: builtin/branch.c:650 +#: builtin/branch.c:658 msgid "print only branches of the object" msgstr "visa endast grenar för objektet" -#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434 +#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 msgid "sorting and filtering are case insensitive" msgstr "sortering och filtrering skiljer gemener och VERSALER" -#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432 +#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/branch.c:676 builtin/clone.c:751 +#: builtin/branch.c:684 builtin/clone.c:761 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:700 +#: builtin/branch.c:708 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778 +#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:745 +#: builtin/branch.c:753 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:750 +#: builtin/branch.c:758 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:757 +#: builtin/branch.c:765 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu." -#: builtin/branch.c:760 +#: builtin/branch.c:768 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:775 +#: builtin/branch.c:783 msgid "too many branches for a copy operation" msgstr "för många grenar för kopiering" -#: builtin/branch.c:784 +#: builtin/branch.c:792 msgid "too many arguments for a rename operation" msgstr "för många flaggor för namnbyte" -#: builtin/branch.c:789 +#: builtin/branch.c:797 msgid "too many arguments to set new upstream" msgstr "för många flaggor för att byta uppström" -#: builtin/branch.c:793 +#: builtin/branch.c:801 #, 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:796 builtin/branch.c:819 +#: builtin/branch.c:804 builtin/branch.c:827 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:800 +#: builtin/branch.c:808 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:813 +#: builtin/branch.c:821 msgid "too many arguments to unset upstream" msgstr "för många flaggor för att ta bort uppström" -#: builtin/branch.c:817 +#: builtin/branch.c:825 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren." -#: builtin/branch.c:823 +#: builtin/branch.c:831 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:833 -msgid "-a and -r options to 'git branch' do not make sense with a branch name" +#: builtin/branch.c:841 +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>?" msgstr "" -"flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett " -"grennamn" +"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:836 +#: builtin/branch.c:845 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -9691,7 +9889,7 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/cat-file.c:593 +#: builtin/cat-file.c:594 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -9699,7 +9897,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>" -#: builtin/cat-file.c:594 +#: builtin/cat-file.c:595 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -9707,72 +9905,72 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:615 +#: builtin/cat-file.c:616 msgid "only one batch option may be specified" msgstr "endast en buntflagga kan anges" -#: builtin/cat-file.c:633 +#: builtin/cat-file.c:634 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<typ> kan vara en av: blob, tree, commit, tag" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:635 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:636 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:638 msgid "exit with zero when there's no error" msgstr "avsluta med noll när det inte uppstått något fel" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:639 msgid "pretty-print object's content" msgstr "visa objektets innehåll snyggt" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:641 msgid "for blob objects, run textconv on object's content" msgstr "för blob-objekt, kör filter på objektets innehåll" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:643 msgid "for blob objects, run filters on object's content" msgstr "för blob-objekt, kör filger på objektets innehåll" -#: builtin/cat-file.c:643 git-submodule.sh:936 +#: builtin/cat-file.c:644 git-submodule.sh:936 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:645 msgid "use a specific path for --textconv/--filters" msgstr "använd specifik sökväg för --textconv/--filters" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:647 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:648 msgid "buffer --batch output" msgstr "buffra utdata från --batch" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:650 msgid "show info and content of objects fed from the standard input" msgstr "visa information och innehåll för objekt som listas på standard in" -#: builtin/cat-file.c:653 +#: builtin/cat-file.c:654 msgid "show info about objects fed from the standard input" msgstr "visa information för objekt som listas på standard in" -#: builtin/cat-file.c:657 +#: builtin/cat-file.c:658 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "följ symboliska länkar i trädet (använd med --batch eller --batch-check)" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:660 msgid "show all objects with --batch or --batch-check" msgstr "visa alla objekt med --batch eller --batch-check" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:662 msgid "do not order --batch-all-objects output" msgstr "ordna inte --batch-all-objects output" @@ -9800,8 +9998,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:1355 builtin/gc.c:538 -#: builtin/worktree.c:499 +#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 +#: builtin/worktree.c:507 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -9891,9 +10089,9 @@ msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375 -#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856 -#: builtin/worktree.c:672 +#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 +#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 +#: builtin/worktree.c:680 msgid "string" msgstr "sträng" @@ -9905,91 +10103,114 @@ msgstr "när filer skapas, lägg till <sträng> först" msgid "copy out the files from named stage" msgstr "kopiera ut filer från namngiven etapp" -#: builtin/checkout.c:32 +#: builtin/checkout.c:31 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<flaggor>] <gren>" -#: builtin/checkout.c:33 +#: builtin/checkout.c:32 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..." -#: builtin/checkout.c:151 builtin/checkout.c:190 +#: builtin/checkout.c:37 +msgid "git switch [<options>] [<branch>]" +msgstr "git switch [<flaggor>] [<gren>]" + +#: builtin/checkout.c:42 +msgid "git restore [<options>] [--source=<branch>] <file>..." +msgstr "git restore [<flaggor>] [--source=<gren>] <fil>..." + +#: builtin/checkout.c:172 builtin/checkout.c:211 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:153 builtin/checkout.c:192 +#: builtin/checkout.c:174 builtin/checkout.c:213 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:169 +#: builtin/checkout.c:190 #, 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:219 +#: builtin/checkout.c:240 #, 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:237 +#: builtin/checkout.c:258 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:253 +#: builtin/checkout.c:274 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337 -#: builtin/checkout.c:340 +#: builtin/checkout.c:374 +#, 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:379 +#, 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:386 +#, 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:409 builtin/checkout.c:412 builtin/checkout.c:415 +#: builtin/checkout.c:419 #, 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:343 builtin/checkout.c:346 +#: builtin/checkout.c:422 builtin/checkout.c:425 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:349 +#: builtin/checkout.c:429 #, 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:396 builtin/checkout.c:403 +#: builtin/checkout.c:433 #, c-format -msgid "path '%s' is unmerged" -msgstr "sökvägen \"%s\" har inte slagits ihop" +msgid "neither '%s' or '%s' is specified" +msgstr "varken \"%s\" eller \"%s\" har angivits" -#: builtin/checkout.c:442 +#: builtin/checkout.c:437 #, c-format -msgid "Recreated %d merge conflict" -msgid_plural "Recreated %d merge conflicts" -msgstr[0] "Återskapade %d sammanslagningskonflikt" -msgstr[1] "Återskapade %d sammanslagningskonflikter" +msgid "'%s' must be used when '%s' is not specified" +msgstr "\"%s\" måste användas när \"%s\" inte anges" -#: builtin/checkout.c:447 +#: builtin/checkout.c:442 builtin/checkout.c:447 #, c-format -msgid "Updated %d path from %s" -msgid_plural "Updated %d paths from %s" -msgstr[0] "Uppdaterade %d sökväg från %s" -msgstr[1] "Uppdaterade %d sökvägar från %s" +msgid "'%s' or '%s' cannot be used with %s" +msgstr "\"%s\" eller \"%s\" kan inte användas med %s" -#: builtin/checkout.c:454 +#: builtin/checkout.c:506 builtin/checkout.c:513 #, 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" +msgid "path '%s' is unmerged" +msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:695 +#: builtin/checkout.c:679 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:744 +#: builtin/checkout.c:729 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -9998,55 +10219,55 @@ msgstr "" "kan inte fortsätta med köade ändringar i följande filer:\n" "%s" -#: builtin/checkout.c:751 +#: builtin/checkout.c:736 #, c-format msgid "staged changes in the following files may be lost: %s" msgstr "köade ändringar i följande filer kan gå förlorade: %s" -#: builtin/checkout.c:848 +#: builtin/checkout.c:833 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:875 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:894 builtin/clone.c:704 +#: builtin/checkout.c:879 builtin/clone.c:714 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:898 +#: builtin/checkout.c:883 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:901 +#: builtin/checkout.c:886 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:905 +#: builtin/checkout.c:890 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:907 builtin/checkout.c:1283 +#: builtin/checkout.c:892 builtin/checkout.c:1289 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:909 +#: builtin/checkout.c:894 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:960 +#: builtin/checkout.c:945 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:966 +#: builtin/checkout.c:951 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10069,7 +10290,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:985 +#: builtin/checkout.c:970 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10096,24 +10317,28 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:1017 +#: builtin/checkout.c:1005 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:1021 +#: builtin/checkout.c:1009 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:1052 builtin/checkout.c:1278 +#: builtin/checkout.c:1049 builtin/checkout.c:1284 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:1173 +#: builtin/checkout.c:1176 +msgid "only one reference expected" +msgstr "endast en referens förväntades" + +#: builtin/checkout.c:1193 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1209 +#: builtin/checkout.c:1230 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -10122,152 +10347,208 @@ msgstr "" "\"%s\" kan vara både en lokal fil och en spårande gren.\n" "Använd -- (och möjligen --no-guess) för att göra otvetydig" -#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448 +#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1256 builtin/checkout.c:1618 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1292 +#: builtin/checkout.c:1303 +#, c-format +msgid "a branch is expected, got tag '%s'" +msgstr "förväntade gren, fick taggen \"%s\"" + +#: builtin/checkout.c:1305 +#, c-format +msgid "a branch is expected, got remote branch '%s'" +msgstr "förväntade gren, fick fjärrgrenen \"%s\"" + +#: builtin/checkout.c:1306 builtin/checkout.c:1314 +#, c-format +msgid "a branch is expected, got '%s'" +msgstr "förväntade gren, fick \"%s\"" + +#: builtin/checkout.c:1309 +#, c-format +msgid "a branch is expected, got commit '%s'" +msgstr "förväntade gren, fick incheckningen \"%s\"" + +#: builtin/checkout.c:1325 +msgid "" +"cannot switch branch while merging\n" +"Consider \"git merge --quit\" or \"git worktree add\"." +msgstr "" +"kan inte växla gren vid sammanslagning\n" +"Överväg \"git merge --quit\" eller \"git worktree add\"." + +#: builtin/checkout.c:1329 +msgid "" +"cannot switch branch in the middle of an am session\n" +"Consider \"git am --quit\" or \"git worktree add\"." +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:1333 +msgid "" +"cannot switch branch while rebasing\n" +"Consider \"git rebase --quit\" or \"git worktree add\"." +msgstr "" +"kan inte växla gren vid ombasering\n" +"Överväg \"git rebase --quit\" eller \"git worktree add\"." + +#: builtin/checkout.c:1337 +msgid "" +"cannot switch branch while cherry-picking\n" +"Consider \"git cherry-pick --quit\" or \"git worktree add\"." +msgstr "" +"kan inte växla gren i en \"cherry-pick\"\n" +"Överväg \"git cherry-pick --quit\" eller \"git worktree add\"." + +#: builtin/checkout.c:1341 +msgid "" +"cannot switch branch while reverting\n" +"Consider \"git revert --quit\" or \"git worktree add\"." +msgstr "" +"kan inte växla gren i en \"revert\"\n" +"Överväg \"git revert --quit\" eller \"git worktree add\"." + +#: builtin/checkout.c:1345 +msgid "you are switching branch while bisecting" +msgstr "då växlar grenar medan du gör en \"bisect\"" + +#: builtin/checkout.c:1352 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303 +#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315 -#: builtin/checkout.c:1318 +#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 +#: builtin/checkout.c:1378 builtin/checkout.c:1383 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1323 +#: builtin/checkout.c:1380 +#, c-format +msgid "'%s' cannot take <start-point>" +msgstr "\"%s\" kan inte ta <startpunkt>" + +#: builtin/checkout.c:1388 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:121 -#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492 -#: builtin/worktree.c:494 -msgid "branch" -msgstr "gren" +#: builtin/checkout.c:1395 +msgid "missing branch or commit argument" +msgstr "saknar gren- eller incheckingsargument" -#: builtin/checkout.c:1357 -msgid "create and checkout a new branch" -msgstr "skapa och checka ut en ny gren" +#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 +#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 +#: builtin/send-pack.c:174 +msgid "force progress reporting" +msgstr "tvinga förloppsrapportering" -#: builtin/checkout.c:1359 -msgid "create/reset and checkout a branch" -msgstr "skapa/nollställ och checka ut en gren" +#: builtin/checkout.c:1438 +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:1360 -msgid "create reflog for new branch" -msgstr "skapa reflogg för ny gren" +#: builtin/checkout.c:1439 builtin/log.c:1634 parse-options.h:318 +msgid "style" +msgstr "stil" -#: builtin/checkout.c:1361 builtin/worktree.c:496 +#: builtin/checkout.c:1440 +msgid "conflict style (merge or diff3)" +msgstr "konfliktstil (merge eller diff3)" + +#: builtin/checkout.c:1452 builtin/worktree.c:504 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1362 +#: builtin/checkout.c:1453 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1455 +msgid "force checkout (throw away local modifications)" +msgstr "tvinga utcheckning (kasta bort lokala ändringar)" + +#: builtin/checkout.c:1457 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1457 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1366 -msgid "checkout our version for unmerged files" -msgstr "checka ut vår version för ej sammanslagna filer" - -#: builtin/checkout.c:1369 -msgid "checkout their version for unmerged files" -msgstr "checka ut deras version för ej sammanslagna filer" - -#: builtin/checkout.c:1371 -msgid "force checkout (throw away local modifications)" -msgstr "tvinga utcheckning (kasta bort lokala ändringar)" - -#: builtin/checkout.c:1373 -msgid "perform a 3-way merge with the new branch" -msgstr "utför en 3-vägssammanslagning för den nya grenen" - -#: builtin/checkout.c:1375 builtin/merge.c:284 +#: builtin/checkout.c:1459 builtin/merge.c:288 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:309 -msgid "style" -msgstr "stil" - -#: builtin/checkout.c:1378 -msgid "conflict style (merge or diff3)" -msgstr "konfliktstil (merge eller diff3)" - -#: builtin/checkout.c:1381 -msgid "do not limit pathspecs to sparse entries only" -msgstr "begränsa inte sökvägar till endast glesa poster" - -#: builtin/checkout.c:1383 -msgid "do not second guess 'git checkout <no-such-branch>'" -msgstr "försök inte vara förutspå \"git checkout <gren-saknas>\"" - -#: builtin/checkout.c:1385 +#: builtin/checkout.c:1462 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:1389 builtin/clone.c:88 builtin/fetch.c:141 -#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575 -#: builtin/send-pack.c:174 -msgid "force progress reporting" -msgstr "tvinga förloppsrapportering" +#: builtin/checkout.c:1475 +msgid "checkout our version for unmerged files" +msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1390 -msgid "use overlay mode (default)" -msgstr "använd överläggsläge (standard)" +#: builtin/checkout.c:1478 +msgid "checkout their version for unmerged files" +msgstr "checka ut deras version för ej sammanslagna filer" + +#: builtin/checkout.c:1482 +msgid "do not limit pathspecs to sparse entries only" +msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1422 +#: builtin/checkout.c:1533 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1425 +#: builtin/checkout.c:1536 msgid "-p and --overlay are mutually exclusive" msgstr "-p och --overlay är ömsesidigt uteslutande" -#: builtin/checkout.c:1442 +#: builtin/checkout.c:1573 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1447 +#: builtin/checkout.c:1578 msgid "missing branch name; try -b" msgstr "grennamn saknas; försök med -b" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1611 +#, c-format +msgid "could not resolve %s" +msgstr "kunde inte upplösa %s" + +#: builtin/checkout.c:1623 +msgid "you must specify path(s) to restore" +msgstr "du måste ange katalog(er) att återställa" + +#: builtin/checkout.c:1631 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1491 +#: builtin/checkout.c:1638 #, 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" +msgstr "\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den" -#: builtin/checkout.c:1495 +#: builtin/checkout.c:1642 #, 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:1499 +#: builtin/checkout.c:1646 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -10275,7 +10556,7 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/checkout.c:1519 +#: builtin/checkout.c:1666 #, c-format msgid "" "'%s' matched more than one remote tracking branch.\n" @@ -10304,6 +10585,68 @@ 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:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 +#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 +msgid "branch" +msgstr "gren" + +#: builtin/checkout.c:1692 +msgid "create and checkout a new branch" +msgstr "skapa och checka ut en ny gren" + +#: builtin/checkout.c:1694 +msgid "create/reset and checkout a branch" +msgstr "skapa/nollställ och checka ut en gren" + +#: builtin/checkout.c:1695 +msgid "create reflog for new branch" +msgstr "skapa reflogg för ny gren" + +#: builtin/checkout.c:1697 +msgid "second guess 'git checkout <no-such-branch>' (default)" +msgstr "förutspå \"git checkout <gren-saknas>\" (förval)" + +#: builtin/checkout.c:1698 +msgid "use overlay mode (default)" +msgstr "använd överläggsläge (standard)" + +#: builtin/checkout.c:1734 +msgid "create and switch to a new branch" +msgstr "skapa och växla till en ny gren" + +#: builtin/checkout.c:1736 +msgid "create/reset and switch to a branch" +msgstr "skapa/nollställ och växla till en gren" + +#: builtin/checkout.c:1738 +msgid "second guess 'git switch <no-such-branch>'" +msgstr "förutspå \"git checkout <gren-saknas>\"" + +#: builtin/checkout.c:1740 +msgid "throw away local modifications" +msgstr "kasta bort lokala ändringar" + +#: builtin/checkout.c:1772 +msgid "where the checkout from" +msgstr "källa till utcheckning" + +#: builtin/checkout.c:1774 +msgid "restore the index" +msgstr "återställ indexet" + +#: builtin/checkout.c:1776 +msgid "restore the working tree (default)" +msgstr "återställ arbetskatalogen (förval)" + +#: builtin/checkout.c:1778 +msgid "ignore unmerged entries" +msgstr "ignorera ej sammanslagna poster" + +#: builtin/checkout.c:1779 +msgid "use overlay mode" +msgstr "använd överläggsläge" + #: builtin/clean.c:28 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." @@ -10336,7 +10679,12 @@ msgstr "Skulle hoppa över arkivet %s\n" msgid "failed to remove %s" msgstr "misslyckades ta bort %s" -#: builtin/clean.c:299 git-add--interactive.perl:579 +#: builtin/clean.c:37 +#, c-format +msgid "could not lstat %s\n" +msgstr "kunde inte ta status (\"lstat\") på %s\n" + +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -10349,7 +10697,7 @@ msgstr "" "foo - markera post baserad på unikt prefix\n" " - (tomt) markera ingenting\n" -#: builtin/clean.c:303 git-add--interactive.perl:588 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -10370,38 +10718,38 @@ msgstr "" "* - välj alla poster\n" " - (tomt) avsluta markering\n" -#: builtin/clean.c:519 git-add--interactive.perl:554 -#: git-add--interactive.perl:559 +#: builtin/clean.c:520 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Vadå (%s)?\n" -#: builtin/clean.c:661 +#: builtin/clean.c:662 #, c-format msgid "Input ignore patterns>> " msgstr "Ange ignoreringsmönster>>" -#: builtin/clean.c:698 +#: builtin/clean.c:699 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "VARNING: Hittar inte poster som motsvarar: %s" -#: builtin/clean.c:719 +#: builtin/clean.c:720 msgid "Select items to delete" msgstr "Välj poster att ta bort" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:760 +#: builtin/clean.c:761 #, c-format msgid "Remove %s [y/N]? " msgstr "Ta bort %s [Y=ja / N=nej]? " -#: builtin/clean.c:785 git-add--interactive.perl:1717 +#: builtin/clean.c:786 git-add--interactive.perl:1763 #, c-format msgid "Bye.\n" msgstr "Hej då.\n" -#: builtin/clean.c:793 +#: builtin/clean.c:794 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -10419,64 +10767,64 @@ msgstr "" "help - denna skärm\n" "? - hjälp för kommandoval" -#: builtin/clean.c:820 git-add--interactive.perl:1793 +#: builtin/clean.c:821 git-add--interactive.perl:1849 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: builtin/clean.c:821 git-add--interactive.perl:1790 +#: builtin/clean.c:822 git-add--interactive.perl:1846 msgid "What now" msgstr "Vad nu" -#: builtin/clean.c:829 +#: builtin/clean.c:830 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Skulle ta bort följande post:" msgstr[1] "Skulle ta bort följande poster:" -#: builtin/clean.c:845 +#: builtin/clean.c:846 msgid "No more files to clean, exiting." msgstr "Inga fler filer att städa, avslutar." -#: builtin/clean.c:907 +#: builtin/clean.c:908 msgid "do not print names of files removed" msgstr "skriv inte ut namn på borttagna filer" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "force" msgstr "tvinga" -#: builtin/clean.c:910 +#: builtin/clean.c:911 msgid "interactive cleaning" msgstr "städa interaktivt" -#: builtin/clean.c:912 +#: builtin/clean.c:913 msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548 -#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173 -#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 -#: builtin/show-ref.c:178 +#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 +#: builtin/grep.c:899 builtin/log.c:186 builtin/log.c:188 +#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 +#: builtin/show-ref.c:179 msgid "pattern" msgstr "mönster" -#: builtin/clean.c:914 +#: builtin/clean.c:915 msgid "add <pattern> to ignore rules" msgstr "lägg till <mönster> till ignoreringsregler" -#: builtin/clean.c:915 +#: builtin/clean.c:916 msgid "remove ignored files, too" msgstr "ta även bort ignorerade filer" -#: builtin/clean.c:917 +#: builtin/clean.c:918 msgid "remove only ignored files" msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:935 +#: builtin/clean.c:936 msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" -#: builtin/clean.c:939 +#: builtin/clean.c:940 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -10484,7 +10832,7 @@ msgstr "" "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar " "städa" -#: builtin/clean.c:942 +#: builtin/clean.c:943 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -10492,39 +10840,39 @@ msgstr "" "clean.requireForce har standardvärdet true och varken -i, -n eller -f " "angavs; vägrar städa" -#: builtin/clone.c:44 +#: builtin/clone.c:46 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:90 +#: builtin/clone.c:93 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:95 +#: builtin/clone.c:98 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:97 +#: builtin/clone.c:100 msgid "to clone from a local repository" msgstr "för att klona från ett lokalt arkiv" -#: builtin/clone.c:99 +#: builtin/clone.c:102 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hårda länkar, kopiera alltid" -#: builtin/clone.c:101 +#: builtin/clone.c:104 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:103 builtin/clone.c:107 +#: builtin/clone.c:107 msgid "pathspec" msgstr "sökvägsangivelse" -#: builtin/clone.c:103 builtin/clone.c:107 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" @@ -10540,18 +10888,18 @@ msgstr "mallkatalog" msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1379 -#: builtin/submodule--helper.c:1859 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:1860 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:118 builtin/submodule--helper.c:1381 -#: builtin/submodule--helper.c:1861 +#: builtin/clone.c:118 builtin/submodule--helper.c:1382 +#: builtin/submodule--helper.c:1862 msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3306 builtin/repack.c:329 +#: builtin/pack-objects.c:3308 builtin/repack.c:330 msgid "name" msgstr "namn" @@ -10567,8 +10915,8 @@ msgstr "checka ut <gren> istället för fjärrens HEAD" msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:125 builtin/fetch.c:142 builtin/grep.c:836 -#: builtin/pull.c:225 +#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 +#: builtin/pull.c:226 msgid "depth" msgstr "djup" @@ -10576,7 +10924,7 @@ msgstr "djup" msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:127 builtin/fetch.c:144 builtin/pack-objects.c:3295 +#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3297 msgid "time" msgstr "tid" @@ -10584,12 +10932,12 @@ msgstr "tid" msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon från en angiven tidpunkt" -#: builtin/clone.c:129 builtin/fetch.c:146 builtin/fetch.c:169 -#: builtin/rebase.c:1389 +#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 +#: builtin/rebase.c:1395 msgid "revision" msgstr "revision" -#: builtin/clone.c:130 builtin/fetch.c:147 +#: builtin/clone.c:130 builtin/fetch.c:157 msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" @@ -10621,29 +10969,33 @@ msgstr "nyckel=värde" msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:142 builtin/fetch.c:164 builtin/ls-remote.c:76 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 #: builtin/push.c:585 builtin/send-pack.c:172 msgid "server-specific" msgstr "serverspecifik" -#: builtin/clone.c:142 builtin/fetch.c:164 builtin/ls-remote.c:76 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 #: builtin/push.c:585 builtin/send-pack.c:173 msgid "option to transmit" msgstr "" "inget att checka in\n" "flagga att sända" -#: builtin/clone.c:143 builtin/fetch.c:165 builtin/pull.c:238 +#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 #: builtin/push.c:586 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:145 builtin/fetch.c:167 builtin/pull.c:241 +#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 #: builtin/push.c:588 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" -#: builtin/clone.c:283 +#: builtin/clone.c:149 +msgid "any cloned submodules will use their remote-tracking branch" +msgstr "klonade undermoduler kommer använda sin fjärrspårningsgren" + +#: builtin/clone.c:285 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -10651,183 +11003,183 @@ msgstr "" "Kunde inte gissa katalognamn.\n" "Ange en katalog på kommandoraden" -#: builtin/clone.c:336 +#: builtin/clone.c:338 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n" -#: builtin/clone.c:408 -#, c-format -msgid "failed to open '%s'" -msgstr "misslyckades öppna \"%s\"" - -#: builtin/clone.c:416 +#: builtin/clone.c:411 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:430 +#: builtin/clone.c:428 #, c-format -msgid "failed to stat %s\n" -msgstr "misslyckades ta status på %s\n" +msgid "failed to start iterator over '%s'" +msgstr "misslyckades starta iterator över \"%s\"" -#: builtin/clone.c:447 +#: builtin/clone.c:453 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" -#: builtin/clone.c:452 +#: builtin/clone.c:458 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:456 +#: builtin/clone.c:462 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:482 +#: builtin/clone.c:467 +#, c-format +msgid "failed to iterate over '%s'" +msgstr "misslyckades iterera över \"%s\"" + +#: builtin/clone.c:492 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:496 +#: builtin/clone.c:506 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" -"and retry the checkout with 'git checkout -f HEAD'\n" +"and retry with 'git restore --source=HEAD :/'\n" msgstr "" "Klonen lyckades, men utcheckningen misslyckades.\n" "Du kan inspektera det som checkades ut med \"git status\"\n" -"och försöka checka ut igen med \"git checkout -f HEAD\"\n" +"och försöka med \"git restore -source=HEAD :/\"\n" -#: builtin/clone.c:573 +#: builtin/clone.c:583 #, 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:692 +#: builtin/clone.c:702 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:742 +#: builtin/clone.c:752 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:773 +#: builtin/clone.c:783 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:818 +#: builtin/clone.c:833 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:881 +#: builtin/clone.c:896 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:883 +#: builtin/clone.c:898 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:923 builtin/receive-pack.c:1952 +#: builtin/clone.c:938 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:927 +#: builtin/clone.c:942 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:940 +#: builtin/clone.c:955 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:943 +#: builtin/clone.c:958 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:956 +#: builtin/clone.c:971 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:962 builtin/fetch.c:1610 +#: builtin/clone.c:977 builtin/fetch.c:1653 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:972 +#: builtin/clone.c:987 #, 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:982 +#: builtin/clone.c:997 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:997 builtin/clone.c:1018 builtin/difftool.c:270 -#: builtin/worktree.c:296 builtin/worktree.c:328 +#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 +#: builtin/worktree.c:303 builtin/worktree.c:335 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:1002 +#: builtin/clone.c:1017 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:1022 +#: builtin/clone.c:1037 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:1024 +#: builtin/clone.c:1039 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:1048 +#: builtin/clone.c:1063 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:1109 +#: builtin/clone.c:1124 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1111 +#: builtin/clone.c:1126 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:1113 +#: builtin/clone.c:1128 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:1115 +#: builtin/clone.c:1130 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1118 +#: builtin/clone.c:1133 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1123 +#: builtin/clone.c:1138 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1200 builtin/clone.c:1208 +#: builtin/clone.c:1215 builtin/clone.c:1223 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1211 +#: builtin/clone.c:1226 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -10876,7 +11228,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:520 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:542 #, c-format msgid "not a valid object name %s" msgstr "objektnamnet är inte giltigt: %s" @@ -10904,13 +11256,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:1480 builtin/merge.c:268 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473 -#: builtin/tag.c:406 +#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 +#: builtin/tag.c:412 msgid "message" msgstr "meddelande" -#: builtin/commit-tree.c:115 builtin/commit.c:1480 +#: builtin/commit-tree.c:115 builtin/commit.c:1500 msgid "commit message" msgstr "incheckningsmeddelande" @@ -10918,8 +11270,8 @@ msgstr "incheckningsmeddelande" msgid "read commit log message from file" msgstr "läs incheckningsloggmeddelande från fil" -#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283 -#: builtin/pull.c:193 builtin/revert.c:117 +#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 +#: builtin/pull.c:194 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG-signera incheckning" @@ -10964,80 +11316,86 @@ msgstr "" "\n" #: builtin/commit.c:63 -msgid "Otherwise, please use 'git reset'\n" -msgstr "Använd annars \"git reset\"\n" +msgid "Otherwise, please use 'git cherry-pick --skip'\n" +msgstr "Använd annars \"git cherry-pick --skip\"\n" #: builtin/commit.c:66 msgid "" +"and then use:\n" +"\n" +" git cherry-pick --continue\n" +"\n" +"to resume cherry-picking the remaining commits.\n" "If you wish to skip this commit, use:\n" "\n" -" git reset\n" +" git cherry-pick --skip\n" "\n" -"Then \"git cherry-pick --continue\" will resume cherry-picking\n" -"the remaining commits.\n" msgstr "" -"Om du vill hoppa över incheckningen, använd:\n" +"och sedan:\n" +"\n" +" git cherry-pick --continue\n" "\n" -" git reset\n" +"för att fortsätta \"cherry-pick\" med resterande incheckningar.\n" +"Om du vill hoppa över den här incheckningen, använd:\n" +"\n" +" git cherry-pick --skip\n" "\n" -"\"git cherry-pick --continue\" kommer därefter att återuppta\n" -"cherry-pick för återstående incheckningar.\n" -#: builtin/commit.c:312 +#: builtin/commit.c:315 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:353 +#: builtin/commit.c:356 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:359 +#: builtin/commit.c:362 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:373 +#: builtin/commit.c:376 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporärt index" -#: builtin/commit.c:375 +#: builtin/commit.c:378 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cacheträdet" -#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469 +#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:452 +#: builtin/commit.c:455 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:454 +#: builtin/commit.c:457 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:462 +#: builtin/commit.c:465 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:481 +#: builtin/commit.c:484 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:579 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar författarhuvud" -#: builtin/commit.c:581 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:600 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:653 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -11045,38 +11403,38 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069 +#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:703 builtin/shortlog.c:319 +#: builtin/commit.c:706 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:705 +#: builtin/commit.c:708 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:709 +#: builtin/commit.c:712 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:740 builtin/commit.c:756 +#: builtin/commit.c:743 builtin/commit.c:759 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:747 +#: builtin/commit.c:750 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:807 +#: builtin/commit.c:810 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:826 +#: builtin/commit.c:829 #, c-format msgid "" "\n" @@ -11091,7 +11449,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:831 +#: builtin/commit.c:834 #, c-format msgid "" "\n" @@ -11106,7 +11464,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:844 +#: builtin/commit.c:847 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11116,7 +11474,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:852 +#: builtin/commit.c:855 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11127,144 +11485,144 @@ msgstr "" "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:869 +#: builtin/commit.c:872 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:877 +#: builtin/commit.c:880 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:884 +#: builtin/commit.c:887 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:902 +#: builtin/commit.c:905 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:969 +#: builtin/commit.c:972 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:983 builtin/tag.c:269 +#: builtin/commit.c:986 builtin/tag.c:275 #, 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:1027 +#: builtin/commit.c:1030 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare" -#: builtin/commit.c:1041 +#: builtin/commit.c:1044 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Ogiltigt ignorerat läge \"%s\"" -#: builtin/commit.c:1059 builtin/commit.c:1284 +#: builtin/commit.c:1062 builtin/commit.c:1304 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1097 +#: builtin/commit.c:1102 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1130 +#: builtin/commit.c:1146 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:1139 +#: builtin/commit.c:1155 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1142 +#: builtin/commit.c:1158 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:1144 +#: builtin/commit.c:1160 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:1147 +#: builtin/commit.c:1163 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1157 +#: builtin/commit.c:1173 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:1159 +#: builtin/commit.c:1175 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F." -#: builtin/commit.c:1167 +#: builtin/commit.c:1183 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:1184 +#: builtin/commit.c:1200 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:1186 +#: builtin/commit.c:1202 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:1192 +#: builtin/commit.c:1208 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "sökvägarna \"%s ...\" med -a ger ingen mening" -#: builtin/commit.c:1319 builtin/commit.c:1503 +#: builtin/commit.c:1339 builtin/commit.c:1523 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1321 builtin/commit.c:1505 +#: builtin/commit.c:1341 builtin/commit.c:1525 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1323 +#: builtin/commit.c:1343 msgid "show stash information" msgstr "visa information om stash" -#: builtin/commit.c:1325 builtin/commit.c:1507 +#: builtin/commit.c:1345 builtin/commit.c:1527 msgid "compute full ahead/behind values" msgstr "beräkna fullständiga före-/efter-värden" -#: builtin/commit.c:1327 +#: builtin/commit.c:1347 msgid "version" msgstr "version" -#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561 -#: builtin/worktree.c:643 +#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 +#: builtin/worktree.c:651 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1330 builtin/commit.c:1511 +#: builtin/commit.c:1350 builtin/commit.c:1531 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1333 builtin/commit.c:1514 +#: builtin/commit.c:1353 builtin/commit.c:1534 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517 -#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465 -#: parse-options.h:323 +#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 +#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 msgid "mode" msgstr "läge" -#: builtin/commit.c:1336 builtin/commit.c:1517 +#: builtin/commit.c:1356 builtin/commit.c:1537 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:1340 +#: builtin/commit.c:1360 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -11272,11 +11630,11 @@ msgstr "" "visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: " "traditional)" -#: builtin/commit.c:1342 parse-options.h:178 +#: builtin/commit.c:1362 parse-options.h:179 msgid "when" msgstr "när" -#: builtin/commit.c:1343 +#: builtin/commit.c:1363 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -11284,235 +11642,252 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1345 +#: builtin/commit.c:1365 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1346 +#: builtin/commit.c:1366 msgid "do not detect renames" msgstr "detektera inte namnändringar" -#: builtin/commit.c:1348 +#: builtin/commit.c:1368 msgid "detect renames, optionally set similarity index" msgstr "detektera namnändringar, möjligen sätt likhetsindex" -#: builtin/commit.c:1368 +#: builtin/commit.c:1388 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:1473 +#: builtin/commit.c:1493 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1474 +#: builtin/commit.c:1494 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1476 +#: builtin/commit.c:1496 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408 +#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1478 +#: builtin/commit.c:1498 msgid "author" msgstr "författare" -#: builtin/commit.c:1478 +#: builtin/commit.c:1498 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1479 builtin/gc.c:539 +#: builtin/commit.c:1499 builtin/gc.c:539 msgid "date" msgstr "datum" -#: builtin/commit.c:1479 +#: builtin/commit.c:1499 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483 -#: builtin/commit.c:1484 parse-options.h:315 ref-filter.h:92 +#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 +#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1481 +#: builtin/commit.c:1501 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1482 +#: builtin/commit.c:1502 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1483 +#: builtin/commit.c:1503 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1484 +#: builtin/commit.c:1504 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:1485 +#: builtin/commit.c:1505 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:1486 builtin/log.c:1541 builtin/merge.c:285 -#: builtin/pull.c:162 builtin/revert.c:109 +#: builtin/commit.c:1506 builtin/log.c:1581 builtin/merge.c:289 +#: builtin/pull.c:163 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1487 +#: builtin/commit.c:1507 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1488 +#: builtin/commit.c:1508 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1490 +#: builtin/commit.c:1510 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1495 +#: builtin/commit.c:1515 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1496 +#: builtin/commit.c:1516 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1497 +#: builtin/commit.c:1517 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1498 +#: builtin/commit.c:1518 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1499 +#: builtin/commit.c:1519 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1500 +#: builtin/commit.c:1520 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1501 +#: builtin/commit.c:1521 msgid "bypass pre-commit and commit-msg hooks" msgstr "förbigå pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1502 +#: builtin/commit.c:1522 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1515 +#: builtin/commit.c:1535 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1516 +#: builtin/commit.c:1536 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1521 +#: builtin/commit.c:1541 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1523 +#: builtin/commit.c:1543 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1596 +#: builtin/commit.c:1616 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1603 +#: builtin/commit.c:1623 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1622 +#: builtin/commit.c:1642 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1629 +#: builtin/commit.c:1649 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1634 +#: builtin/commit.c:1654 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1668 +#: builtin/commit.c:1688 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" -"not exceeded, and then \"git reset HEAD\" to recover." +"not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" "arkivet har uppdaterats, men kunde inte skriva filen\n" "new_index. Kontrollera att disken inte är full och\n" "att kvoten inte har överskridits, och kör sedan\n" -"\"git reset HEAD\" för att återställa." +"\"git restore --staged :/\" för att återställa." -#: builtin/commit-graph.c:10 +#: builtin/commit-graph.c:11 msgid "git commit-graph [--object-dir <objdir>]" msgstr "git commit-graph [--object-dir <objkat>]" -#: builtin/commit-graph.c:11 builtin/commit-graph.c:23 +#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 msgid "git commit-graph read [--object-dir <objdir>]" msgstr "git commit-graph read [--object-dir <objkat>]" -#: builtin/commit-graph.c:12 builtin/commit-graph.c:18 -msgid "git commit-graph verify [--object-dir <objdir>]" -msgstr "git commit-graph verify [--object-dir <objkat>]" +#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 +msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" +msgstr "git commit-graph verify [--object-dir <objkat>] [--shallow]" -#: builtin/commit-graph.c:13 builtin/commit-graph.c:28 +#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--" -"stdin-packs|--stdin-commits]" +"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" +"reachable|--stdin-packs|--stdin-commits] <split options>" msgstr "" -"git commit-graph write [--object-dir <objkat>] [--append] [--reachable|--" -"stdin-packs|--stdin-commits]" +"git commit-graph write [--object-dir <objkat>] [--append|--split] [--" +"reachable|--stdin-packs|--stdin-commits] <delnings-flaggor>" -#: builtin/commit-graph.c:51 builtin/commit-graph.c:89 -#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153 -#: builtin/log.c:1561 +#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 +#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 +#: builtin/log.c:1601 msgid "dir" msgstr "kat" -#: builtin/commit-graph.c:52 builtin/commit-graph.c:90 -#: builtin/commit-graph.c:148 builtin/commit-graph.c:206 +#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 +#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 msgid "The object directory to store the graph" msgstr "Objektkatalogen där grafen skall lagras" -#: builtin/commit-graph.c:68 builtin/commit-graph.c:105 +#: builtin/commit-graph.c:57 +msgid "if the commit-graph is split, only verify the tip file" +msgstr "om inchecknignsgrafen är delad, kontrollera bara spetsfilen" + +#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 #, c-format msgid "Could not open commit-graph '%s'" msgstr "Kunde inte öppna incheckningsgrafen \"%s\"" -#: builtin/commit-graph.c:150 +#: builtin/commit-graph.c:164 msgid "start walk at all refs" msgstr "starta traversering vid alla referenser" -#: builtin/commit-graph.c:152 +#: builtin/commit-graph.c:166 msgid "scan pack-indexes listed by stdin for commits" msgstr "sök paketindex listade på standard in efter incheckningar" -#: builtin/commit-graph.c:154 +#: builtin/commit-graph.c:168 msgid "start walk at commits listed by stdin" msgstr "börja gå genom incheckningar listade på standard in" -#: builtin/commit-graph.c:156 +#: builtin/commit-graph.c:170 msgid "include all commits already in the commit-graph file" msgstr "ta med alla incheckningar redan i filen commit-graph" -#: builtin/commit-graph.c:165 +#: builtin/commit-graph.c:172 +msgid "allow writing an incremental commit-graph file" +msgstr "tillåt skriva en inkrementell incheckningsgraffil" + +#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 +msgid "maximum number of commits in a non-base split commit-graph" +msgstr "" +"maximalt antal incheckningar i en delad incheckingsgraf som inte är bad" + +#: builtin/commit-graph.c:176 +msgid "maximum ratio between two levels of a split commit-graph" +msgstr "maximalt förhållande mellan två nivåer av en delad incheckningsgraf" + +#: builtin/commit-graph.c:191 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "använd som mest en av --reachable, --stdin-commit och --stdin-packs" @@ -11520,7 +11895,7 @@ msgstr "använd som mest en av --reachable, --stdin-commit och --stdin-packs" msgid "git config [<options>]" msgstr "git config [<flaggor>]" -#: builtin/config.c:103 +#: builtin/config.c:103 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "okänt argument för --type, %s" @@ -11625,7 +12000,7 @@ msgstr "hitta färginställningen: slot [stdout-is-tty]" msgid "Type" msgstr "Typ" -#: builtin/config.c:147 +#: builtin/config.c:147 builtin/env--helper.c:38 msgid "value is given this type" msgstr "värdet har givits denna typ" @@ -11669,7 +12044,7 @@ msgstr "respektera inkluderingsdirektiv vid uppslag" msgid "show origin of config (file, standard input, blob, command line)" msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)" -#: builtin/config.c:158 +#: builtin/config.c:158 builtin/env--helper.c:40 msgid "value" msgstr "värde" @@ -11964,7 +12339,7 @@ msgstr "överväg endast taggar som motsvarar <mönster>" msgid "do not consider tags matching <pattern>" msgstr "överväg inte taggar som motsvarar <mönster>" -#: builtin/describe.c:551 builtin/name-rev.c:426 +#: builtin/describe.c:551 builtin/name-rev.c:422 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" @@ -12025,32 +12400,32 @@ msgstr "mer än två blobbar angavs: \"%s\"" msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." -#: builtin/difftool.c:31 +#: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" "git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]" -#: builtin/difftool.c:259 +#: builtin/difftool.c:253 #, c-format msgid "failed: %d" msgstr "misslyckades: %d" -#: builtin/difftool.c:301 +#: builtin/difftool.c:295 #, c-format msgid "could not read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/difftool.c:303 +#: builtin/difftool.c:297 #, c-format msgid "could not read symlink file %s" msgstr "kunde inte läsa symbolisk länk-fil %s" -#: builtin/difftool.c:311 +#: builtin/difftool.c:305 #, 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:406 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -12058,53 +12433,53 @@ msgstr "" "kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n" "katalogdiffläge (\"-d\" och \"--dir-diff\")." -#: builtin/difftool.c:632 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "bägge filerna ändrade: \"%s\" och \"%s\"." -#: builtin/difftool.c:634 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "filen i arbetskatalogen lämnades kvar." -#: builtin/difftool.c:645 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "temporära filer finns i \"%s\"." -#: builtin/difftool.c:646 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "du kanske vill städa eller rädda dem." -#: builtin/difftool.c:695 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "använd \"diff.guitool\" istället för \"diff.tool\"" -#: builtin/difftool.c:697 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "utför diff för hela katalogen" -#: builtin/difftool.c:699 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "fråga inte vid start av diff-verktyg" -#: builtin/difftool.c:704 +#: builtin/difftool.c:698 msgid "use symlinks in dir-diff mode" msgstr "använd symboliska länkar i katalogdiffläge" -#: builtin/difftool.c:705 +#: builtin/difftool.c:699 msgid "tool" msgstr "verktyg" -#: builtin/difftool.c:706 +#: builtin/difftool.c:700 msgid "use the specified diff tool" msgstr "använd angivet diff-verktyg" -#: builtin/difftool.c:708 +#: builtin/difftool.c:702 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”" +msgstr "visa en lista över diff-verktyg som kan användas med \"--tool\"" -#: builtin/difftool.c:711 +#: builtin/difftool.c:705 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -12112,176 +12487,220 @@ msgstr "" "låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde " "skilt från noll" -#: builtin/difftool.c:714 +#: builtin/difftool.c:708 msgid "specify a custom command for viewing diffs" msgstr "ange eget kommando för att visa diffar" -#: builtin/difftool.c:715 +#: builtin/difftool.c:709 msgid "passed to `diff`" msgstr "sändes till \"diff\"" -#: builtin/difftool.c:730 +#: builtin/difftool.c:724 msgid "difftool requires worktree or --no-index" msgstr "difftool kräver en arbetskatalog eller --no-index" -#: builtin/difftool.c:744 +#: builtin/difftool.c:731 +msgid "--dir-diff is incompatible with --no-index" +msgstr "--dir-diff är inkompatibelt med --no-index" + +#: builtin/difftool.c:734 +msgid "--gui, --tool and --extcmd are mutually exclusive" +msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande" + +#: builtin/difftool.c:742 msgid "no <tool> given for --tool=<tool>" msgstr "inget <verktyg> angavs för --tool=<verktyg>" -#: builtin/difftool.c:751 +#: builtin/difftool.c:749 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "inget <kommando> angavs för --extcmd=<kommando>" +#: builtin/env--helper.c:6 +msgid "git env--helper --type=[bool|ulong] <options> <env-var>" +msgstr "git env--helper --type=[bool|ulong] <flaggor> <miljövariabel>" + +#: builtin/env--helper.c:37 builtin/hash-object.c:98 +msgid "type" +msgstr "typ" + +#: builtin/env--helper.c:41 +msgid "default for git_env_*(...) to fall back on" +msgstr "standard för git_env_*(...) att falla tillbaka på" + +#: builtin/env--helper.c:43 +msgid "be quiet only use git_env_*() value as exit code" +msgstr "var tyst, använd bara git_env_*() som resultatvärde" + +#: builtin/env--helper.c:62 +#, c-format +msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" +msgstr "" +"flaggan \"--default\" förväntar ett sanningsvärde med \"--type=bool\", inte " +"\"%s\"" + +#: builtin/env--helper.c:77 +#, c-format +msgid "" +"option `--default' expects an unsigned long value with `--type=ulong`, not `" +"%s`" +msgstr "" +"flaggan \"--default\" förväntar ett teckenlöst långt värde med \"--type=ulong" +"\", inte \"%s\"" + #: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-flaggor]" -#: builtin/fast-export.c:1084 +#: builtin/fast-export.c:1124 msgid "show progress after <n> objects" msgstr "visa förlopp efter <n> objekt" -#: builtin/fast-export.c:1086 +#: builtin/fast-export.c:1126 msgid "select handling of signed tags" msgstr "välj hantering av signerade taggar" -#: builtin/fast-export.c:1089 +#: builtin/fast-export.c:1129 msgid "select handling of tags that tag filtered objects" msgstr "välj hantering av taggar som har taggfiltrerade objekt" -#: builtin/fast-export.c:1092 +#: builtin/fast-export.c:1132 +msgid "select handling of commit messages in an alternate encoding" +msgstr "välj hantering av incheckningsmeddelanden i alternativ teckenkodning" + +#: builtin/fast-export.c:1135 msgid "Dump marks to this file" -msgstr "Dump märken till filen" +msgstr "Dumpa märken till filen" -#: builtin/fast-export.c:1094 +#: builtin/fast-export.c:1137 msgid "Import marks from this file" msgstr "Importera märken från filen" -#: builtin/fast-export.c:1096 +#: builtin/fast-export.c:1139 msgid "Fake a tagger when tags lack one" msgstr "Fejka taggare när taggen saknar en" -#: builtin/fast-export.c:1098 +#: builtin/fast-export.c:1141 msgid "Output full tree for each commit" msgstr "Skriv ut hela trädet för varje incheckning" -#: builtin/fast-export.c:1100 +#: builtin/fast-export.c:1143 msgid "Use the done feature to terminate the stream" msgstr "Använd done-funktionen för att avsluta strömmen" -#: builtin/fast-export.c:1101 +#: builtin/fast-export.c:1144 msgid "Skip output of blob data" msgstr "Hoppa över skrivning av blob-data" -#: builtin/fast-export.c:1102 builtin/log.c:1609 +#: builtin/fast-export.c:1145 builtin/log.c:1649 msgid "refspec" msgstr "referensspecifikation" -#: builtin/fast-export.c:1103 +#: builtin/fast-export.c:1146 msgid "Apply refspec to exported refs" msgstr "Applicera referensspecifikation på exporterade referenser" -#: builtin/fast-export.c:1104 +#: builtin/fast-export.c:1147 msgid "anonymize output" msgstr "anonymisera utdata" -#: builtin/fast-export.c:1106 +#: builtin/fast-export.c:1149 msgid "Reference parents which are not in fast-export stream by object id" msgstr "Referera föräldrar som inte finns i fast-export-ström med objekt-id" -#: builtin/fast-export.c:1108 +#: builtin/fast-export.c:1151 msgid "Show original object ids of blobs/commits" msgstr "Visa ursprungliga objekt-ID för blobbar/incheckningar" -#: builtin/fetch.c:28 +#: builtin/fetch.c:30 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/fetch.c:29 +#: builtin/fetch.c:31 msgid "git fetch [<options>] <group>" msgstr "git fetch [<flaggor>] <grupp>" -#: builtin/fetch.c:30 +#: builtin/fetch.c:32 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:33 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:115 builtin/pull.c:202 +#: builtin/fetch.c:125 builtin/pull.c:203 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:117 builtin/pull.c:205 +#: builtin/fetch.c:127 builtin/pull.c:206 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:119 builtin/pull.c:208 +#: builtin/fetch.c:129 builtin/pull.c:209 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:120 +#: builtin/fetch.c:130 msgid "force overwrite of local reference" msgstr "tvinga överskrivning av lokal referens" -#: builtin/fetch.c:122 +#: builtin/fetch.c:132 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:124 builtin/pull.c:212 +#: builtin/fetch.c:134 builtin/pull.c:213 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:126 +#: builtin/fetch.c:136 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:128 +#: builtin/fetch.c:138 msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:130 builtin/pull.c:215 +#: builtin/fetch.c:140 builtin/pull.c:216 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:132 +#: builtin/fetch.c:142 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:133 builtin/fetch.c:156 builtin/pull.c:139 +#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:134 +#: builtin/fetch.c:144 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:138 builtin/pull.c:223 +#: builtin/fetch.c:148 builtin/pull.c:224 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:140 +#: builtin/fetch.c:150 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226 +#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:145 +#: builtin/fetch.c:155 msgid "deepen history of shallow repository based on time" msgstr "fördjupa historik för grund klon baserad på tid" -#: builtin/fetch.c:151 builtin/pull.c:229 +#: builtin/fetch.c:161 builtin/pull.c:230 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:154 +#: builtin/fetch.c:164 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:157 +#: builtin/fetch.c:167 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -12289,97 +12708,105 @@ msgstr "" "standard för rekursiv hämtning av undermoduler (lägre prioritet än " "konfigurationsfiler)" -#: builtin/fetch.c:161 builtin/pull.c:232 +#: builtin/fetch.c:171 builtin/pull.c:233 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:162 builtin/pull.c:234 +#: builtin/fetch.c:172 builtin/pull.c:235 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:163 builtin/pull.c:235 +#: builtin/fetch.c:173 builtin/pull.c:236 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:170 +#: builtin/fetch.c:180 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:469 +#: builtin/fetch.c:183 +msgid "run 'gc --auto' after fetching" +msgstr "kör \"gc --auto\" efter hämtning" + +#: builtin/fetch.c:185 builtin/pull.c:245 +msgid "check for forced-updates on all updated branches" +msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar" + +#: builtin/fetch.c:491 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:608 +#: builtin/fetch.c:630 #, 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:705 +#: builtin/fetch.c:728 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:709 +#: builtin/fetch.c:732 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801 +#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:723 +#: builtin/fetch.c:746 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:733 +#: builtin/fetch.c:756 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784 -#: builtin/fetch.c:796 +#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 +#: builtin/fetch.c:828 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:738 +#: builtin/fetch.c:761 msgid "would clobber existing tag" msgstr "skulle skriva över befintlig tagg" -#: builtin/fetch.c:760 +#: builtin/fetch.c:783 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:763 +#: builtin/fetch.c:786 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:766 +#: builtin/fetch.c:789 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:796 +#: builtin/fetch.c:828 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:801 +#: builtin/fetch.c:833 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:847 +#: builtin/fetch.c:879 #, 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:868 +#: builtin/fetch.c:900 #, 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:959 builtin/fetch.c:1081 +#: builtin/fetch.c:991 builtin/fetch.c:1124 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:970 +#: builtin/fetch.c:1002 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -12388,50 +12815,81 @@ 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:1051 +#: builtin/fetch.c:1008 +msgid "" +"Fetch normally indicates which branches had a forced update, but that check " +"has been disabled." +msgstr "" +"Hämtning visar vanligtvis vilka grenar som har en tvingad uppdatering, men " +"det testet har slagits av." + +#: builtin/fetch.c:1009 +msgid "" +"To re-enable, use '--show-forced-updates' flag or run 'git config fetch." +"showForcedUpdates true'." +msgstr "" +"För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör " +"\"git config fetch.showForcedUpdates true\"." + +#: builtin/fetch.c:1011 +#, c-format +msgid "" +"It took %.2f seconds to check forced updates. You can use '--no-show-forced-" +"updates'\n" +msgstr "" +"Det tog %.2f sekunder att se efter tvingade uppdateringar. Du kan använda " +"\"--no-show-forced-updates\"\n" + +#: builtin/fetch.c:1013 +msgid "" +"or run 'git config fetch.showForcedUpdates false' to avoid this check.\n" +msgstr "" +"eller kör \"git config fetch.showForcedUpdates false\" för undvika testet.\n" + +#: builtin/fetch.c:1094 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:1052 +#: builtin/fetch.c:1095 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:1084 +#: builtin/fetch.c:1127 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:1085 builtin/remote.c:1036 +#: builtin/fetch.c:1128 builtin/remote.c:1036 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:1108 +#: builtin/fetch.c:1151 #, 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:1127 +#: builtin/fetch.c:1170 #, 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:1130 +#: builtin/fetch.c:1173 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1434 +#: builtin/fetch.c:1477 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1436 builtin/remote.c:100 +#: builtin/fetch.c:1479 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1482 +#: builtin/fetch.c:1525 msgid "" "--filter can only be used with the remote configured in extensions." "partialClone" @@ -12439,7 +12897,7 @@ msgstr "" "--filter kan endast användas med fjärren konfigurerad i extensions." "partialClone" -#: builtin/fetch.c:1506 +#: builtin/fetch.c:1549 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -12447,44 +12905,44 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar skall hämtas från." -#: builtin/fetch.c:1543 +#: builtin/fetch.c:1586 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1594 +#: builtin/fetch.c:1637 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1596 +#: builtin/fetch.c:1639 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1601 +#: builtin/fetch.c:1644 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1603 +#: builtin/fetch.c:1646 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1619 +#: builtin/fetch.c:1662 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1621 +#: builtin/fetch.c:1664 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1630 +#: builtin/fetch.c:1673 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1637 +#: builtin/fetch.c:1680 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:1653 +#: builtin/fetch.c:1696 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -12555,7 +13013,7 @@ msgstr "citera platshållare passande för Tcl" msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:39 builtin/tag.c:433 +#: builtin/for-each-ref.c:39 builtin/tag.c:439 msgid "respect format colors" msgstr "använd formatfärger" @@ -12725,7 +13183,7 @@ msgstr "Kontrollerar objektkataloger" msgid "Checking %s link" msgstr "Kontrollerar %s-länk" -#: builtin/fsck.c:705 builtin/index-pack.c:841 +#: builtin/fsck.c:705 builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" @@ -12812,7 +13270,7 @@ msgstr "visa förlopp" msgid "show verbose names for reachable objects" msgstr "visa ordrika namn för nåbara objekt" -#: builtin/fsck.c:859 builtin/index-pack.c:224 +#: builtin/fsck.c:859 builtin/index-pack.c:225 msgid "Checking objects" msgstr "Kontrollerar objekt" @@ -12845,7 +13303,7 @@ msgstr "misslyckades tolka \"%s\" värde \"%s\"" msgid "cannot stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" @@ -12918,7 +13376,7 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:693 +#: builtin/gc.c:695 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -12943,258 +13401,258 @@ msgstr "felaktigt antal trådar angivet (%d) för %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705 -#: builtin/pack-objects.c:2720 +#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 +#: builtin/pack-objects.c:2722 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631 +#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:646 +#: builtin/grep.c:648 #, c-format msgid "unable to grep from object of type %s" msgstr "kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:712 +#: builtin/grep.c:714 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:813 +#: builtin/grep.c:815 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:815 +#: builtin/grep.c:817 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:817 +#: builtin/grep.c:819 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:819 +#: builtin/grep.c:821 msgid "recursively search in each submodule" msgstr "sök varje undermodul rekursivt" -#: builtin/grep.c:822 +#: builtin/grep.c:824 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:824 +#: builtin/grep.c:826 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:826 +#: builtin/grep.c:828 msgid "match patterns only at word boundaries" msgstr "matcha endast mönster vid ordgränser" -#: builtin/grep.c:828 +#: builtin/grep.c:830 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:830 +#: builtin/grep.c:832 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:833 +#: builtin/grep.c:835 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:835 +#: builtin/grep.c:837 msgid "search in subdirectories (default)" msgstr "sök i underkataloger (standard)" -#: builtin/grep.c:837 +#: builtin/grep.c:839 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:841 +#: builtin/grep.c:843 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:844 +#: builtin/grep.c:846 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:847 +#: builtin/grep.c:849 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:850 +#: builtin/grep.c:852 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:853 +#: builtin/grep.c:855 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:854 +#: builtin/grep.c:856 msgid "show column number of first match" msgstr "visa kolumnnummer för första träff" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:856 +#: builtin/grep.c:858 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:858 +#: builtin/grep.c:860 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:865 +#: builtin/grep.c:867 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:867 +#: builtin/grep.c:869 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:870 +#: builtin/grep.c:872 msgid "show only matching parts of a line" msgstr "visa endast träffade delar av rader" -#: builtin/grep.c:872 +#: builtin/grep.c:874 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:873 +#: builtin/grep.c:875 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:875 +#: builtin/grep.c:877 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:877 +#: builtin/grep.c:879 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:880 +#: builtin/grep.c:882 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:883 +#: builtin/grep.c:885 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:885 +#: builtin/grep.c:887 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:888 +#: builtin/grep.c:890 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:891 +#: builtin/grep.c:893 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:893 +#: builtin/grep.c:895 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:896 +#: builtin/grep.c:898 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:898 +#: builtin/grep.c:900 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:900 +#: builtin/grep.c:902 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:912 +#: builtin/grep.c:914 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:914 +#: builtin/grep.c:916 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:916 +#: builtin/grep.c:918 msgid "show parse tree for grep expression" msgstr "visa analysträd för grep-uttryck" -#: builtin/grep.c:920 +#: builtin/grep.c:922 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:920 +#: builtin/grep.c:922 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:924 +#: builtin/grep.c:926 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:988 +#: builtin/grep.c:990 msgid "no pattern given" msgstr "inget mönster angavs" -#: builtin/grep.c:1024 +#: builtin/grep.c:1026 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index och --untracked kan inte användas med revisioner" -#: builtin/grep.c:1032 +#: builtin/grep.c:1034 #, c-format msgid "unable to resolve revision: %s" msgstr "kan inte slå upp revision: %s" -#: builtin/grep.c:1063 +#: builtin/grep.c:1065 msgid "invalid option combination, ignoring --threads" msgstr "ogiltig kombination av flaggor, ignorerar --threads" -#: builtin/grep.c:1066 builtin/pack-objects.c:3403 +#: builtin/grep.c:1068 builtin/pack-objects.c:3405 msgid "no threads support, ignoring --threads" msgstr "trådstöd saknas, ignorerar --threads" -#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717 +#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2719 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:1092 +#: builtin/grep.c:1094 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1115 +#: builtin/grep.c:1117 msgid "option not supported with --recurse-submodules" msgstr "flaggan stöds inte med --recurse-submodules" -#: builtin/grep.c:1121 +#: builtin/grep.c:1123 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached och --untracked kan inte användas med --no-index" -#: builtin/grep.c:1127 +#: builtin/grep.c:1129 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:1135 +#: builtin/grep.c:1137 msgid "both --cached and trees are given" msgstr "både --cached och träd angavs" @@ -13211,10 +13669,6 @@ msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" #: builtin/hash-object.c:98 -msgid "type" -msgstr "typ" - -#: builtin/hash-object.c:98 msgid "object type" msgstr "objekttyp" @@ -13279,7 +13733,7 @@ msgstr "git help [--all] [--guides] [--man | --web | --info] [<kommando>]" #: builtin/help.c:77 #, c-format msgid "unrecognized help format '%s'" -msgstr "okänt hjälpformat: ”%s”" +msgstr "okänt hjälpformat: \"%s\"" #: builtin/help.c:104 msgid "Failed to start emacsclient." @@ -13330,12 +13784,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:434 builtin/help.c:445 git.c:335 +#: builtin/help.c:434 builtin/help.c:445 git.c:336 #, c-format msgid "'%s' is aliased to '%s'" msgstr "\"%s\" är ett alias för \"%s\"" -#: builtin/help.c:448 git.c:364 +#: builtin/help.c:448 git.c:365 #, c-format msgid "bad alias.%s string: %s" msgstr "felaktig alias.%s-sträng: %s" @@ -13349,290 +13803,285 @@ msgstr "användning: %s%s" msgid "'git help config' for more information" msgstr "\"git help config\" för mer information" -#: builtin/index-pack.c:184 +#: builtin/index-pack.c:185 #, c-format msgid "object type mismatch at %s" msgstr "objekttyp stämmer inte överens vid %s" -#: builtin/index-pack.c:204 +#: builtin/index-pack.c:205 #, c-format msgid "did not receive expected object %s" msgstr "emottog inte det förväntade objektet %s" -#: builtin/index-pack.c:207 +#: builtin/index-pack.c:208 #, 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:257 +#: builtin/index-pack.c:258 #, 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:267 +#: builtin/index-pack.c:268 msgid "early EOF" msgstr "tidigt filslut" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:269 msgid "read error on input" msgstr "indataläsfel" -#: builtin/index-pack.c:280 +#: builtin/index-pack.c:281 msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:287 builtin/pack-objects.c:600 +#: builtin/index-pack.c:288 builtin/pack-objects.c:600 msgid "pack too large for current definition of off_t" msgstr "paket för stort för nuvarande definition av off_t" -#: builtin/index-pack.c:290 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "paket är större än tillåten maximal storlek" -#: builtin/index-pack.c:305 builtin/repack.c:250 -#, c-format -msgid "unable to create '%s'" -msgstr "kunde inte skapa \"%s\"" - -#: builtin/index-pack.c:311 +#: builtin/index-pack.c:312 #, c-format msgid "cannot open packfile '%s'" msgstr "kan inte öppna paketfilen \"%s\"" -#: builtin/index-pack.c:325 +#: builtin/index-pack.c:326 msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" -#: builtin/index-pack.c:327 +#: builtin/index-pack.c:328 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stöds ej" -#: builtin/index-pack.c:345 +#: builtin/index-pack.c:346 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s" -#: builtin/index-pack.c:465 +#: builtin/index-pack.c:466 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:514 +#: builtin/index-pack.c:515 msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" -#: builtin/index-pack.c:522 +#: builtin/index-pack.c:523 msgid "delta base offset is out of bound" msgstr "deltabasindex utanför gränsen" -#: builtin/index-pack.c:530 +#: builtin/index-pack.c:531 #, c-format msgid "unknown object type %d" msgstr "okänd objekttyp %d" -#: builtin/index-pack.c:561 +#: builtin/index-pack.c:562 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: builtin/index-pack.c:563 +#: builtin/index-pack.c:564 #, 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:589 +#: builtin/index-pack.c:590 msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763 -#: builtin/index-pack.c:802 builtin/index-pack.c:811 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 +#: builtin/index-pack.c:803 builtin/index-pack.c:812 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:737 builtin/pack-objects.c:153 +#: builtin/index-pack.c:738 builtin/pack-objects.c:153 #: builtin/pack-objects.c:213 builtin/pack-objects.c:307 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:800 +#: builtin/index-pack.c:801 #, c-format msgid "cannot read existing object info %s" msgstr "kan inte läsa information om befintligt objekt %s" -#: builtin/index-pack.c:808 +#: builtin/index-pack.c:809 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:822 +#: builtin/index-pack.c:823 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:825 builtin/index-pack.c:844 +#: builtin/index-pack.c:826 builtin/index-pack.c:845 msgid "fsck error in packed object" msgstr "fsck-fel i packat objekt" -#: builtin/index-pack.c:846 +#: builtin/index-pack.c:847 #, 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:918 builtin/index-pack.c:949 +#: builtin/index-pack.c:919 builtin/index-pack.c:950 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1117 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1117 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1151 +#: builtin/index-pack.c:1152 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1156 +#: builtin/index-pack.c:1157 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1159 +#: builtin/index-pack.c:1160 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1171 +#: builtin/index-pack.c:1172 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1194 +#: builtin/index-pack.c:1195 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2491 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1245 +#: builtin/index-pack.c:1246 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1251 +#: builtin/index-pack.c:1252 #, 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:1263 +#: builtin/index-pack.c:1264 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1268 #, 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:1291 +#: builtin/index-pack.c:1292 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1388 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1382 +#: builtin/index-pack.c:1402 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1427 #, c-format msgid "cannot write %s file '%s'" msgstr "kan inte ta skriva %s-fil \"%s\"" -#: builtin/index-pack.c:1415 +#: builtin/index-pack.c:1435 #, c-format msgid "cannot close written %s file '%s'" msgstr "kan inte stänga skriven %s-fil \"%s\"" -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1459 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1453 +#: builtin/index-pack.c:1473 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1461 +#: builtin/index-pack.c:1481 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2730 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1573 +#: builtin/index-pack.c:1593 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1575 +#: builtin/index-pack.c:1595 #, 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:1623 +#: builtin/index-pack.c:1643 #, 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:1630 +#: builtin/index-pack.c:1650 #, 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:1667 +#: builtin/index-pack.c:1689 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1716 builtin/index-pack.c:1719 -#: builtin/index-pack.c:1735 builtin/index-pack.c:1739 +#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 +#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1755 +#: builtin/index-pack.c:1777 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1757 +#: builtin/index-pack.c:1779 msgid "--stdin requires a git repository" msgstr "--stdin kräver ett git-arkiv" -#: builtin/index-pack.c:1763 +#: builtin/index-pack.c:1785 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" -#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 msgid "fsck error in pack objects" msgstr "fsck-fel i packat objekt" @@ -13727,17 +14176,17 @@ msgstr "behörigheter" msgid "specify that the git repository is to be shared amongst several users" msgstr "ange att git-arkivet skall delas bland flera användare" -#: builtin/init-db.c:526 builtin/init-db.c:531 +#: builtin/init-db.c:529 builtin/init-db.c:534 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:535 +#: builtin/init-db.c:538 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:556 +#: builtin/init-db.c:559 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -13746,12 +14195,12 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:584 +#: builtin/init-db.c:587 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" -#: builtin/interpret-trailers.c:15 +#: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<token>[(=|:)<value>])...] [<file>...]" @@ -13759,59 +14208,59 @@ msgstr "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<symbol>[(=|:)<värde>])...] [<fil>...]" -#: builtin/interpret-trailers.c:94 +#: builtin/interpret-trailers.c:95 msgid "edit files in place" msgstr "redigera filer på plats" -#: builtin/interpret-trailers.c:95 +#: builtin/interpret-trailers.c:96 msgid "trim empty trailers" msgstr "ta bort tomma släprader" -#: builtin/interpret-trailers.c:98 +#: builtin/interpret-trailers.c:99 msgid "where to place the new trailer" msgstr "var nya släprader skall placeras" -#: builtin/interpret-trailers.c:100 +#: builtin/interpret-trailers.c:101 msgid "action if trailer already exists" msgstr "att göra om släprader redan finns" -#: builtin/interpret-trailers.c:102 +#: builtin/interpret-trailers.c:103 msgid "action if trailer is missing" msgstr "att göra om släprader saknas" -#: builtin/interpret-trailers.c:104 +#: builtin/interpret-trailers.c:105 msgid "output only the trailers" msgstr "visa endast släprader" -#: builtin/interpret-trailers.c:105 +#: builtin/interpret-trailers.c:106 msgid "do not apply config rules" msgstr "använd inte regler från konfigurationen" -#: builtin/interpret-trailers.c:106 +#: builtin/interpret-trailers.c:107 msgid "join whitespace-continued values" msgstr "slå ihop värden avdelade med blanksteg" -#: builtin/interpret-trailers.c:107 +#: builtin/interpret-trailers.c:108 msgid "set parsing options" msgstr "välj tolkningsalternativ" -#: builtin/interpret-trailers.c:109 +#: builtin/interpret-trailers.c:110 msgid "do not treat --- specially" msgstr "tolka inte --- speciellt" -#: builtin/interpret-trailers.c:110 +#: builtin/interpret-trailers.c:111 msgid "trailer" msgstr "släprad" -#: builtin/interpret-trailers.c:111 +#: builtin/interpret-trailers.c:112 msgid "trailer(s) to add" msgstr "släprad(er) att lägga till" -#: builtin/interpret-trailers.c:120 +#: builtin/interpret-trailers.c:123 msgid "--trailer with --only-input does not make sense" msgstr "--trailer med --only-input ger ingen mening" -#: builtin/interpret-trailers.c:130 +#: builtin/interpret-trailers.c:133 msgid "no input file given for in-place editing" msgstr "ingen indatafil angiven för redigering på plats" @@ -13823,113 +14272,133 @@ msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" msgid "git show [<options>] <object>..." msgstr "git show [<flaggor>] <objekt>..." -#: builtin/log.c:104 +#: builtin/log.c:109 #, c-format msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:168 +#: builtin/log.c:160 +msgid "" +"log.mailmap is not set; its implicit value will change in an\n" +"upcoming release. To squelch this message and preserve current\n" +"behaviour, set the log.mailmap configuration value to false.\n" +"\n" +"To squelch this message and adopt the new behaviour now, set the\n" +"log.mailmap configuration value to true.\n" +"\n" +"See 'git help config' and search for 'log.mailmap' for further information." +msgstr "" +"log.mailmap har inte satts: förvalet kommer ändras i en kommande\n" +"version. För att dölja det här meddelandet och behålla nuvarande\n" +"beteende, sätt konfigurationsvariabeln log.mailmap till false.\n" +"\n" +"För att dölja det här meddelandet och använda det nya beteendet,\n" +"sätt konfigurationsvariabeln log.mailmap till true.\n" +"\n" +"Se \"git help config\" och sök efter \"log.mailmap\" för mer information." + +#: builtin/log.c:183 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:169 +#: builtin/log.c:184 msgid "Use mail map file" msgstr "Använd e-postmappningsfil" -#: builtin/log.c:171 +#: builtin/log.c:186 msgid "only decorate refs that match <pattern>" msgstr "dekorera endast referenser som motsvarar <mönster>" -#: builtin/log.c:173 +#: builtin/log.c:188 msgid "do not decorate refs that match <pattern>" msgstr "dekorera inte referenser som motsvarar <mönster>" -#: builtin/log.c:174 +#: builtin/log.c:189 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:177 +#: builtin/log.c:192 msgid "Process line range n,m in file, counting from 1" msgstr "Behandla radintervallet n,m i filen, med början på 1" -#: builtin/log.c:275 +#: builtin/log.c:297 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:529 +#: builtin/log.c:551 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:544 builtin/log.c:638 +#: builtin/log.c:566 builtin/log.c:660 #, c-format msgid "could not read object %s" msgstr "kunde inte läsa objektet %s" -#: builtin/log.c:663 +#: builtin/log.c:685 #, c-format msgid "unknown type: %d" msgstr "okänd typ: %d" -#: builtin/log.c:784 +#: builtin/log.c:808 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:885 +#: builtin/log.c:925 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:901 +#: builtin/log.c:941 #, c-format msgid "cannot open patch file %s" msgstr "kan inte öppna patchfilen %s" -#: builtin/log.c:918 +#: builtin/log.c:958 msgid "need exactly one range" msgstr "behöver precis ett intervall" -#: builtin/log.c:928 +#: builtin/log.c:968 msgid "not a range" msgstr "inte ett intervall" -#: builtin/log.c:1051 +#: builtin/log.c:1091 msgid "cover letter needs email format" msgstr "omslagsbrevet behöver e-postformat" -#: builtin/log.c:1057 +#: builtin/log.c:1097 msgid "failed to create cover-letter file" msgstr "misslyckades skapa fil för omslagsbrev" -#: builtin/log.c:1136 +#: builtin/log.c:1176 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1163 +#: builtin/log.c:1203 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1221 +#: builtin/log.c:1261 msgid "two output directories?" msgstr "två utdatakataloger?" -#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090 +#: builtin/log.c:1372 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 #, c-format msgid "unknown commit %s" msgstr "okänd incheckning %s" -#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1382 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:1347 +#: builtin/log.c:1387 msgid "could not find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1351 +#: builtin/log.c:1391 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" @@ -13939,271 +14408,267 @@ 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:1371 +#: builtin/log.c:1411 msgid "failed to find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1382 +#: builtin/log.c:1422 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1386 +#: builtin/log.c:1426 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1439 +#: builtin/log.c:1479 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1491 +#: builtin/log.c:1531 msgid "failed to infer range-diff ranges" msgstr "misslyckades räkna ut intervall range-diff" -#: builtin/log.c:1536 +#: builtin/log.c:1576 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:1539 +#: builtin/log.c:1579 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1543 +#: builtin/log.c:1583 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1545 +#: builtin/log.c:1585 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1547 +#: builtin/log.c:1587 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1548 +#: builtin/log.c:1588 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1549 +#: builtin/log.c:1589 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1551 +#: builtin/log.c:1591 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1553 +#: builtin/log.c:1593 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1555 +#: builtin/log.c:1595 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Använd [RFC PATCH] istället för [PATCH]" -#: builtin/log.c:1558 +#: builtin/log.c:1598 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1561 +#: builtin/log.c:1601 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1564 +#: builtin/log.c:1604 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1567 +#: builtin/log.c:1607 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1569 +#: builtin/log.c:1609 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1571 +#: builtin/log.c:1611 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1573 +#: builtin/log.c:1613 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1575 +#: builtin/log.c:1615 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1576 +#: builtin/log.c:1616 msgid "header" msgstr "huvud" -#: builtin/log.c:1577 +#: builtin/log.c:1617 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1578 builtin/log.c:1580 +#: builtin/log.c:1618 builtin/log.c:1620 msgid "email" msgstr "epost" -#: builtin/log.c:1578 +#: builtin/log.c:1618 msgid "add To: header" msgstr "lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1580 +#: builtin/log.c:1620 msgid "add Cc: header" msgstr "lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1582 +#: builtin/log.c:1622 msgid "ident" msgstr "ident" -#: builtin/log.c:1583 +#: builtin/log.c:1623 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:1585 +#: builtin/log.c:1625 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1586 +#: builtin/log.c:1626 msgid "make first mail a reply to <message-id>" msgstr "gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1587 builtin/log.c:1590 +#: builtin/log.c:1627 builtin/log.c:1630 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1588 +#: builtin/log.c:1628 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1591 +#: builtin/log.c:1631 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1595 +#: builtin/log.c:1635 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1597 +#: builtin/log.c:1637 msgid "signature" msgstr "signatur" -#: builtin/log.c:1598 +#: builtin/log.c:1638 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1599 +#: builtin/log.c:1639 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1600 +#: builtin/log.c:1640 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1602 +#: builtin/log.c:1642 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1603 +#: builtin/log.c:1643 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1605 +#: builtin/log.c:1645 msgid "show progress while generating patches" msgstr "visa förloppsindikator medan patchar skapas" -#: builtin/log.c:1606 -msgid "rev" -msgstr "rev" - -#: builtin/log.c:1607 +#: builtin/log.c:1647 msgid "show changes against <rev> in cover letter or single patch" msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch" -#: builtin/log.c:1610 +#: builtin/log.c:1650 msgid "show changes against <refspec> in cover letter or single patch" msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch" -#: builtin/log.c:1612 +#: builtin/log.c:1652 msgid "percentage by which creation is weighted" msgstr "procent som skapelse vägs med" -#: builtin/log.c:1687 +#: builtin/log.c:1727 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1702 +#: builtin/log.c:1742 msgid "-n and -k are mutually exclusive" msgstr "-n och -k kan inte användas samtidigt" -#: builtin/log.c:1704 +#: builtin/log.c:1744 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt" -#: builtin/log.c:1712 +#: builtin/log.c:1752 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1714 +#: builtin/log.c:1754 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1716 +#: builtin/log.c:1756 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1748 +#: builtin/log.c:1788 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1837 +#: builtin/log.c:1877 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff kräver --cover-letter eller ensam patch" -#: builtin/log.c:1841 +#: builtin/log.c:1881 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1842 +#: builtin/log.c:1882 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff mot v%d:" -#: builtin/log.c:1848 +#: builtin/log.c:1888 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor kräver --range-diff" -#: builtin/log.c:1852 +#: builtin/log.c:1892 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff kräver --cover-letter eller ensam patch" -#: builtin/log.c:1860 +#: builtin/log.c:1900 msgid "Range-diff:" msgstr "Intervall-diff:" -#: builtin/log.c:1861 +#: builtin/log.c:1901 #, c-format msgid "Range-diff against v%d:" msgstr "Intervall-diff mot v%d:" -#: builtin/log.c:1872 +#: builtin/log.c:1912 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:1908 +#: builtin/log.c:1948 msgid "Generating patches" msgstr "Skapar patchar" -#: builtin/log.c:1952 +#: builtin/log.c:1992 msgid "failed to create output files" msgstr "misslyckades skapa utdatafiler" -#: builtin/log.c:2011 +#: builtin/log.c:2051 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:2065 +#: builtin/log.c:2105 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -14327,7 +14792,7 @@ msgstr "" msgid "do not print remote URL" msgstr "visa inte fjärr-URL" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 msgid "exec" msgstr "exec" @@ -14398,190 +14863,194 @@ msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" #: builtin/mailsplit.c:241 #, c-format msgid "empty mbox: '%s'" -msgstr "tom mbox: ”%s”" +msgstr "tom mbox: \"%s\"" -#: builtin/merge.c:54 +#: builtin/merge.c:55 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<flaggor>] [<incheckning>...]" -#: builtin/merge.c:55 +#: builtin/merge.c:56 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:116 +#: builtin/merge.c:118 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:139 +#: builtin/merge.c:141 #, c-format msgid "option `%s' requires a value" msgstr "flaggan \"%s\" behöver ett värde" -#: builtin/merge.c:185 +#: builtin/merge.c:187 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:186 +#: builtin/merge.c:188 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:191 +#: builtin/merge.c:193 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:242 builtin/pull.c:150 +#: builtin/merge.c:244 builtin/pull.c:151 msgid "do not show a diffstat at the end of the merge" msgstr "visa inte en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:245 builtin/pull.c:153 +#: builtin/merge.c:247 builtin/pull.c:154 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:246 builtin/pull.c:156 +#: builtin/merge.c:248 builtin/pull.c:157 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:248 builtin/pull.c:159 +#: builtin/merge.c:250 builtin/pull.c:160 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet" -#: builtin/merge.c:251 builtin/pull.c:165 +#: builtin/merge.c:253 builtin/pull.c:166 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:253 builtin/pull.c:168 +#: builtin/merge.c:255 builtin/pull.c:169 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:255 builtin/pull.c:171 +#: builtin/merge.c:257 builtin/pull.c:172 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:257 +#: builtin/merge.c:259 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:259 builtin/pull.c:178 +#: builtin/merge.c:261 builtin/pull.c:179 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:263 builtin/pull.c:181 +#: builtin/merge.c:265 builtin/pull.c:182 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:264 builtin/notes.c:787 builtin/pull.c:185 -#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 +#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:265 builtin/pull.c:186 +#: builtin/merge.c:267 builtin/pull.c:187 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:266 builtin/pull.c:189 +#: builtin/merge.c:268 builtin/pull.c:190 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:267 builtin/pull.c:190 +#: builtin/merge.c:269 builtin/pull.c:191 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:269 +#: builtin/merge.c:271 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:276 +#: builtin/merge.c:278 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:278 +#: builtin/merge.c:280 +msgid "--abort but leave index and working tree alone" +msgstr "--abort men lämna index och arbetskatalog ensamma" + +#: builtin/merge.c:282 msgid "continue the current in-progress merge" msgstr "fortsätt den pågående sammanslagningen" -#: builtin/merge.c:280 builtin/pull.c:197 +#: builtin/merge.c:284 builtin/pull.c:198 msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" -#: builtin/merge.c:286 +#: builtin/merge.c:290 msgid "verify commit-msg hook" msgstr "bekräfta commit-msg-krok" -#: builtin/merge.c:311 +#: builtin/merge.c:307 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:316 +#: builtin/merge.c:312 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:321 +#: builtin/merge.c:317 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:343 builtin/merge.c:360 +#: builtin/merge.c:339 builtin/merge.c:356 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:390 +#: builtin/merge.c:386 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:401 +#: builtin/merge.c:397 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:451 +#: builtin/merge.c:447 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:502 +#: builtin/merge.c:498 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:589 +#: builtin/merge.c:585 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:712 +#: builtin/merge.c:708 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:726 +#: builtin/merge.c:722 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:741 +#: builtin/merge.c:737 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:793 +#: builtin/merge.c:789 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:802 +#: builtin/merge.c:798 #, 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:808 +#: builtin/merge.c:804 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" @@ -14592,11 +15061,11 @@ msgstr "" "temagren.\n" "\n" -#: builtin/merge.c:813 +#: builtin/merge.c:809 msgid "An empty message aborts the commit.\n" msgstr "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/merge.c:816 +#: builtin/merge.c:812 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -14605,69 +15074,73 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:857 +#: builtin/merge.c:853 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:876 +#: builtin/merge.c:872 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:936 +#: builtin/merge.c:933 #, 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:975 +#: builtin/merge.c:972 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:977 +#: builtin/merge.c:974 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:979 +#: builtin/merge.c:976 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:984 +#: builtin/merge.c:981 #, 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:1041 +#: builtin/merge.c:1038 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1144 +#: builtin/merge.c:1141 #, 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:1178 +#: builtin/merge.c:1175 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1281 +#: builtin/merge.c:1278 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1285 +#: builtin/merge.c:1282 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1297 +#: builtin/merge.c:1291 +msgid "--quit expects no arguments" +msgstr "--quit tar inga argument" + +#: builtin/merge.c:1304 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1301 +#: builtin/merge.c:1308 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1317 +#: builtin/merge.c:1324 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -14675,7 +15148,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1324 +#: builtin/merge.c:1331 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -14683,92 +15156,96 @@ 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:1327 +#: builtin/merge.c:1334 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:1341 +#: builtin/merge.c:1348 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1349 +#: builtin/merge.c:1350 +msgid "You cannot combine --squash with --commit." +msgstr "Du kan inte kombinera --squash med --commit." + +#: builtin/merge.c:1366 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1366 +#: builtin/merge.c:1383 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1368 +#: builtin/merge.c:1385 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:1373 +#: builtin/merge.c:1390 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1375 +#: builtin/merge.c:1392 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:1454 +#: builtin/merge.c:1471 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1463 +#: builtin/merge.c:1480 msgid "Already up to date." msgstr "Redan à jour." -#: builtin/merge.c:1473 +#: builtin/merge.c:1490 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1515 +#: builtin/merge.c:1532 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1522 +#: builtin/merge.c:1539 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1547 +#: builtin/merge.c:1564 msgid "Already up to date. Yeeah!" msgstr "Redan à jour. Toppen!" -#: builtin/merge.c:1553 +#: builtin/merge.c:1570 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1576 builtin/merge.c:1655 +#: builtin/merge.c:1593 builtin/merge.c:1658 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1580 +#: builtin/merge.c:1597 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1646 +#: builtin/merge.c:1649 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1648 +#: builtin/merge.c:1651 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1657 +#: builtin/merge.c:1660 #, 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:1669 +#: builtin/merge.c:1672 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -14878,7 +15355,7 @@ msgstr "hanterar inte något annat än en sammanslagning av två huvuden." #: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 #, c-format msgid "could not resolve ref '%s'" -msgstr "kunde inte bestämma referensen ”%s”" +msgstr "kunde inte bestämma referensen \"%s\"" #: builtin/merge-recursive.c:78 #, c-format @@ -14902,21 +15379,37 @@ 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 [--object-dir=<dir>] (write|verify)" -msgstr "git multi-pack-index [--object-dir=<kat>] (write|verify)" +msgid "" +"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" +"batch-size=<size>)" +msgstr "" +"git multi-pack-index [--object-dir=<kat>] (write|verify|expire|repack --" +"batch-size=<storlek>)" -#: builtin/multi-pack-index.c:22 +#: builtin/multi-pack-index.c:23 msgid "object directory containing set of packfile and pack-index pairs" msgstr "objektkatalog med uppsättning av par med paketfiler och pack-index" -#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:25 +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:43 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "för många argument" -#: builtin/multi-pack-index.c:51 +#: builtin/multi-pack-index.c:52 +msgid "--batch-size option is only for 'repack' subcommand" +msgstr "flaggan --batch-size används bara i underkommandot \"repack\"" + +#: builtin/multi-pack-index.c:61 #, c-format -msgid "unrecognized verb: %s" -msgstr "okänt verb: %s" +msgid "unrecognized subcommand: %s" +msgstr "okänt underkommando: %s" #: builtin/mv.c:18 msgid "git mv [<options>] <source>... <destination>" @@ -15006,52 +15499,52 @@ 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:277 builtin/remote.c:717 builtin/repack.c:516 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:520 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" -#: builtin/name-rev.c:355 +#: builtin/name-rev.c:352 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<flaggor>] <incheckning>..." -#: builtin/name-rev.c:356 +#: builtin/name-rev.c:353 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<flaggor>] --all" -#: builtin/name-rev.c:357 +#: builtin/name-rev.c:354 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<flaggor>] --stdin" -#: builtin/name-rev.c:415 +#: builtin/name-rev.c:411 msgid "print only names (no SHA-1)" msgstr "skriv endast namn (ingen SHA-1)" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:412 msgid "only use tags to name the commits" msgstr "använd endast taggar för att namnge incheckningar" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:414 msgid "only use refs matching <pattern>" msgstr "använd endast referenser som motsvarar <mönster>" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:416 msgid "ignore refs matching <pattern>" msgstr "ignorera referenser som motsvarar <mönster>" -#: builtin/name-rev.c:422 +#: builtin/name-rev.c:418 msgid "list all commits reachable from all refs" msgstr "lista alla incheckningar som kan nås alla referenser" -#: builtin/name-rev.c:423 +#: builtin/name-rev.c:419 msgid "read from stdin" msgstr "läs från standard in" -#: builtin/name-rev.c:424 +#: builtin/name-rev.c:420 msgid "allow to print `undefined` names (default)" msgstr "tillåt att skriva \"odefinierade\" namn (standard)" -#: builtin/name-rev.c:430 +#: builtin/name-rev.c:426 msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" @@ -15198,7 +15691,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:522 +#: builtin/notes.c:242 builtin/tag.c:532 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" @@ -15432,7 +15925,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:535 +#: builtin/notes.c:897 builtin/tag.c:545 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." @@ -15466,7 +15959,7 @@ msgstr "anteckningar-ref" msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1034 builtin/stash.c:1611 +#: builtin/notes.c:1034 builtin/stash.c:1598 #, c-format msgid "unknown subcommand: %s" msgstr "okänt underkommando: %s" @@ -15544,64 +16037,64 @@ msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades" 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:1589 +#: builtin/pack-objects.c:1591 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "deltabasoffset utanför gränsen i pack för %s" -#: builtin/pack-objects.c:1598 +#: builtin/pack-objects.c:1600 #, c-format msgid "delta base offset out of bound for %s" msgstr "deltabasoffset utanför gränsvärden för %s" -#: builtin/pack-objects.c:1867 +#: builtin/pack-objects.c:1869 msgid "Counting objects" msgstr "Räknar objekt" -#: builtin/pack-objects.c:1997 +#: builtin/pack-objects.c:1999 #, c-format msgid "unable to get size of %s" msgstr "kan inte hämta storlek på %s" -#: builtin/pack-objects.c:2012 +#: builtin/pack-objects.c:2014 #, c-format msgid "unable to parse object header of %s" msgstr "kunde inte tolka objekthuvud för %s" -#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098 -#: builtin/pack-objects.c:2108 +#: builtin/pack-objects.c:2084 builtin/pack-objects.c:2100 +#: builtin/pack-objects.c:2110 #, c-format msgid "object %s cannot be read" msgstr "objektet %s kunde inte läsas" -#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112 +#: builtin/pack-objects.c:2087 builtin/pack-objects.c:2114 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "objektet %s har inkonsistent objektlängd (%<PRIuMAX> mot %<PRIuMAX>)" -#: builtin/pack-objects.c:2122 +#: builtin/pack-objects.c:2124 msgid "suboptimal pack - out of memory" msgstr "icke-optimalt pack - minnet slut" -#: builtin/pack-objects.c:2448 +#: builtin/pack-objects.c:2450 #, c-format msgid "Delta compression using up to %d threads" msgstr "Deltakomprimering använder upp till %d trådar" -#: builtin/pack-objects.c:2580 +#: builtin/pack-objects.c:2582 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "kan inte packa objekt nåbara från taggen %s" -#: builtin/pack-objects.c:2667 +#: builtin/pack-objects.c:2669 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2675 msgid "inconsistency with delta count" msgstr "deltaräknaren är inkonsekvent" -#: builtin/pack-objects.c:2754 +#: builtin/pack-objects.c:2756 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -15610,7 +16103,7 @@ msgstr "" "förväntade kant-objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:2760 +#: builtin/pack-objects.c:2762 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -15619,253 +16112,253 @@ msgstr "" "förväntade objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:2858 +#: builtin/pack-objects.c:2860 msgid "invalid value for --missing" msgstr "ogiltigt värde för --missing" -#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025 +#: builtin/pack-objects.c:2919 builtin/pack-objects.c:3027 msgid "cannot open pack index" -msgstr "kan inte öppna paketfilen" +msgstr "kan inte öppna paketfilen" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:2950 #, c-format msgid "loose object at %s could not be examined" msgstr "lösa objekt på %s kunde inte underökas" -#: builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:3035 msgid "unable to force loose object" msgstr "kan inte tvinga lösa objekt" -#: builtin/pack-objects.c:3125 +#: builtin/pack-objects.c:3127 #, c-format msgid "not a rev '%s'" msgstr "inte en referens \"%s\"" -#: builtin/pack-objects.c:3128 +#: builtin/pack-objects.c:3130 #, c-format msgid "bad revision '%s'" msgstr "felaktig revision \"%s\"" -#: builtin/pack-objects.c:3153 +#: builtin/pack-objects.c:3155 msgid "unable to add recent objects" -msgstr "kan inte lägga till nya objekt" +msgstr "kan inte lägga till nya objekt" -#: builtin/pack-objects.c:3206 +#: builtin/pack-objects.c:3208 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:3210 +#: builtin/pack-objects.c:3212 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:3240 +#: builtin/pack-objects.c:3242 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:3242 +#: builtin/pack-objects.c:3244 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:3244 +#: builtin/pack-objects.c:3246 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:3247 +#: builtin/pack-objects.c:3249 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" -#: builtin/pack-objects.c:3248 +#: builtin/pack-objects.c:3250 msgid "<version>[,<offset>]" msgstr "<version>[,<offset>]" -#: builtin/pack-objects.c:3249 +#: builtin/pack-objects.c:3251 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:3252 +#: builtin/pack-objects.c:3254 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:3254 +#: builtin/pack-objects.c:3256 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3258 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:3258 +#: builtin/pack-objects.c:3260 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3262 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:3262 +#: builtin/pack-objects.c:3264 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:3264 +#: builtin/pack-objects.c:3266 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3268 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3270 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3272 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:3272 +#: builtin/pack-objects.c:3274 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3276 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3278 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:3279 +#: builtin/pack-objects.c:3281 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3284 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:3285 +#: builtin/pack-objects.c:3287 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:3288 +#: builtin/pack-objects.c:3290 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3292 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:3292 +#: builtin/pack-objects.c:3294 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:3294 +#: builtin/pack-objects.c:3296 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3298 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:3299 +#: builtin/pack-objects.c:3301 msgid "use the sparse reachability algorithm" msgstr "använd gles-nåbarhetsalgoritmen" -#: builtin/pack-objects.c:3301 +#: builtin/pack-objects.c:3303 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:3303 +#: builtin/pack-objects.c:3305 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:3305 +#: builtin/pack-objects.c:3307 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3309 msgid "ignore this pack" msgstr "ignorera detta paket" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3311 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3313 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3315 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:3315 +#: builtin/pack-objects.c:3317 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:3318 +#: builtin/pack-objects.c:3320 msgid "handling for missing objects" msgstr "hantering av saknade objekt" -#: builtin/pack-objects.c:3321 +#: builtin/pack-objects.c:3323 msgid "do not pack objects in promisor packfiles" msgstr "packa inte objekt i kontraktspackfiler" -#: builtin/pack-objects.c:3323 +#: builtin/pack-objects.c:3325 msgid "respect islands during delta compression" msgstr "respektera öar under deltakomprimering" -#: builtin/pack-objects.c:3348 +#: builtin/pack-objects.c:3350 #, 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:3353 +#: builtin/pack-objects.c:3355 #, 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:3407 +#: builtin/pack-objects.c:3409 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size kan inte användas för att bygga ett paket som skall överföras" -#: builtin/pack-objects.c:3409 +#: builtin/pack-objects.c:3411 msgid "minimum pack size limit is 1 MiB" msgstr "minsta packstorlek är 1 MiB" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3416 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin kan inte användas för att bygga ett indexerbart paket" -#: builtin/pack-objects.c:3417 +#: builtin/pack-objects.c:3419 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt" -#: builtin/pack-objects.c:3423 +#: builtin/pack-objects.c:3425 msgid "cannot use --filter without --stdout" msgstr "kan inte använda --filter utan --stdout" -#: builtin/pack-objects.c:3484 +#: builtin/pack-objects.c:3486 msgid "Enumerating objects" msgstr "Räknar upp objekt" -#: builtin/pack-objects.c:3514 +#: builtin/pack-objects.c:3516 #, c-format msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "" "Totalt %<PRIu32> (delta %<PRIu32>), återanvände %<PRIu32> (delta %<PRIu32>)" -#: builtin/pack-refs.c:7 +#: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<flaggor>]" -#: builtin/pack-refs.c:15 +#: builtin/pack-refs.c:16 msgid "pack everything" msgstr "packa allt" -#: builtin/pack-refs.c:16 +#: builtin/pack-refs.c:17 msgid "prune loose refs (default)" msgstr "ta bort lösa referenser (standard)" @@ -15906,44 +16399,44 @@ msgstr "Felaktigt värde för %s: %s" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/pull.c:140 +#: builtin/pull.c:141 msgid "control for recursive fetching of submodules" msgstr "styrning för rekursiv hämtning av undermoduler" -#: builtin/pull.c:144 +#: builtin/pull.c:145 msgid "Options related to merging" msgstr "Alternativ gällande sammanslagning" -#: builtin/pull.c:147 +#: builtin/pull.c:148 msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" -#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125 +#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 msgid "allow fast-forward" msgstr "tillåt snabbspolning" -#: builtin/pull.c:184 +#: builtin/pull.c:185 msgid "automatically stash/stash pop before and after rebase" msgstr "utför automatiskt stash/stash pop före och efter ombasering" -#: builtin/pull.c:200 +#: builtin/pull.c:201 msgid "Options related to fetching" msgstr "Alternativ gällande hämtningar" -#: builtin/pull.c:210 +#: builtin/pull.c:211 msgid "force overwrite of local branch" msgstr "tvinga överskrivning av lokal gren" -#: builtin/pull.c:218 +#: builtin/pull.c:219 msgid "number of submodules pulled in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/pull.c:313 +#: builtin/pull.c:316 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Felaktigt värde för pull.ff: %s" -#: builtin/pull.c:430 +#: builtin/pull.c:433 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -15951,14 +16444,14 @@ msgstr "" "Det finns ingen kandidat för ombasering bland referenserna du precis har " "hämtat." -#: builtin/pull.c:432 +#: builtin/pull.c:435 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Det finns ingen kandidat för sammanslagning bland referenserna du precis har " "hämtat." -#: builtin/pull.c:433 +#: builtin/pull.c:436 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -15966,7 +16459,7 @@ msgstr "" "Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n" "motsvarade något i fjärränden." -#: builtin/pull.c:436 +#: builtin/pull.c:439 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -15977,42 +16470,42 @@ msgstr "" "gren. Eftersom det inte är den fjärr som är konfigurerad som\n" "standard för aktuell gren måste du ange en gren på kommandoraden." -#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73 +#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Du är inte på någon gren för närvarande." -#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79 +#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Ange vilken gren du vill ombasera mot." -#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82 +#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Ange vilken gren du vill slå samman med." -#: builtin/pull.c:446 builtin/pull.c:461 +#: builtin/pull.c:449 builtin/pull.c:464 msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." -#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463 -#: builtin/rebase.c:1327 git-parse-remote.sh:64 +#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 +#: builtin/rebase.c:1332 git-parse-remote.sh:64 msgid "<remote>" msgstr "<fjärr>" -#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468 +#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<gren>" -#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75 +#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Det finns ingen spårningsinformation för aktuell gren." -#: builtin/pull.c:465 git-parse-remote.sh:95 +#: builtin/pull.c:468 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:" -#: builtin/pull.c:470 +#: builtin/pull.c:473 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -16021,32 +16514,32 @@ msgstr "" "Dina inställningar anger sammanslagning med referensen \"%s\"\n" "från fjärren, men någon sådan referens togs inte emot." -#: builtin/pull.c:574 +#: builtin/pull.c:581 #, c-format msgid "unable to access commit %s" msgstr "kunde inte komma åt incheckningen %s" -#: builtin/pull.c:854 +#: builtin/pull.c:861 msgid "ignoring --verify-signatures for rebase" msgstr "ignorera --verify-signatures för ombasering" -#: builtin/pull.c:909 +#: builtin/pull.c:916 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash är endast giltig med --rebase." -#: builtin/pull.c:917 +#: builtin/pull.c:924 msgid "Updating an unborn branch with changes added to the index." msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet." -#: builtin/pull.c:921 +#: builtin/pull.c:928 msgid "pull with rebase" msgstr "pull med ombasering" -#: builtin/pull.c:922 +#: builtin/pull.c:929 msgid "please commit or stash them." msgstr "checka in eller använd \"stash\" på dem." -#: builtin/pull.c:947 +#: builtin/pull.c:954 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -16057,7 +16550,7 @@ msgstr "" "snabbspolar din arbetskatalog från\n" "incheckningen %s." -#: builtin/pull.c:953 +#: builtin/pull.c:960 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -16074,15 +16567,15 @@ msgstr "" "$ git reset --hard\n" "för att återgå." -#: builtin/pull.c:968 +#: builtin/pull.c:975 msgid "Cannot merge multiple branches into empty head." msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: builtin/pull.c:972 +#: builtin/pull.c:979 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpå flera grenar." -#: builtin/pull.c:979 +#: builtin/pull.c:986 msgid "cannot rebase with locally recorded submodule modifications" msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" @@ -16542,7 +17035,7 @@ msgstr "git rebase--interactive [<flaggor>]" msgid "keep empty commits" msgstr "behåll tomma incheckningar" -#: builtin/rebase.c:451 builtin/revert.c:127 +#: builtin/rebase.c:451 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "tillåt incheckningar med tomt meddelande" @@ -16562,7 +17055,7 @@ msgstr "flytta incheckningar som inleds med squash!/fixup!" msgid "sign commits" msgstr "signera incheckningar" -#: builtin/rebase.c:459 builtin/rebase.c:1397 +#: builtin/rebase.c:459 builtin/rebase.c:1403 msgid "display a diffstat of what changed upstream" msgstr "vis diffstat för vad som ändrats uppströms" @@ -16670,7 +17163,7 @@ msgstr "kmd" msgid "the command to run" msgstr "kommando att köra" -#: builtin/rebase.c:502 builtin/rebase.c:1480 +#: builtin/rebase.c:502 builtin/rebase.c:1486 msgid "automatically re-schedule any `exec` that fails" msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt" @@ -16678,7 +17171,7 @@ msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt" msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges" -#: builtin/rebase.c:534 builtin/rebase.c:1787 +#: builtin/rebase.c:534 #, c-format msgid "%s requires an interactive rebase" msgstr "%s kräver en interaktiv ombasering" @@ -16708,11 +17201,11 @@ msgstr "Kunde inte läsa \"%s\"" msgid "Cannot store %s" msgstr "Kan inte spara %s" -#: builtin/rebase.c:817 +#: builtin/rebase.c:827 msgid "could not determine HEAD revision" msgstr "kunde inte bestämma HEAD-revision" -#: builtin/rebase.c:940 +#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -16726,7 +17219,7 @@ msgstr "" "För att avbryta och återgå till där du var före ombaseringen, kör \"git " "rebase --abort\"." -#: builtin/rebase.c:1021 +#: builtin/rebase.c:1031 #, c-format msgid "" "\n" @@ -16745,7 +17238,7 @@ msgstr "" "\n" "Därför kan inte git ombasera dessa." -#: builtin/rebase.c:1313 +#: builtin/rebase.c:1318 #, c-format msgid "" "%s\n" @@ -16762,7 +17255,7 @@ msgstr "" " git rebase '<gren>'\n" "\n" -#: builtin/rebase.c:1329 +#: builtin/rebase.c:1334 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -16775,128 +17268,128 @@ msgstr "" " git branch --set-upstream-to=%s/<gren> %s\n" "\n" -#: builtin/rebase.c:1359 +#: builtin/rebase.c:1364 msgid "exec commands cannot contain newlines" msgstr "exec-kommandon kan inte innehålla nyradstecken" -#: builtin/rebase.c:1363 +#: builtin/rebase.c:1368 msgid "empty exec command" msgstr "tomt exec-kommando" -#: builtin/rebase.c:1390 +#: builtin/rebase.c:1396 msgid "rebase onto given branch instead of upstream" msgstr "ombasera mot given grenen istället för uppström" -#: builtin/rebase.c:1392 +#: builtin/rebase.c:1398 msgid "allow pre-rebase hook to run" msgstr "tillåt pre-rebase-krok att köra" -#: builtin/rebase.c:1394 +#: builtin/rebase.c:1400 msgid "be quiet. implies --no-stat" msgstr "var tyst. implicerar --no-stat" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1406 msgid "do not show diffstat of what changed upstream" msgstr "visa inte en diffstat för vad som ändrats uppströms" -#: builtin/rebase.c:1403 +#: builtin/rebase.c:1409 msgid "add a Signed-off-by: line to each commit" msgstr "lägg \"Signed-off-by:\"-rad till varje incheckning" -#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411 +#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 msgid "passed to 'git am'" msgstr "sänds till \"git am\"" -#: builtin/rebase.c:1413 builtin/rebase.c:1415 +#: builtin/rebase.c:1419 builtin/rebase.c:1421 msgid "passed to 'git apply'" msgstr "sänds till \"git apply\"" -#: builtin/rebase.c:1417 builtin/rebase.c:1420 +#: builtin/rebase.c:1423 builtin/rebase.c:1426 msgid "cherry-pick all commits, even if unchanged" msgstr "utför cherry-pick på alla incheckningar, även om oändrad" -#: builtin/rebase.c:1422 +#: builtin/rebase.c:1428 msgid "continue" msgstr "fortsätt" -#: builtin/rebase.c:1425 +#: builtin/rebase.c:1431 msgid "skip current patch and continue" msgstr "hoppa över nuvarande patch och fortsätt" -#: builtin/rebase.c:1427 +#: builtin/rebase.c:1433 msgid "abort and check out the original branch" msgstr "avbryt och checka ut ursprungsgrenen" -#: builtin/rebase.c:1430 +#: builtin/rebase.c:1436 msgid "abort but keep HEAD where it is" msgstr "avbryt men behåll HEAD där det är" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1437 msgid "edit the todo list during an interactive rebase" msgstr "redigera attgöra-listan under interaktiv ombasering." -#: builtin/rebase.c:1434 +#: builtin/rebase.c:1440 msgid "show the patch file being applied or merged" msgstr "visa patchen som tillämpas eller slås samman" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1443 msgid "use merging strategies to rebase" msgstr "använd sammanslagningsstrategier för sammanslagning" -#: builtin/rebase.c:1441 +#: builtin/rebase.c:1447 msgid "let the user edit the list of commits to rebase" msgstr "låt användaren redigera listan över incheckningar att ombasera" -#: builtin/rebase.c:1445 +#: builtin/rebase.c:1451 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" "(AVRÅDS) försök återskapa sammanslagningar istället för att ignorera dem" -#: builtin/rebase.c:1449 +#: builtin/rebase.c:1455 msgid "preserve empty commits during rebase" msgstr "behåll tomma incheckningar under ombasering" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1457 msgid "move commits that begin with squash!/fixup! under -i" msgstr "flytta incheckningar som börjar med squash!/fixup! under -i" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1463 msgid "automatically stash/stash pop before and after" msgstr "utför automatiskt stash/stash pop före och efter" -#: builtin/rebase.c:1459 +#: builtin/rebase.c:1465 msgid "add exec lines after each commit of the editable list" msgstr "lägg till exec-rader efter varje incheckning i den redigerbara listan" -#: builtin/rebase.c:1463 +#: builtin/rebase.c:1469 msgid "allow rebasing commits with empty messages" msgstr "tillåt ombasering av incheckningar med tomt meddelande" -#: builtin/rebase.c:1466 +#: builtin/rebase.c:1472 msgid "try to rebase merges instead of skipping them" msgstr "försök ombasera sammanslagningar istället för att ignorera dem" -#: builtin/rebase.c:1469 +#: builtin/rebase.c:1475 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "använd \"merge-base --fork-point\" för att förfina uppström" -#: builtin/rebase.c:1471 +#: builtin/rebase.c:1477 msgid "use the given merge strategy" msgstr "använd angiven sammanslagningsstrategi" -#: builtin/rebase.c:1473 builtin/revert.c:114 +#: builtin/rebase.c:1479 builtin/revert.c:115 msgid "option" msgstr "alternativ" -#: builtin/rebase.c:1474 +#: builtin/rebase.c:1480 msgid "pass the argument through to the merge strategy" msgstr "sänd flaggan till sammanslagningsstrategin" -#: builtin/rebase.c:1477 +#: builtin/rebase.c:1483 msgid "rebase all reachable commits up to the root(s)" msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna" -#: builtin/rebase.c:1498 +#: builtin/rebase.c:1500 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -16904,29 +17397,29 @@ msgstr "" "stödet för rebase.useBuiltin har tagits bort!\n" "Se posten för det i \"git help config\" för detaljer." -#: builtin/rebase.c:1504 +#: builtin/rebase.c:1506 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera." -#: builtin/rebase.c:1545 +#: builtin/rebase.c:1547 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "git rebase --preserve-merges avråds från. Använd --rebase-merges istället." -#: builtin/rebase.c:1549 +#: builtin/rebase.c:1551 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: builtin/rebase.c:1553 +#: builtin/rebase.c:1555 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering." -#: builtin/rebase.c:1576 +#: builtin/rebase.c:1578 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: builtin/rebase.c:1588 +#: builtin/rebase.c:1590 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -16934,21 +17427,16 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: builtin/rebase.c:1607 +#: builtin/rebase.c:1609 msgid "could not discard worktree changes" msgstr "kunde inte kasta ändringar i arbetskatalogen" -#: builtin/rebase.c:1626 +#: builtin/rebase.c:1628 #, c-format msgid "could not move back to %s" msgstr "kunde inte flytta tillbaka till %s" -#: builtin/rebase.c:1637 builtin/rm.c:369 -#, c-format -msgid "could not remove '%s'" -msgstr "kunde inte ta bort \"%s\"" - -#: builtin/rebase.c:1663 +#: builtin/rebase.c:1673 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -16969,172 +17457,176 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där.\n" -#: builtin/rebase.c:1684 +#: builtin/rebase.c:1694 msgid "switch `C' expects a numerical value" msgstr "flaggan \"C\" förväntar ett numeriskt värde" -#: builtin/rebase.c:1725 +#: builtin/rebase.c:1735 #, c-format msgid "Unknown mode: %s" msgstr "Okänt läge: %s" -#: builtin/rebase.c:1747 +#: builtin/rebase.c:1757 msgid "--strategy requires --merge or --interactive" msgstr "--strategy kräver --merge eller --interactive" -#: builtin/rebase.c:1796 +#: builtin/rebase.c:1797 +msgid "--reschedule-failed-exec requires --exec or --interactive" +msgstr "--reschedule-failed-exec kräver --exec eller --interactive" + +#: builtin/rebase.c:1809 msgid "cannot combine am options with either interactive or merge options" msgstr "" "kan inte kombinera am-flaggor med varken interaktiv- eller " "sammanslagningsflaggor" -#: builtin/rebase.c:1815 +#: builtin/rebase.c:1828 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\"" -#: builtin/rebase.c:1819 +#: builtin/rebase.c:1832 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec" "\"" -#: builtin/rebase.c:1825 +#: builtin/rebase.c:1838 msgid "cannot combine '--rebase-merges' with '--strategy-option'" msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy-option\"" -#: builtin/rebase.c:1828 +#: builtin/rebase.c:1841 msgid "cannot combine '--rebase-merges' with '--strategy'" msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy\"" -#: builtin/rebase.c:1852 +#: builtin/rebase.c:1865 #, c-format msgid "invalid upstream '%s'" -msgstr "felaktig uppström ”%s”" +msgstr "felaktig uppström \"%s\"" -#: builtin/rebase.c:1858 +#: builtin/rebase.c:1871 msgid "Could not create new root commit" msgstr "kunde inte skapa ny rotincheckning" -#: builtin/rebase.c:1876 +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "\"%s\": behöver precis en sammanslagningsbas" -#: builtin/rebase.c:1883 +#: builtin/rebase.c:1896 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "Pekar inte på en giltig incheckning: \"%s\"" -#: builtin/rebase.c:1908 +#: builtin/rebase.c:1921 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\"" -#: builtin/rebase.c:1916 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1933 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 +#: builtin/submodule--helper.c:1934 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/rebase.c:1927 +#: builtin/rebase.c:1940 msgid "Could not resolve HEAD to a revision" msgstr "Kunde inte bestämma HEAD:s incheckning" -#: builtin/rebase.c:1968 +#: builtin/rebase.c:1981 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: builtin/rebase.c:1971 +#: builtin/rebase.c:1984 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Oväntat svar från stash: \"%s\"" -#: builtin/rebase.c:1977 +#: builtin/rebase.c:1990 #, c-format msgid "Could not create directory for '%s'" msgstr "Kunde inte skapa katalog för \"%s\"" -#: builtin/rebase.c:1980 +#: builtin/rebase.c:1993 #, c-format msgid "Created autostash: %s\n" msgstr "Skapade autostash: %s\n" -#: builtin/rebase.c:1983 +#: builtin/rebase.c:1996 msgid "could not reset --hard" msgstr "kunde inte utföra \"reset --hard\"" -#: builtin/rebase.c:1984 builtin/reset.c:114 +#: builtin/rebase.c:1997 builtin/reset.c:114 #, c-format msgid "HEAD is now at %s" msgstr "HEAD är nu på %s" -#: builtin/rebase.c:2000 +#: builtin/rebase.c:2013 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: builtin/rebase.c:2027 +#: builtin/rebase.c:2040 #, c-format msgid "could not parse '%s'" msgstr "kunde inte tolka \"%s\"" -#: builtin/rebase.c:2040 +#: builtin/rebase.c:2053 #, c-format msgid "could not switch to %s" msgstr "kunde inte växla till %s" -#: builtin/rebase.c:2051 +#: builtin/rebase.c:2064 msgid "HEAD is up to date." msgstr "HEAD är à jour." -#: builtin/rebase.c:2053 +#: builtin/rebase.c:2066 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Aktuell gren %s är à jour.\n" -#: builtin/rebase.c:2061 +#: builtin/rebase.c:2074 msgid "HEAD is up to date, rebase forced." msgstr "HEAD är à jour, ombasering framtvingad." -#: builtin/rebase.c:2063 +#: builtin/rebase.c:2076 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Aktuell gren %s är à jour, ombasering framtvingad.\n" -#: builtin/rebase.c:2071 +#: builtin/rebase.c:2084 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: builtin/rebase.c:2078 +#: builtin/rebase.c:2091 #, c-format msgid "Changes to %s:\n" msgstr "Ändringar till %s:\n" -#: builtin/rebase.c:2081 +#: builtin/rebase.c:2094 #, c-format msgid "Changes from %s to %s:\n" msgstr "Ändringar från %s till %s:\n" -#: builtin/rebase.c:2106 +#: builtin/rebase.c:2119 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det...\n" -#: builtin/rebase.c:2115 +#: builtin/rebase.c:2128 msgid "Could not detach HEAD" msgstr "Kunde inte koppla från HEAD" -#: builtin/rebase.c:2124 +#: builtin/rebase.c:2137 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Snabbspolade %s till %s.\n" -#: builtin/receive-pack.c:33 +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-katalog>" -#: builtin/receive-pack.c:833 +#: builtin/receive-pack.c:832 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -17164,7 +17656,7 @@ msgstr "" "För att undvika detta meddelande och fortfarande behålla det\n" "normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"." -#: builtin/receive-pack.c:853 +#: builtin/receive-pack.c:852 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -17185,11 +17677,11 @@ msgstr "" "\n" "För att undvika detta meddelande kan du sätta det till \"refuse\"." -#: builtin/receive-pack.c:1940 +#: builtin/receive-pack.c:1938 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:1954 +#: builtin/receive-pack.c:1952 msgid "You must specify a directory." msgstr "Du måste ange en katalog." @@ -17772,112 +18264,112 @@ msgstr "" "Använd --no-write-bitmap-index eller inaktivera inställningen\n" "pack.writebitmaps" -#: builtin/repack.c:200 +#: builtin/repack.c:201 msgid "could not start pack-objects to repack promisor objects" msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt" -#: builtin/repack.c:239 builtin/repack.c:414 +#: builtin/repack.c:240 builtin/repack.c:418 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Förväntar kompletta hex-objekt-ID-rader endast från pack-objects." -#: builtin/repack.c:256 +#: builtin/repack.c:257 msgid "could not finish pack-objects to repack promisor objects" msgstr "kunde inte avsluta pack-objects för att packa om kontraktsobjekt" -#: builtin/repack.c:294 +#: builtin/repack.c:295 msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" -#: builtin/repack.c:296 +#: builtin/repack.c:297 msgid "same as -a, and turn unreachable objects loose" msgstr "samma som -a, och gör onåbara objekt lösa" -#: builtin/repack.c:299 +#: builtin/repack.c:300 msgid "remove redundant packs, and run git-prune-packed" msgstr "ta bort överflödiga paket, och kör git-prune-packed" -#: builtin/repack.c:301 +#: builtin/repack.c:302 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "sänd --no-reuse-delta till git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:304 msgid "pass --no-reuse-object to git-pack-objects" msgstr "sänd --no-reuse-object till git-pack-objects" -#: builtin/repack.c:305 +#: builtin/repack.c:306 msgid "do not run git-update-server-info" msgstr "kör inte git-update-server-info" -#: builtin/repack.c:308 +#: builtin/repack.c:309 msgid "pass --local to git-pack-objects" msgstr "sänd --local till git-pack-objects" -#: builtin/repack.c:310 +#: builtin/repack.c:311 msgid "write bitmap index" msgstr "skriv bitkartindex" -#: builtin/repack.c:312 +#: builtin/repack.c:313 msgid "pass --delta-islands to git-pack-objects" msgstr "sänd --delta-islands till git-pack-objects" -#: builtin/repack.c:313 +#: builtin/repack.c:314 msgid "approxidate" msgstr "cirkadatum" -#: builtin/repack.c:314 +#: builtin/repack.c:315 msgid "with -A, do not loosen objects older than this" msgstr "med -A, lös inte upp objekt äldre än detta" -#: builtin/repack.c:316 +#: builtin/repack.c:317 msgid "with -a, repack unreachable objects" msgstr "med -a, packa om onåbara objekt" -#: builtin/repack.c:318 +#: builtin/repack.c:319 msgid "size of the window used for delta compression" msgstr "storlek på fönster använt för deltakomprimering" -#: builtin/repack.c:319 builtin/repack.c:325 +#: builtin/repack.c:320 builtin/repack.c:326 msgid "bytes" msgstr "byte" -#: builtin/repack.c:320 +#: builtin/repack.c:321 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:322 +#: builtin/repack.c:323 msgid "limits the maximum delta depth" msgstr "begränsa maximalt deltadjup" -#: builtin/repack.c:324 +#: builtin/repack.c:325 msgid "limits the maximum number of threads" msgstr "begränsar maximalt antal trådar" -#: builtin/repack.c:326 +#: builtin/repack.c:327 msgid "maximum size of each packfile" msgstr "maximal storlek på varje paketfil" -#: builtin/repack.c:328 +#: builtin/repack.c:329 msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:330 +#: builtin/repack.c:331 msgid "do not repack this pack" msgstr "packa inte om detta paket" -#: builtin/repack.c:340 +#: builtin/repack.c:341 msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" -#: builtin/repack.c:344 +#: builtin/repack.c:345 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable och -A kan inte användas samtidigt" -#: builtin/repack.c:423 +#: builtin/repack.c:427 msgid "Nothing new to pack." msgstr "Inget nytt att packa." -#: builtin/repack.c:484 +#: builtin/repack.c:488 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -17896,7 +18388,7 @@ msgstr "" "VARNING: namnet misslyckades också.\n" "VARNING: Byt namn på dem i %s manuellt:\n" -#: builtin/repack.c:532 +#: builtin/repack.c:536 #, c-format msgid "failed to remove '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -18303,24 +18795,24 @@ 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:405 +#: builtin/rev-list.c:412 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "kan inte kombinera --exclude-promisor-objects och --missing" -#: builtin/rev-list.c:466 +#: builtin/rev-list.c:473 msgid "object filtering requires --objects" msgstr "objektfiltrering kräver --objects" -#: builtin/rev-list.c:469 +#: builtin/rev-list.c:476 #, c-format msgid "invalid sparse value '%s'" msgstr "ogiltigt värde för sparse: \"%s\"" -#: builtin/rev-list.c:510 +#: builtin/rev-list.c:527 msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" -#: builtin/rev-list.c:513 +#: builtin/rev-list.c:530 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering" @@ -18393,47 +18885,51 @@ msgstr "återuppta revert- eller cherry-pick-sekvens" msgid "cancel revert or cherry-pick sequence" msgstr "avbryt revert- eller cherry-pick-sekvens" -#: builtin/revert.c:106 +#: builtin/revert.c:105 +msgid "skip current commit and continue" +msgstr "hoppa över nuvarande incheckning och fortsätt" + +#: builtin/revert.c:107 msgid "don't automatically commit" msgstr "checka inte in automatiskt" -#: builtin/revert.c:107 +#: builtin/revert.c:108 msgid "edit the commit message" msgstr "redigera incheckningsmeddelandet" -#: builtin/revert.c:110 +#: builtin/revert.c:111 msgid "parent-number" msgstr "nummer-på-förälder" -#: builtin/revert.c:111 +#: builtin/revert.c:112 msgid "select mainline parent" msgstr "välj förälder för huvudlinje" -#: builtin/revert.c:113 +#: builtin/revert.c:114 msgid "merge strategy" msgstr "sammanslagningsstrategi" -#: builtin/revert.c:115 +#: builtin/revert.c:116 msgid "option for merge strategy" msgstr "alternativ för sammanslagningsstrategi" -#: builtin/revert.c:124 +#: builtin/revert.c:125 msgid "append commit name" msgstr "lägg till incheckningsnamn" -#: builtin/revert.c:126 +#: builtin/revert.c:127 msgid "preserve initially empty commits" msgstr "behåll incheckningar som börjar som tomma" -#: builtin/revert.c:128 +#: builtin/revert.c:129 msgid "keep redundant, empty commits" msgstr "behåll redundanta, tomma incheckningar" -#: builtin/revert.c:227 +#: builtin/revert.c:232 msgid "revert failed" msgstr "\"revert\" misslyckades" -#: builtin/revert.c:240 +#: builtin/revert.c:245 msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" @@ -18603,120 +19099,120 @@ msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "ignorerar %s; kan inte hantera mer än %d referens" msgstr[1] "ignorerar %s; kan inte hantera mer än %d referenser" -#: builtin/show-branch.c:549 +#: builtin/show-branch.c:548 #, c-format msgid "no matching refs with %s" msgstr "inga motsvarande referenser med %s" -#: builtin/show-branch.c:646 +#: builtin/show-branch.c:645 msgid "show remote-tracking and local branches" msgstr "visa fjärrspårande och lokala grenar" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:647 msgid "show remote-tracking branches" msgstr "visa fjärrspårande grenar" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:649 msgid "color '*!+-' corresponding to the branch" msgstr "färga \"*!+-\" enligt grenen" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:651 msgid "show <n> more commits after the common ancestor" msgstr "visa <n> ytterligare incheckningar efter gemensam anfader" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:653 msgid "synonym to more=-1" msgstr "synonym till more=-1" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:654 msgid "suppress naming strings" msgstr "undertyck namnsträngar" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:656 msgid "include the current branch" msgstr "inkludera aktuell gren" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "name commits with their object names" msgstr "namnge incheckningar med deras objektnamn" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:660 msgid "show possible merge bases" msgstr "visa möjliga sammanslagningsbaser" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:662 msgid "show refs unreachable from any other ref" msgstr "visa referenser som inte kan nås från någon annan referens" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:664 msgid "show commits in topological order" msgstr "visa incheckningar i topologisk ordning" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:667 msgid "show only commits not on the first branch" msgstr "visa endast incheckningar inte på den första grenen" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:669 msgid "show merges reachable from only one tip" msgstr "visa sammanslagningar som endast kan nås från en spets" -#: builtin/show-branch.c:672 +#: builtin/show-branch.c:671 msgid "topologically sort, maintaining date order where possible" msgstr "sortera topologiskt, behåll datumordning när möjligt" -#: builtin/show-branch.c:675 +#: builtin/show-branch.c:674 msgid "<n>[,<base>]" msgstr "<n>[,<bas>]" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:675 msgid "show <n> most recent ref-log entries starting at base" msgstr "visa <n> nyaste refloggposter med början på bas" -#: builtin/show-branch.c:712 +#: builtin/show-branch.c:711 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "" "--reflog är inkompatibel med --all, --remotes, --independent eller --merge-" "base" -#: builtin/show-branch.c:736 +#: builtin/show-branch.c:735 msgid "no branches given, and HEAD is not valid" msgstr "inga grenar angavs, och HEAD är inte giltigt" -#: builtin/show-branch.c:739 +#: builtin/show-branch.c:738 msgid "--reflog option needs one branch name" msgstr "--reflog behöver ett namn på en gren" -#: builtin/show-branch.c:742 +#: builtin/show-branch.c:741 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "maximalt %d poster kan visas samtidigt." msgstr[1] "maximalt %d poster kan visas samtidigt." -#: builtin/show-branch.c:746 +#: builtin/show-branch.c:745 #, c-format msgid "no such ref %s" msgstr "ingen sådan referens %s" -#: builtin/show-branch.c:832 +#: builtin/show-branch.c:831 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "kan inte hantera mer än %d revision." msgstr[1] "kan inte hantera mer än %d revisioner." -#: builtin/show-branch.c:836 +#: builtin/show-branch.c:835 #, c-format msgid "'%s' is not a valid ref." msgstr "\"%s\" är inte en giltig referens." -#: builtin/show-branch.c:839 +#: builtin/show-branch.c:838 #, c-format msgid "cannot find commit %s (%s)" msgstr "hittar inte incheckning %s (%s)" -#: builtin/show-ref.c:11 +#: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" @@ -18724,39 +19220,39 @@ msgstr "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mönster>...]" -#: builtin/show-ref.c:12 +#: builtin/show-ref.c:13 msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<mönster>]" -#: builtin/show-ref.c:161 +#: builtin/show-ref.c:162 msgid "only show tags (can be combined with heads)" msgstr "visa endast taggar (kan kombineras med huvuden)" -#: builtin/show-ref.c:162 +#: builtin/show-ref.c:163 msgid "only show heads (can be combined with tags)" msgstr "visa endast huvuden (kan kombineras med taggar)" -#: builtin/show-ref.c:163 +#: builtin/show-ref.c:164 msgid "stricter reference checking, requires exact ref path" msgstr "striktare referenskontroll, kräver exakt referenssökväg" -#: builtin/show-ref.c:166 builtin/show-ref.c:168 +#: builtin/show-ref.c:167 builtin/show-ref.c:169 msgid "show the HEAD reference, even if it would be filtered out" msgstr "visa HEAD-refrens, även när den skulle filtreras ut" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:171 msgid "dereference tags into object IDs" msgstr "avreferera taggar till objekt-id" -#: builtin/show-ref.c:172 +#: builtin/show-ref.c:173 msgid "only show SHA1 hash using <n> digits" msgstr "visa SHA1-hash endast med <n> siffror" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:177 msgid "do not print results to stdout (useful with --verify)" msgstr "visa inte resultat på standard ut (användbart med --verify)" -#: builtin/show-ref.c:178 +#: builtin/show-ref.c:179 msgid "show refs from stdin that aren't in local repository" msgstr "visa referenser från standard in som inte finns i lokalt arkiv" @@ -18826,7 +19322,7 @@ msgstr "För många revisioner angivna:%s" #: builtin/stash.c:161 git-legacy-stash.sh:548 msgid "No stash entries found." -msgstr "Inga ”stash”-poster hittades." +msgstr "Inga \"stash\"-poster hittades." #: builtin/stash.c:175 #, c-format @@ -18894,94 +19390,94 @@ msgstr "Stash-posten behålls ifall du behöver den igen." msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: builtin/stash.c:789 builtin/stash.c:826 +#: builtin/stash.c:790 builtin/stash.c:827 #, c-format msgid "Cannot update %s with %s" msgstr "Kan inte uppdatera %s med %s" -#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510 +#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 msgid "stash message" msgstr "\"stash\"-meddelande" -#: builtin/stash.c:817 +#: builtin/stash.c:818 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" kräver ett <incheckning>-argument" -#: builtin/stash.c:1039 git-legacy-stash.sh:217 +#: builtin/stash.c:1040 git-legacy-stash.sh:217 msgid "No changes selected" msgstr "Inga ändringar valda" -#: builtin/stash.c:1135 git-legacy-stash.sh:150 +#: builtin/stash.c:1136 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "Du har inte den första incheckningen ännu" -#: builtin/stash.c:1162 git-legacy-stash.sh:165 +#: builtin/stash.c:1163 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "Kan inte spara aktuellt tillstånd för indexet" -#: builtin/stash.c:1171 git-legacy-stash.sh:180 +#: builtin/stash.c:1172 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "Kan inte spara ospårade filer" -#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200 +#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 #: git-legacy-stash.sh:213 msgid "Cannot save the current worktree state" msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" -#: builtin/stash.c:1219 git-legacy-stash.sh:233 +#: builtin/stash.c:1220 git-legacy-stash.sh:233 msgid "Cannot record working tree state" msgstr "Kan inte registrera tillstånd för arbetskatalog" -#: builtin/stash.c:1268 git-legacy-stash.sh:337 +#: builtin/stash.c:1269 git-legacy-stash.sh:337 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt" -#: builtin/stash.c:1284 +#: builtin/stash.c:1285 msgid "Did you forget to 'git add'?" msgstr "Glömde du använda \"git add\"?" -#: builtin/stash.c:1299 git-legacy-stash.sh:345 +#: builtin/stash.c:1300 git-legacy-stash.sh:345 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" -#: builtin/stash.c:1306 git-legacy-stash.sh:350 +#: builtin/stash.c:1307 git-legacy-stash.sh:350 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: builtin/stash.c:1321 git-legacy-stash.sh:354 +#: builtin/stash.c:1322 git-legacy-stash.sh:354 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" -#: builtin/stash.c:1326 +#: builtin/stash.c:1327 #, c-format msgid "Saved working directory and index state %s" msgstr "Sparade arbetskatalogen och indexstatus %s" -#: builtin/stash.c:1430 git-legacy-stash.sh:384 +#: builtin/stash.c:1417 git-legacy-stash.sh:384 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: builtin/stash.c:1465 builtin/stash.c:1501 +#: builtin/stash.c:1452 builtin/stash.c:1488 msgid "keep index" msgstr "behåll indexet" -#: builtin/stash.c:1467 builtin/stash.c:1503 +#: builtin/stash.c:1454 builtin/stash.c:1490 msgid "stash in patch mode" msgstr "\"stash\" i \"patch\"-läge" -#: builtin/stash.c:1468 builtin/stash.c:1504 +#: builtin/stash.c:1455 builtin/stash.c:1491 msgid "quiet mode" msgstr "tyst läge" -#: builtin/stash.c:1470 builtin/stash.c:1506 +#: builtin/stash.c:1457 builtin/stash.c:1493 msgid "include untracked files in stash" msgstr "ta med ospårade filer i \"stash\"" -#: builtin/stash.c:1472 builtin/stash.c:1508 +#: builtin/stash.c:1459 builtin/stash.c:1495 msgid "include ignore files" msgstr "ta med ignorerade filer" -#: builtin/stash.c:1568 +#: builtin/stash.c:1555 #, c-format msgid "could not exec %s" msgstr "kunde inte köra %s" @@ -19002,7 +19498,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:45 builtin/submodule--helper.c:1942 +#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" @@ -19016,7 +19512,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:408 builtin/submodule--helper.c:1367 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" @@ -19024,8 +19520,8 @@ 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:470 builtin/submodule--helper.c:627 -#: builtin/submodule--helper.c:650 +#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 +#: builtin/submodule--helper.c:651 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules" @@ -19044,7 +19540,7 @@ msgstr "" "run_command returnerade icke-nollstatus för %s\n" "." -#: builtin/submodule--helper.c:546 +#: builtin/submodule--helper.c:547 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -19055,19 +19551,19 @@ msgstr "" "undermoduler för %s\n" "." -#: builtin/submodule--helper.c:562 +#: builtin/submodule--helper.c:563 msgid "Suppress output of entering each submodule command" msgstr "Dölj utdata från för varje undermodulskommando som startas" -#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049 +#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 msgid "Recurse into nested submodules" msgstr "Rekursera in i nästlade undermoduler" -#: builtin/submodule--helper.c:569 +#: builtin/submodule--helper.c:570 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]" -#: builtin/submodule--helper.c:596 +#: builtin/submodule--helper.c:597 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -19076,54 +19572,54 @@ msgstr "" "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget " "officiella uppström." -#: builtin/submodule--helper.c:664 +#: builtin/submodule--helper.c:665 #, 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:668 +#: builtin/submodule--helper.c:669 #, 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:678 +#: builtin/submodule--helper.c:679 #, 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:685 +#: builtin/submodule--helper.c:686 #, 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:707 +#: builtin/submodule--helper.c:708 msgid "Suppress output for initializing a submodule" msgstr "Dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:712 +#: builtin/submodule--helper.c:713 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<flaggor>] [<sökväg>]" -#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910 +#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 #, 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:823 +#: builtin/submodule--helper.c:824 #, 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:850 builtin/submodule--helper.c:1019 +#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "misslyckades rekursera in i undermodulen \"%s\"" -#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 msgid "Suppress submodule status output" msgstr "Hindra statusutskrift för undermodul" -#: builtin/submodule--helper.c:875 +#: builtin/submodule--helper.c:876 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -19131,47 +19627,47 @@ msgstr "" "Visa incheckning från indexet istället för den som lagrats i undermodulens " "HEAD" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:877 msgid "recurse into nested submodules" msgstr "rekursera in i nästlade undermoduler" -#: builtin/submodule--helper.c:881 +#: builtin/submodule--helper.c:882 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]" -#: builtin/submodule--helper.c:905 +#: builtin/submodule--helper.c:906 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sökväg>" -#: builtin/submodule--helper.c:969 +#: builtin/submodule--helper.c:970 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synkroniserar undermodul-url för \"%s\"\n" -#: builtin/submodule--helper.c:975 +#: builtin/submodule--helper.c:976 #, 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:989 +#: builtin/submodule--helper.c:990 #, 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:1000 +#: builtin/submodule--helper.c:1001 #, 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:1047 +#: builtin/submodule--helper.c:1048 msgid "Suppress output of synchronizing submodule url" msgstr "Dölj utdata från synkroniering av undermodul-url" -#: builtin/submodule--helper.c:1054 +#: builtin/submodule--helper.c:1055 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]" -#: builtin/submodule--helper.c:1108 +#: builtin/submodule--helper.c:1109 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -19180,7 +19676,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:1120 +#: builtin/submodule--helper.c:1121 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -19189,81 +19685,81 @@ msgstr "" "Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort " "dem" -#: builtin/submodule--helper.c:1128 +#: builtin/submodule--helper.c:1129 #, c-format msgid "Cleared directory '%s'\n" msgstr "Rensade katalogen \"%s\"\n" -#: builtin/submodule--helper.c:1130 +#: builtin/submodule--helper.c:1131 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n" -#: builtin/submodule--helper.c:1141 +#: builtin/submodule--helper.c:1142 #, c-format msgid "could not create empty submodule directory %s" msgstr "kunde inte skapa tom undermodulskatalog %s" -#: builtin/submodule--helper.c:1157 +#: builtin/submodule--helper.c:1158 #, 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:1186 +#: builtin/submodule--helper.c:1187 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:1187 +#: builtin/submodule--helper.c:1188 msgid "Unregister all submodules" msgstr "Avregistrera alla undermoduler" -#: builtin/submodule--helper.c:1192 +#: builtin/submodule--helper.c:1193 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]" -#: builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1207 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:1301 builtin/submodule--helper.c:1304 +#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s" -#: builtin/submodule--helper.c:1340 +#: builtin/submodule--helper.c:1341 #, 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:1347 +#: builtin/submodule--helper.c:1348 #, 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:1370 +#: builtin/submodule--helper.c:1371 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen skall klonas till" -#: builtin/submodule--helper.c:1373 +#: builtin/submodule--helper.c:1374 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:1376 +#: builtin/submodule--helper.c:1377 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:1384 +#: builtin/submodule--helper.c:1385 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871 +#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 msgid "force cloning progress" msgstr "tvinga kloningsförlopp" -#: builtin/submodule--helper.c:1392 +#: builtin/submodule--helper.c:1393 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -19271,93 +19767,93 @@ msgstr "" "git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference " "<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>" -#: builtin/submodule--helper.c:1423 +#: builtin/submodule--helper.c:1424 #, c-format msgid "clone of '%s' into submodule path '%s' failed" -msgstr "misslyckades klona \"%s\" till undermodulsökvägen ”%s”" +msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\"" -#: builtin/submodule--helper.c:1437 +#: builtin/submodule--helper.c:1438 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" -#: builtin/submodule--helper.c:1473 +#: builtin/submodule--helper.c:1474 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Ogiltigt uppdateringsläge \"%s\" för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1477 +#: builtin/submodule--helper.c:1478 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Ogiltigt uppdateringsläge \"%s\" konfigurerat för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1570 +#: builtin/submodule--helper.c:1571 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:1574 +#: builtin/submodule--helper.c:1575 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:1604 +#: builtin/submodule--helper.c:1605 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:1633 +#: builtin/submodule--helper.c:1634 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" -#: builtin/submodule--helper.c:1777 +#: builtin/submodule--helper.c:1778 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" -#: builtin/submodule--helper.c:1788 +#: builtin/submodule--helper.c:1789 #, 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:1850 builtin/submodule--helper.c:2092 +#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:1853 +#: builtin/submodule--helper.c:1854 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:1857 +#: builtin/submodule--helper.c:1858 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:1863 +#: builtin/submodule--helper.c:1864 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:1866 +#: builtin/submodule--helper.c:1867 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:1868 +#: builtin/submodule--helper.c:1869 msgid "whether the initial clone should follow the shallow recommendation" msgstr "om den första klonen skall följa rekommendation för grund kloning" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:1870 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:1876 +#: builtin/submodule--helper.c:1877 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:1889 +#: builtin/submodule--helper.c:1890 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:1937 +#: builtin/submodule--helper.c:1938 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -19366,16 +19862,16 @@ 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:2060 +#: builtin/submodule--helper.c:2061 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "kunde inte få tag i arkivhandtag för undermodulen \"%s\"" -#: builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:2094 msgid "recurse into submodules" msgstr "rekursera ner i undermoduler" -#: builtin/submodule--helper.c:2099 +#: builtin/submodule--helper.c:2100 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]" @@ -19404,7 +19900,7 @@ msgstr "git submodule--helper config --check-writeable" 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:2235 git.c:433 git.c:685 +#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" @@ -19469,17 +19965,17 @@ msgstr "" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<format>] <taggnamn>..." -#: builtin/tag.c:88 +#: builtin/tag.c:89 #, c-format msgid "tag '%s' not found." msgstr "taggen \"%s\" hittades inte." -#: builtin/tag.c:104 +#: builtin/tag.c:105 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tog bort tagg \"%s\" (var %s)\n" -#: builtin/tag.c:134 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -19492,7 +19988,7 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/tag.c:138 +#: builtin/tag.c:139 #, c-format msgid "" "\n" @@ -19507,159 +20003,159 @@ msgstr "" "Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n" "du vill.\n" -#: builtin/tag.c:192 +#: builtin/tag.c:198 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:194 +#: builtin/tag.c:200 msgid "unable to write tag file" msgstr "kunde inte skriva tagg-filen" -#: builtin/tag.c:210 +#: builtin/tag.c:216 #, c-format msgid "" -"You have created a nested tag. The object referred to by your new is\n" +"You have created a nested tag. The object referred to by your new tag is\n" "already a tag. If you meant to tag the object that it points to, use:\n" "\n" "\tgit tag -f %s %s^{}" msgstr "" -"Du har skapat en nästlad tagg. Objektet som refereras av din nya är\n" +"Du har skapat en nästlad tagg. Objektet som refereras av din nya tagg är\n" "redan en tagg. Om du skulle tagga objektet den pekar på, använd:\n" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:226 +#: builtin/tag.c:232 msgid "bad object type." msgstr "felaktig objekttyp." -#: builtin/tag.c:278 +#: builtin/tag.c:284 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:285 +#: builtin/tag.c:291 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:396 +#: builtin/tag.c:402 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:398 +#: builtin/tag.c:404 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:400 +#: builtin/tag.c:406 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:401 +#: builtin/tag.c:407 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:403 +#: builtin/tag.c:409 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:405 +#: builtin/tag.c:411 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:407 +#: builtin/tag.c:413 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:409 +#: builtin/tag.c:415 msgid "force edit of tag message" msgstr "tvinga redigering av incheckningsmeddelande" -#: builtin/tag.c:410 +#: builtin/tag.c:416 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:413 +#: builtin/tag.c:419 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:414 +#: builtin/tag.c:420 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:415 builtin/update-ref.c:369 +#: builtin/tag.c:421 builtin/update-ref.c:369 msgid "create a reflog" msgstr "skapa en reflog" -#: builtin/tag.c:417 +#: builtin/tag.c:423 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:418 +#: builtin/tag.c:424 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:419 builtin/tag.c:421 +#: builtin/tag.c:425 builtin/tag.c:427 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:420 builtin/tag.c:422 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that don't contain the commit" msgstr "visa endast taggar som inte innehåller incheckningen" -#: builtin/tag.c:423 +#: builtin/tag.c:429 msgid "print only tags that are merged" msgstr "visa endast taggar som slagits samman" -#: builtin/tag.c:424 +#: builtin/tag.c:430 msgid "print only tags that are not merged" msgstr "visa endast taggar som ej slagits samman" -#: builtin/tag.c:428 +#: builtin/tag.c:434 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:472 +#: builtin/tag.c:482 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" -#: builtin/tag.c:494 +#: builtin/tag.c:504 msgid "-n option is only allowed in list mode" msgstr "Flaggan -n är endast tillåten i listläge" -#: builtin/tag.c:496 +#: builtin/tag.c:506 msgid "--contains option is only allowed in list mode" msgstr "Flaggan --contains är endast tillåten i listläge" -#: builtin/tag.c:498 +#: builtin/tag.c:508 msgid "--no-contains option is only allowed in list mode" msgstr "Flaggan --no-contains är endast tillåten i listläge" -#: builtin/tag.c:500 +#: builtin/tag.c:510 msgid "--points-at option is only allowed in list mode" msgstr "Flaggan --points-at är endast tillåten i listläge" -#: builtin/tag.c:502 +#: builtin/tag.c:512 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:513 +#: builtin/tag.c:523 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:532 +#: builtin/tag.c:542 msgid "too many params" msgstr "för många parametrar" -#: builtin/tag.c:538 +#: builtin/tag.c:548 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:543 +#: builtin/tag.c:553 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:574 +#: builtin/tag.c:584 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" @@ -19979,11 +20475,11 @@ msgstr "avbryt överföringen efter <n> sekunders inaktivitet" msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <incheckning>..." -#: builtin/verify-commit.c:76 +#: builtin/verify-commit.c:69 msgid "print commit contents" msgstr "visa innehåll för incheckning" -#: builtin/verify-commit.c:77 builtin/verify-tag.c:38 +#: builtin/verify-commit.c:70 builtin/verify-tag.c:38 msgid "print raw gpg status output" msgstr "visa råa gpg-statusdata" @@ -20035,7 +20531,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:891 +#: builtin/worktree.c:61 builtin/worktree.c:899 #, c-format msgid "failed to delete '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -20112,121 +20608,121 @@ msgstr "" "använd \"add -f\" för att överstyra, eller \"prune\" eller \"remove\" för " "att rensa" -#: builtin/worktree.c:302 +#: builtin/worktree.c:309 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:432 builtin/worktree.c:438 +#: builtin/worktree.c:440 builtin/worktree.c:446 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Förbereder arbetskatalog (ny gren \"%s\")" -#: builtin/worktree.c:434 +#: builtin/worktree.c:442 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Förbereder arbetskatalog (återställer gren \"%s\"; var på %s)" -#: builtin/worktree.c:443 +#: builtin/worktree.c:451 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Förbereder arbetskatalog (checkar ut \"%s\")" -#: builtin/worktree.c:449 +#: builtin/worktree.c:457 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)" -#: builtin/worktree.c:490 +#: builtin/worktree.c:498 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:493 +#: builtin/worktree.c:501 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:495 +#: builtin/worktree.c:503 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:497 +#: builtin/worktree.c:505 msgid "populate the new working tree" msgstr "befolka den nya arbetskatalogen" -#: builtin/worktree.c:498 +#: builtin/worktree.c:506 msgid "keep the new working tree locked" msgstr "låt arbetskatalogen förbli låst" -#: builtin/worktree.c:501 +#: builtin/worktree.c:509 msgid "set up tracking mode (see git-branch(1))" msgstr "ställ in spårningsläge (se git-branch(1))" -#: builtin/worktree.c:504 +#: builtin/worktree.c:512 msgid "try to match the new branch name with a remote-tracking branch" msgstr "försök matcha namn på ny gren mot en fjärrspårande gren" -#: builtin/worktree.c:512 +#: builtin/worktree.c:520 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" -#: builtin/worktree.c:573 +#: builtin/worktree.c:581 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:673 +#: builtin/worktree.c:681 msgid "reason for locking" msgstr "orsak till lås" -#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 -#: builtin/worktree.c:919 +#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 +#: builtin/worktree.c:927 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:687 builtin/worktree.c:720 +#: builtin/worktree.c:695 builtin/worktree.c:728 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:692 +#: builtin/worktree.c:700 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:694 +#: builtin/worktree.c:702 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:722 +#: builtin/worktree.c:730 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" -#: builtin/worktree.c:763 +#: builtin/worktree.c:771 msgid "working trees containing submodules cannot be moved or removed" msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort" -#: builtin/worktree.c:771 +#: builtin/worktree.c:779 msgid "force move even if worktree is dirty or locked" msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst" -#: builtin/worktree.c:794 builtin/worktree.c:921 +#: builtin/worktree.c:802 builtin/worktree.c:929 #, c-format msgid "'%s' is a main working tree" msgstr "\"%s\" är inte en huvudarbetskatalog" -#: builtin/worktree.c:799 +#: builtin/worktree.c:807 #, c-format msgid "could not figure out destination name from '%s'" msgstr "kunde inte lista ut målnamn från \"%s\"" -#: builtin/worktree.c:805 +#: builtin/worktree.c:813 #, c-format msgid "target '%s' already exists" msgstr "målet \"%s\" finns redan" -#: builtin/worktree.c:813 +#: builtin/worktree.c:821 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -20235,7 +20731,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:815 +#: builtin/worktree.c:823 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -20243,36 +20739,36 @@ 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:818 +#: builtin/worktree.c:826 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s" -#: builtin/worktree.c:823 +#: builtin/worktree.c:831 #, c-format msgid "failed to move '%s' to '%s'" msgstr "misslyckades flytta \"%s\" till \"%s\"" -#: builtin/worktree.c:871 +#: builtin/worktree.c:879 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "misslyckades köra \"git status\" på \"%s\"" -#: builtin/worktree.c:875 +#: builtin/worktree.c:883 #, c-format msgid "'%s' is dirty, use --force to delete it" msgstr "\"%s\" är smutsigt, använd --force för att ta bort det" -#: builtin/worktree.c:880 +#: builtin/worktree.c:888 #, 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:903 +#: builtin/worktree.c:911 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:926 +#: builtin/worktree.c:934 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -20281,7 +20777,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:928 +#: builtin/worktree.c:936 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -20289,7 +20785,7 @@ 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:931 +#: builtin/worktree.c:939 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s" @@ -20365,53 +20861,55 @@ msgstr "" msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" -"to read about a specific subcommand or concept." +"to read about a specific subcommand or concept.\n" +"See 'git help git' for an overview of the system." msgstr "" "\"git help -a\" och \"git help -g\" visar tillgängliga underkommandon och\n" "några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n" -"<koncept>\" för att läsa mer om specifika underkommandon och koncept." +"<koncept>\" för att läsa mer om specifika underkommandon och koncept.\n" +"See \"git help git\" för en översikt över systemet." -#: git.c:185 +#: git.c:186 #, c-format msgid "no directory given for --git-dir\n" msgstr "ingen katalog angavs för --git-dir\n" -#: git.c:199 +#: git.c:200 #, c-format msgid "no namespace given for --namespace\n" msgstr "ingen namnrymd angavs för --namespace\n" -#: git.c:213 +#: git.c:214 #, c-format msgid "no directory given for --work-tree\n" msgstr "ingen katalog angavs för --work-tree\n" -#: git.c:227 +#: git.c:228 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "inget prefix angavs för --super-prefix\n" -#: git.c:249 +#: git.c:250 #, c-format msgid "-c expects a configuration string\n" msgstr "-c förväntar en konfigurationssträng\n" -#: git.c:287 +#: git.c:288 #, c-format msgid "no directory given for -C\n" msgstr "ingen katalog angavs för -C\n" -#: git.c:313 +#: git.c:314 #, c-format msgid "unknown option: %s\n" msgstr "okänd flagga: %s\n" -#: git.c:359 +#: git.c:360 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "vid expandering av aliaset \"%s\": \"%s\"" -#: git.c:368 +#: git.c:369 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -20420,39 +20918,39 @@ msgstr "" "aliaset \"%s\" ändrar miljövariabler.\n" "Du kan använda \"!git\" i aliaset för att göra det" -#: git.c:376 +#: git.c:377 #, c-format msgid "empty alias for %s" msgstr "tomt alias för %s" -#: git.c:379 +#: git.c:380 #, c-format msgid "recursive alias: %s" msgstr "rekursivt alias: %s" -#: git.c:459 +#: git.c:460 msgid "write failure on standard output" msgstr "skrivfel på standard ut" -#: git.c:461 +#: git.c:462 msgid "unknown write failure on standard output" msgstr "okänt skrivfel på standard ut" -#: git.c:463 +#: git.c:464 msgid "close failed on standard output" msgstr "stäng misslyckades på standard ut" -#: git.c:797 +#: git.c:796 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "alias-slinga detekterades: expansionen av \"%s\" avslutas aldrig:%s" -#: git.c:847 +#: git.c:846 #, c-format msgid "cannot handle %s as a builtin" msgstr "kan inte hantera %s som inbyggd" -#: git.c:860 +#: git.c:859 #, c-format msgid "" "usage: %s\n" @@ -20461,13 +20959,13 @@ msgstr "" "användning: %s\n" "\n" -#: git.c:880 +#: git.c:879 #, 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:892 +#: git.c:891 #, c-format msgid "failed to run command '%s': %s\n" msgstr "misslyckades köra kommandot \"%s\": %s\n" @@ -20599,7 +21097,7 @@ msgstr "kan inte hämta med sha1 över smart http" #: remote-curl.c:1120 remote-curl.c:1126 #, c-format -msgid "protocol error: expected sha/ref, got %s'" +msgid "protocol error: expected sha/ref, got '%s'" msgstr "protokollfel: förväntade sha/ref, fick \"%s\"" #: remote-curl.c:1138 remote-curl.c:1252 @@ -20628,35 +21126,35 @@ msgstr "remote-curl: försökte ta emot utan lokalt arkiv" msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: okänt kommando \"%s\" från git" -#: list-objects-filter-options.h:63 +#: list-objects-filter-options.h:61 msgid "args" msgstr "argument" -#: list-objects-filter-options.h:64 +#: list-objects-filter-options.h:62 msgid "object filtering" msgstr "objektfiltrering" -#: parse-options.h:169 +#: parse-options.h:170 msgid "expiry-date" msgstr "giltig-till" -#: parse-options.h:183 +#: parse-options.h:184 msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakåtkompatibilitet)" -#: parse-options.h:296 +#: parse-options.h:305 msgid "be more verbose" msgstr "var mer pratsam" -#: parse-options.h:298 +#: parse-options.h:307 msgid "be more quiet" msgstr "var mer tyst" -#: parse-options.h:304 +#: parse-options.h:313 msgid "use <n> digits to display SHA-1s" msgstr "använd <n> siffror för att visa SHA-1:or" -#: parse-options.h:323 +#: parse-options.h:332 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" @@ -20672,6 +21170,14 @@ msgstr "fältnamn att sortera på" msgid "update the index with reused conflict resolution if possible" msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt" +#: wt-status.h:68 +msgid "HEAD detached at " +msgstr "HEAD frånkopplad vid " + +#: wt-status.h:69 +msgid "HEAD detached from " +msgstr "HEAD frånkopplad från " + #: command-list.h:50 msgid "Add file contents to the index" msgstr "Lägg filinnehåll till indexet" @@ -20715,7 +21221,7 @@ msgstr "Flytta objekt och referenser efter arkiv" #: command-list.h:60 msgid "Provide content or type and size information for repository objects" msgstr "" -"Visa innehåller eller typ- och storleksinformation för objekt i arkivet." +"Visa innehåller eller typ- och storleksinformation för objekt i arkivet" #: command-list.h:61 msgid "Display gitattributes information" @@ -21100,214 +21606,222 @@ msgid "Reset current HEAD to the specified state" msgstr "Återställ aktuell HEAD till angivet tillstånd" #: command-list.h:156 +msgid "Restore working tree files" +msgstr "Återställ filer i arbetskatalogen" + +#: command-list.h:157 msgid "Revert some existing commits" msgstr "Återställ några befintliga incheckningar" -#: command-list.h:157 +#: command-list.h:158 msgid "Lists commit objects in reverse chronological order" msgstr "Visa incheckningsobjekt i omvänd kronologisk ordning" -#: command-list.h:158 +#: command-list.h:159 msgid "Pick out and massage parameters" msgstr "Plocka ut och massera parametrar" -#: command-list.h:159 +#: command-list.h:160 msgid "Remove files from the working tree and from the index" msgstr "Ta bort filer från arbetskatalogen och från indexet" -#: command-list.h:160 +#: command-list.h:161 msgid "Send a collection of patches as emails" msgstr "Sänd en uppsättning patchar som e-post" -#: command-list.h:161 +#: command-list.h:162 msgid "Push objects over Git protocol to another repository" msgstr "Sänd objekt över Git-protokollet till annat arkiv" -#: command-list.h:162 +#: command-list.h:163 msgid "Restricted login shell for Git-only SSH access" msgstr "Begränsat inloggningsskal för SSH-åtkomst till bara Git" -#: command-list.h:163 +#: command-list.h:164 msgid "Summarize 'git log' output" msgstr "Summera \"git log\"-utdata" -#: command-list.h:164 +#: command-list.h:165 msgid "Show various types of objects" msgstr "Visa olika sorters objekt" -#: command-list.h:165 +#: command-list.h:166 msgid "Show branches and their commits" msgstr "Visa grenar och deras incheckningar" -#: command-list.h:166 +#: command-list.h:167 msgid "Show packed archive index" msgstr "Skapa packat arkivindex" -#: command-list.h:167 +#: command-list.h:168 msgid "List references in a local repository" msgstr "Visa referenser i ett lokalt arkiv" -#: command-list.h:168 +#: command-list.h:169 msgid "Git's i18n setup code for shell scripts" msgstr "Git:s i18n-startkod för skalskript" -#: command-list.h:169 +#: command-list.h:170 msgid "Common Git shell script setup code" msgstr "Gemensam skriptstartkod för Git" -#: command-list.h:170 +#: command-list.h:171 msgid "Stash the changes in a dirty working directory away" msgstr "Spara undan ändringar i en lortig arbetskatalog" -#: command-list.h:171 +#: command-list.h:172 msgid "Add file contents to the staging area" msgstr "Lägg filinnehållet till indexet" -#: command-list.h:172 +#: command-list.h:173 msgid "Show the working tree status" msgstr "Visa status för arbetskatalogen" -#: command-list.h:173 +#: command-list.h:174 msgid "Remove unnecessary whitespace" msgstr "Ta bort onödiga blanksteg" -#: command-list.h:174 +#: command-list.h:175 msgid "Initialize, update or inspect submodules" msgstr "Initiera, uppdatera eller inspektera undermoduler" -#: command-list.h:175 +#: command-list.h:176 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Dubbelriktad verkan mellan ett Subversion-arkiv och Git" -#: command-list.h:176 +#: command-list.h:177 +msgid "Switch branches" +msgstr "Byt gren" + +#: command-list.h:178 msgid "Read, modify and delete symbolic refs" msgstr "Läs, modifiera eller ta bort symbolisk referens" -#: command-list.h:177 +#: command-list.h:179 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt" -#: command-list.h:178 +#: command-list.h:180 msgid "Creates a temporary file with a blob's contents" msgstr "Skapar temporära filer med innehållet från en blob" -#: command-list.h:179 +#: command-list.h:181 msgid "Unpack objects from a packed archive" msgstr "Packa upp objekt från ett pakat arkiv" -#: command-list.h:180 +#: command-list.h:182 msgid "Register file contents in the working tree to the index" msgstr "Registrera filinnehållet från arbetskatalogen i indexet" -#: command-list.h:181 +#: command-list.h:183 msgid "Update the object name stored in a ref safely" msgstr "Uppdatera objektnamnet i en referens på ett säkert sätt" -#: command-list.h:182 +#: command-list.h:184 msgid "Update auxiliary info file to help dumb servers" msgstr "Uppdatera tilläggsinfofil för att hjälpa dumma servrar" -#: command-list.h:183 +#: command-list.h:185 msgid "Send archive back to git-archive" msgstr "Sänd arkivet tillbaka till git-archive" -#: command-list.h:184 +#: command-list.h:186 msgid "Send objects packed back to git-fetch-pack" msgstr "Sänd packade objekt tillbaka till git-fetch-pack" -#: command-list.h:185 +#: command-list.h:187 msgid "Show a Git logical variable" msgstr "Visa en logisk Git-variabel" -#: command-list.h:186 +#: command-list.h:188 msgid "Check the GPG signature of commits" msgstr "Kontrollera GPG-signaturer för incheckningar" -#: command-list.h:187 +#: command-list.h:189 msgid "Validate packed Git archive files" msgstr "Bekräfta packade Git-arkivfiler" -#: command-list.h:188 +#: command-list.h:190 msgid "Check the GPG signature of tags" msgstr "Kontrollera GPG-signaturer i taggar" -#: command-list.h:189 +#: command-list.h:191 msgid "Git web interface (web frontend to Git repositories)" msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)" -#: command-list.h:190 +#: command-list.h:192 msgid "Show logs with difference each commit introduces" msgstr "Visa loggar med differenser varje incheckning introducerar" -#: command-list.h:191 +#: command-list.h:193 msgid "Manage multiple working trees" msgstr "Hantera ytterligare arbetskataloger" -#: command-list.h:192 +#: command-list.h:194 msgid "Create a tree object from the current index" msgstr "Skapa ett trädobjekt från aktuellt index" -#: command-list.h:193 +#: command-list.h:195 msgid "Defining attributes per path" msgstr "Definierar attribut per sökväg" -#: command-list.h:194 +#: command-list.h:196 msgid "Git command-line interface and conventions" msgstr "Gits kommandoradsgränssnitt och -konventioner" -#: command-list.h:195 +#: command-list.h:197 msgid "A Git core tutorial for developers" msgstr "Grundläggande Git-handledning för utvecklare" -#: command-list.h:196 +#: command-list.h:198 msgid "Git for CVS users" msgstr "Git för CVS-användare" -#: command-list.h:197 +#: command-list.h:199 msgid "Tweaking diff output" msgstr "Justrea diff-utdata" -#: command-list.h:198 +#: command-list.h:200 msgid "A useful minimum set of commands for Everyday Git" msgstr "Ett användbart minsta uppsättning kommandon för vardags-Git" -#: command-list.h:199 +#: command-list.h:201 msgid "A Git Glossary" msgstr "En Git-ordlista" -#: command-list.h:200 +#: command-list.h:202 msgid "Hooks used by Git" msgstr "Krokar som används av Git" -#: command-list.h:201 +#: command-list.h:203 msgid "Specifies intentionally untracked files to ignore" msgstr "Ange avsiktligen ospårade filer att ignorera" -#: command-list.h:202 +#: command-list.h:204 msgid "Defining submodule properties" msgstr "Ange egenskaper för undermoduler" -#: command-list.h:203 +#: command-list.h:205 msgid "Git namespaces" msgstr "Git-namnrymder" -#: command-list.h:204 +#: command-list.h:206 msgid "Git Repository Layout" msgstr "Gits arkivlayout" -#: command-list.h:205 +#: command-list.h:207 msgid "Specifying revisions and ranges for Git" msgstr "Ange versioner och intervall i Git" -#: command-list.h:206 +#: command-list.h:208 msgid "A tutorial introduction to Git: part two" msgstr "Introduktion till Git: del två" -#: command-list.h:207 +#: command-list.h:209 msgid "A tutorial introduction to Git" msgstr "Introduktion till Git" -#: command-list.h:208 +#: command-list.h:210 msgid "An overview of recommended workflows with Git" msgstr "Översikt över rekommenderade arbetsflöden med Git" @@ -21718,12 +22232,21 @@ msgstr "" msgid "See git-${cmd}(1) for details." msgstr "Se git-${cmd}(1) för detaljer." -#: git-rebase--preserve-merges.sh:136 +#: git-rebase--preserve-merges.sh:109 +msgid "Applied autostash." +msgstr "Tillämpade autostash." + +#: git-rebase--preserve-merges.sh:112 +#, sh-format +msgid "Cannot store $stash_sha1" +msgstr "Kan inte spara $stash_sha1" + +#: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "Ombaserar ($new_count/$total)" -#: git-rebase--preserve-merges.sh:152 +#: git-rebase--preserve-merges.sh:207 msgid "" "\n" "Commands:\n" @@ -21764,7 +22287,7 @@ msgstr "" "\n" "Du kan byta ordning på raderna; de utförs uppifrån och ned.\n" -#: git-rebase--preserve-merges.sh:215 +#: git-rebase--preserve-merges.sh:270 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -21783,83 +22306,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:240 +#: git-rebase--preserve-merges.sh:295 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: inte en incheckning som kan väljas" -#: git-rebase--preserve-merges.sh:279 +#: git-rebase--preserve-merges.sh:334 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Felaktigt incheckningsnamn: $sha1" -#: git-rebase--preserve-merges.sh:309 +#: git-rebase--preserve-merges.sh:364 msgid "Cannot write current commit's replacement sha1" msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning" -#: git-rebase--preserve-merges.sh:360 +#: git-rebase--preserve-merges.sh:415 #, sh-format msgid "Fast-forward to $sha1" msgstr "Snabbspolade till $sha1" -#: git-rebase--preserve-merges.sh:362 +#: git-rebase--preserve-merges.sh:417 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Kan inte snabbspola till $sha1" -#: git-rebase--preserve-merges.sh:371 +#: git-rebase--preserve-merges.sh:426 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Kan inte flytta HEAD till $first_parent" -#: git-rebase--preserve-merges.sh:376 +#: git-rebase--preserve-merges.sh:431 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1" -#: git-rebase--preserve-merges.sh:394 +#: git-rebase--preserve-merges.sh:449 #, sh-format msgid "Error redoing merge $sha1" msgstr "Fel när sammanslagningen $sha1 skulle göras om" -#: git-rebase--preserve-merges.sh:403 +#: git-rebase--preserve-merges.sh:458 #, sh-format msgid "Could not pick $sha1" msgstr "Kunde inte välja $sha1" -#: git-rebase--preserve-merges.sh:412 +#: git-rebase--preserve-merges.sh:467 #, sh-format msgid "This is the commit message #${n}:" msgstr "Det här är incheckningsmeddelande ${n}:" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:472 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Incheckningsmeddelande ${n} kommer hoppas över:" -#: git-rebase--preserve-merges.sh:428 +#: git-rebase--preserve-merges.sh:483 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Det här är en kombination av $count incheckning." msgstr[1] "Det här är en kombination av $count incheckningar." -#: git-rebase--preserve-merges.sh:437 +#: git-rebase--preserve-merges.sh:492 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Kan inte skriva $fixup_msg" -#: git-rebase--preserve-merges.sh:440 +#: git-rebase--preserve-merges.sh:495 msgid "This is a combination of 2 commits." msgstr "Det här är en kombination av 2 incheckningar." -#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524 -#: git-rebase--preserve-merges.sh:527 +#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 +#: git-rebase--preserve-merges.sh:582 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Kunde inte tillämpa $sha1... $rest" -#: git-rebase--preserve-merges.sh:556 +#: git-rebase--preserve-merges.sh:611 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -21873,31 +22396,31 @@ msgstr "" "pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n" "du måste lösa problemet innan du kan skriva om incheckningsmeddelandet." -#: git-rebase--preserve-merges.sh:571 +#: git-rebase--preserve-merges.sh:626 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Stoppade på $sha1_abbrev... $rest" -#: git-rebase--preserve-merges.sh:586 +#: git-rebase--preserve-merges.sh:641 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning" -#: git-rebase--preserve-merges.sh:628 +#: git-rebase--preserve-merges.sh:683 #, sh-format msgid "Executing: $rest" msgstr "Kör: $rest" -#: git-rebase--preserve-merges.sh:636 +#: git-rebase--preserve-merges.sh:691 #, sh-format msgid "Execution failed: $rest" msgstr "Körning misslyckades: $rest" -#: git-rebase--preserve-merges.sh:638 +#: git-rebase--preserve-merges.sh:693 msgid "and made changes to the index and/or the working tree" msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen" -#: git-rebase--preserve-merges.sh:640 +#: git-rebase--preserve-merges.sh:695 msgid "" "You can fix the problem, and then run\n" "\n" @@ -21908,7 +22431,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:653 +#: git-rebase--preserve-merges.sh:708 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -21923,25 +22446,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:664 +#: git-rebase--preserve-merges.sh:719 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Okänt kommando: $command $sha1 $rest" -#: git-rebase--preserve-merges.sh:665 +#: git-rebase--preserve-merges.sh:720 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Rätta det med \"git rebase --edit-todo\"." -#: git-rebase--preserve-merges.sh:700 +#: git-rebase--preserve-merges.sh:755 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Lyckades ombasera och uppdatera $head_name." -#: git-rebase--preserve-merges.sh:757 +#: git-rebase--preserve-merges.sh:812 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Kunde inte ta bort CHERRY_PICK_HEAD" -#: git-rebase--preserve-merges.sh:762 +#: git-rebase--preserve-merges.sh:817 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -21972,11 +22495,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--preserve-merges.sh:779 +#: git-rebase--preserve-merges.sh:834 msgid "Error trying to find the author identity to amend commit" msgstr "Fel vid försök att hitta författaridentitet för att utöka incheckning" -#: git-rebase--preserve-merges.sh:784 +#: git-rebase--preserve-merges.sh:839 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -21984,40 +22507,40 @@ msgstr "" "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" "först och kör sedan \"git rebase --continue\" igen." -#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793 +#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 msgid "Could not commit staged changes." msgstr "Kunde inte checka in köade ändringar." -#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910 +#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 msgid "Could not execute editor" msgstr "Kunde inte starta textredigerare" -#: git-rebase--preserve-merges.sh:845 +#: git-rebase--preserve-merges.sh:900 #, sh-format msgid "Could not checkout $switch_to" msgstr "Kunde inte checka ut $switch_to" -#: git-rebase--preserve-merges.sh:852 +#: git-rebase--preserve-merges.sh:907 msgid "No HEAD?" msgstr "Inget HEAD?" -#: git-rebase--preserve-merges.sh:853 +#: git-rebase--preserve-merges.sh:908 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Kunde inte skapa temporär $state_dir" -#: git-rebase--preserve-merges.sh:856 +#: git-rebase--preserve-merges.sh:911 msgid "Could not mark as interactive" msgstr "Kunde inte markera som interaktiv" -#: git-rebase--preserve-merges.sh:888 +#: git-rebase--preserve-merges.sh:943 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)" msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)" -#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947 +#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" msgstr "Kunde inte initiera omskrivna incheckningar" @@ -22082,81 +22605,81 @@ msgid "Unable to determine absolute path of git directory" msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:196 +#: git-add--interactive.perl:210 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:197 +#: git-add--interactive.perl:211 msgid "staged" msgstr "köad" -#: git-add--interactive.perl:197 +#: git-add--interactive.perl:211 msgid "unstaged" msgstr "ej köad" -#: git-add--interactive.perl:253 git-add--interactive.perl:278 +#: git-add--interactive.perl:267 git-add--interactive.perl:292 msgid "binary" msgstr "binär" -#: git-add--interactive.perl:262 git-add--interactive.perl:316 +#: git-add--interactive.perl:276 git-add--interactive.perl:330 msgid "nothing" msgstr "ingenting" -#: git-add--interactive.perl:298 git-add--interactive.perl:313 +#: git-add--interactive.perl:312 git-add--interactive.perl:327 msgid "unchanged" msgstr "oändrad" -#: git-add--interactive.perl:609 +#: git-add--interactive.perl:623 #, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "lade till %d sökväg\n" msgstr[1] "lade till %d sökvägar\n" -#: git-add--interactive.perl:612 +#: git-add--interactive.perl:626 #, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "uppdaterade %d sökväg\n" msgstr[1] "uppdaterade %d sökvägar\n" -#: git-add--interactive.perl:615 +#: git-add--interactive.perl:629 #, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "återställde %d sökväg\n" msgstr[1] "återställde %d sökvägar\n" -#: git-add--interactive.perl:618 +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "rörde %d sökväg\n" msgstr[1] "rörde %d sökvägar\n" -#: git-add--interactive.perl:627 +#: git-add--interactive.perl:641 msgid "Update" msgstr "Uppdatera" -#: git-add--interactive.perl:639 +#: git-add--interactive.perl:653 msgid "Revert" msgstr "Återställ" -#: git-add--interactive.perl:662 +#: git-add--interactive.perl:676 #, perl-format msgid "note: %s is untracked now.\n" msgstr "observera: %s spåras inte längre.\n" -#: git-add--interactive.perl:673 +#: git-add--interactive.perl:687 msgid "Add untracked" msgstr "Lägg till ospårad" -#: git-add--interactive.perl:679 +#: git-add--interactive.perl:693 msgid "No untracked files.\n" msgstr "Inga ospårade filer.\n" -#: git-add--interactive.perl:1033 +#: git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -22164,7 +22687,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "köas omedelbart." -#: git-add--interactive.perl:1036 +#: git-add--interactive.perl:1054 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -22172,7 +22695,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "läggas till i \"stash\" omedelbart." -#: git-add--interactive.perl:1039 +#: git-add--interactive.perl:1057 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -22180,7 +22703,8 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "tas bort från kön omedelbart." -#: git-add--interactive.perl:1042 git-add--interactive.perl:1051 +#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 +#: git-add--interactive.perl:1075 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -22188,7 +22712,8 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "markeras för applicering omedelbart." -#: git-add--interactive.perl:1045 git-add--interactive.perl:1048 +#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 +#: git-add--interactive.perl:1072 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -22196,16 +22721,16 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "markeras för kasta omedelbart." -#: git-add--interactive.perl:1085 +#: git-add--interactive.perl:1109 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s" -#: git-add--interactive.perl:1086 +#: git-add--interactive.perl:1110 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n" -#: git-add--interactive.perl:1092 +#: git-add--interactive.perl:1116 #, perl-format msgid "" "---\n" @@ -22219,7 +22744,7 @@ msgstr "" "Rader som börjar med %s kommer att tas bort.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1100 +#: git-add--interactive.perl:1124 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -22229,7 +22754,7 @@ msgstr "" "redigera den igen. Om alla rader i ett stycke tas bort avbryts\n" "redigeringen och stycket lämnas oförändrat.\n" -#: git-add--interactive.perl:1114 +#: git-add--interactive.perl:1138 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s" @@ -22240,14 +22765,14 @@ msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: git-add--interactive.perl:1213 +#: git-add--interactive.perl:1237 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) " "[y/n]? " -#: git-add--interactive.perl:1222 +#: git-add--interactive.perl:1246 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -22261,7 +22786,7 @@ msgstr "" "a - köa stycket och alla följande i filen\n" "d - köa inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1228 +#: git-add--interactive.perl:1252 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -22275,7 +22800,7 @@ msgstr "" "a - \"stash\":a stycket och alla följande i filen\n" "d - \"stash\":a inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1234 +#: git-add--interactive.perl:1258 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -22289,7 +22814,7 @@ msgstr "" "a - ta bort stycket och alla följande i filen från kön\n" "d - ta inte bort stycket eller något av de följande i filen från kön" -#: git-add--interactive.perl:1240 +#: git-add--interactive.perl:1264 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -22303,7 +22828,7 @@ msgstr "" "a - applicera stycket och alla följande i filen\n" "d - applicera inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1246 +#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -22317,7 +22842,7 @@ msgstr "" "a - förkasta stycket och alla följande i filen\n" "d - förkasta inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1252 +#: git-add--interactive.perl:1276 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -22331,7 +22856,7 @@ msgstr "" "a - förkasta stycket och alla följande i filen\n" "d - förkasta inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1258 +#: git-add--interactive.perl:1282 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -22345,7 +22870,21 @@ msgstr "" "a - applicera stycket och alla följande i filen\n" "d - applicera inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1273 +#: git-add--interactive.perl:1294 +msgid "" +"y - apply this hunk to worktree\n" +"n - do not apply this hunk to worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file" +msgstr "" +"y - applicera stycket på arbetskatalogen\n" +"n - applicera inte stycket på arbetskatalogen\n" +"q - avsluta; applicera inte stycket eller något av de följande\n" +"a - applicera stycket och alla följande i filen\n" +"d - applicera inte stycket eller något av de följande i filen" + +#: git-add--interactive.perl:1309 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -22367,211 +22906,226 @@ msgstr "" "e - redigera aktuellt stycke manuellt\n" "? - visa hjälp\n" -#: git-add--interactive.perl:1304 +#: git-add--interactive.perl:1340 msgid "The selected hunks do not apply to the index!\n" msgstr "Markerade stycken kan inte appliceras på indexet!\n" -#: git-add--interactive.perl:1305 +#: git-add--interactive.perl:1341 msgid "Apply them to the worktree anyway? " msgstr "Applicera dem på arbetskatalogen trots det? " -#: git-add--interactive.perl:1308 +#: git-add--interactive.perl:1344 msgid "Nothing was applied.\n" msgstr "Ingenting applicerades.\n" -#: git-add--interactive.perl:1319 +#: git-add--interactive.perl:1355 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorerar ej sammanslagen: %s\n" -#: git-add--interactive.perl:1328 +#: git-add--interactive.perl:1364 msgid "Only binary files changed.\n" msgstr "Endast binära filer ändrade.\n" -#: git-add--interactive.perl:1330 +#: git-add--interactive.perl:1366 msgid "No changes.\n" msgstr "Inga ändringar.\n" -#: git-add--interactive.perl:1338 +#: git-add--interactive.perl:1374 msgid "Patch update" msgstr "Uppdatera patch" -#: git-add--interactive.perl:1390 +#: git-add--interactive.perl:1426 #, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1391 +#: git-add--interactive.perl:1427 #, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Köa borttagning [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1392 +#: git-add--interactive.perl:1428 #, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Köa stycket [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1395 +#: git-add--interactive.perl:1431 #, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1396 +#: git-add--interactive.perl:1432 #, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1397 +#: git-add--interactive.perl:1433 #, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Stash:a stycket [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1400 +#: git-add--interactive.perl:1436 #, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Ta bort ändrat läge från kön [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1401 +#: git-add--interactive.perl:1437 #, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Ta bort borttagning från kön [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1402 +#: git-add--interactive.perl:1438 #, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Ta bort stycket från kön [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1405 +#: git-add--interactive.perl:1441 #, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "Applicera ändrat läge på indexet [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1406 +#: git-add--interactive.perl:1442 #, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Applicera borttagning på indexet [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1407 +#: git-add--interactive.perl:1443 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Applicera stycket på indexet [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1410 +#: git-add--interactive.perl:1446 git-add--interactive.perl:1461 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1411 +#: git-add--interactive.perl:1447 git-add--interactive.perl:1462 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1412 +#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1415 +#: git-add--interactive.perl:1451 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1416 +#: git-add--interactive.perl:1452 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1417 +#: git-add--interactive.perl:1453 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1420 +#: git-add--interactive.perl:1456 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1421 +#: git-add--interactive.perl:1457 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1422 +#: git-add--interactive.perl:1458 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1522 +#: git-add--interactive.perl:1466 +#, perl-format +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgstr "Applicera ändrat läge på arbetskatalogen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1467 +#, perl-format +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "Applicera borttagning på arbetskatalogen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1468 +#, perl-format +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "Applicera stycket på arbetskatalogen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1568 msgid "No other hunks to goto\n" msgstr "Inga andra stycken att gå till\n" -#: git-add--interactive.perl:1529 +#: git-add--interactive.perl:1575 msgid "go to which hunk (<ret> to see more)? " msgstr "gå till vilket stycke (<ret> för att se fler)? " -#: git-add--interactive.perl:1531 +#: git-add--interactive.perl:1577 msgid "go to which hunk? " msgstr "gå till vilket stycke? " -#: git-add--interactive.perl:1540 +#: git-add--interactive.perl:1586 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Ogiltigt siffervärde: \"%s\"\n" -#: git-add--interactive.perl:1545 +#: git-add--interactive.perl:1591 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Beklagar, det finns bara %d stycke.\n" msgstr[1] "Beklagar, det finns bara %d stycken.\n" -#: git-add--interactive.perl:1571 +#: git-add--interactive.perl:1617 msgid "No other hunks to search\n" msgstr "Inga andra stycken att söka efter\n" -#: git-add--interactive.perl:1575 +#: git-add--interactive.perl:1621 msgid "search for regex? " msgstr "sök efter reguljärt uttryck? " -#: git-add--interactive.perl:1588 +#: git-add--interactive.perl:1634 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n" -#: git-add--interactive.perl:1598 +#: git-add--interactive.perl:1644 msgid "No hunk matches the given pattern\n" msgstr "Inga stycken motsvarar givet mönster\n" -#: git-add--interactive.perl:1610 git-add--interactive.perl:1632 +#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 msgid "No previous hunk\n" msgstr "Inget föregående stycke\n" -#: git-add--interactive.perl:1619 git-add--interactive.perl:1638 +#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 msgid "No next hunk\n" msgstr "Inget följande stycke\n" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1690 msgid "Sorry, cannot split this hunk\n" msgstr "Beklagar, kan inte dela stycket\n" -#: git-add--interactive.perl:1650 +#: git-add--interactive.perl:1696 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Dela i %d stycke.\n" msgstr[1] "Dela i %d stycken.\n" -#: git-add--interactive.perl:1660 +#: git-add--interactive.perl:1706 msgid "Sorry, cannot edit this hunk\n" msgstr "Beklagar, kan inte redigera stycket\n" -#: git-add--interactive.perl:1706 +#: git-add--interactive.perl:1752 msgid "Review diff" msgstr "Granska diff" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1725 +#: git-add--interactive.perl:1771 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -22588,18 +23142,19 @@ msgstr "" "diff - visa diff mellan HEAD och index\n" "add untracked - lägg till innehåll i ospårade filer till köade ändringar\n" -#: git-add--interactive.perl:1742 git-add--interactive.perl:1747 -#: git-add--interactive.perl:1750 git-add--interactive.perl:1757 -#: git-add--interactive.perl:1761 git-add--interactive.perl:1767 +#: git-add--interactive.perl:1788 git-add--interactive.perl:1793 +#: git-add--interactive.perl:1796 git-add--interactive.perl:1803 +#: git-add--interactive.perl:1806 git-add--interactive.perl:1813 +#: git-add--interactive.perl:1817 git-add--interactive.perl:1823 msgid "missing --" msgstr "saknad --" -#: git-add--interactive.perl:1763 +#: git-add--interactive.perl:1819 #, perl-format msgid "unknown --patch mode: %s" msgstr "okänt läge för --patch: %s" -#: git-add--interactive.perl:1769 git-add--interactive.perl:1775 +#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 #, perl-format msgid "invalid argument %s, expecting --" msgstr "felaktigt argument %s, förväntar --" @@ -22612,31 +23167,31 @@ 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:219 git-send-email.perl:225 +#: git-send-email.perl:223 git-send-email.perl:229 msgid "the editor exited uncleanly, aborting everything" msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting" -#: git-send-email.perl:302 +#: git-send-email.perl:310 #, 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:307 +#: git-send-email.perl:315 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "\"%s.final\" innehåller det skrivna brevet.\n" -#: git-send-email.perl:326 +#: git-send-email.perl:408 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-alias är inkompatibelt med andra flaggor\n" -#: git-send-email.perl:395 git-send-email.perl:656 +#: git-send-email.perl:481 git-send-email.perl:683 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:398 +#: git-send-email.perl:484 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -22644,37 +23199,37 @@ msgstr "" "\"batch-size\" och \"relogin\" måste anges tillsammans (via kommandorad " "eller konfigurationsflagga)\n" -#: git-send-email.perl:470 +#: git-send-email.perl:497 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Okänt fält i --suppress-cc: \"%s\"\n" -#: git-send-email.perl:501 +#: git-send-email.perl:528 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Okänd inställning i --confirm: \"%s\"\n" -#: git-send-email.perl:529 +#: git-send-email.perl:556 #, 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:531 +#: git-send-email.perl:558 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "varning: \":include:\" stöds inte: %s\n" -#: git-send-email.perl:533 +#: git-send-email.perl:560 #, 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:538 +#: git-send-email.perl:565 #, 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:622 +#: git-send-email.perl:649 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -22689,12 +23244,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:643 +#: git-send-email.perl:670 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Misslyckades utföra opendir %s: %s" -#: git-send-email.perl:667 +#: git-send-email.perl:694 #, perl-format msgid "" "fatal: %s: %s\n" @@ -22703,7 +23258,7 @@ msgstr "" "ödesdigert: %s: %s\n" "varning: inga patchar har sänts\n" -#: git-send-email.perl:678 +#: git-send-email.perl:705 msgid "" "\n" "No patch files specified!\n" @@ -22713,17 +23268,17 @@ msgstr "" "Inga patchfiler angavs!\n" "\n" -#: git-send-email.perl:691 +#: git-send-email.perl:718 #, perl-format msgid "No subject line in %s?" msgstr "Ingen ärenderad i %s?" -#: git-send-email.perl:701 +#: git-send-email.perl:728 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Kunde inte öppna för skrivning %s: %s" -#: git-send-email.perl:712 +#: git-send-email.perl:739 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -22737,38 +23292,38 @@ msgstr "" "\n" "Rensa brevkroppen om du inte vill sända någon sammanfattning.\n" -#: git-send-email.perl:736 +#: git-send-email.perl:763 #, perl-format msgid "Failed to open %s: %s" msgstr "Misslyckades öppna %s: %s" -#: git-send-email.perl:753 +#: git-send-email.perl:780 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Misslyckades öppna %s.final: %s" -#: git-send-email.perl:796 +#: git-send-email.perl:823 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:831 +#: git-send-email.perl:858 #, 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:886 +#: git-send-email.perl:913 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:891 +#: git-send-email.perl:918 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Vilken åttabitarsteckenkodning skall jag ange [UTF-8]? " -#: git-send-email.perl:899 +#: git-send-email.perl:926 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -22781,21 +23336,21 @@ msgstr "" "har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen " "vill sända.\n" -#: git-send-email.perl:918 +#: git-send-email.perl:945 msgid "To whom should the emails be sent (if anyone)?" msgstr "Till vem skall breven sändas (om någon)?" -#: git-send-email.perl:936 +#: git-send-email.perl:963 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n" -#: git-send-email.perl:948 +#: git-send-email.perl:975 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:1006 git-send-email.perl:1014 +#: git-send-email.perl:1033 git-send-email.perl:1041 #, 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" @@ -22803,16 +23358,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:1018 +#: git-send-email.perl:1045 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:1335 +#: git-send-email.perl:1362 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA-sökvägen \"%s\" finns inte" -#: git-send-email.perl:1418 +#: git-send-email.perl:1445 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -22839,124 +23394,124 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1433 +#: git-send-email.perl:1460 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:1436 +#: git-send-email.perl:1463 msgid "Send this email reply required" msgstr "Svar krävs på frågan \"Sända brevet?\"" -#: git-send-email.perl:1464 +#: git-send-email.perl:1491 msgid "The required SMTP server is not properly defined." msgstr "Nödvändig SMTP-server har inte angivits korrekt." -#: git-send-email.perl:1511 +#: git-send-email.perl:1538 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Servern stöder inte SMARTTLS! %s" -#: git-send-email.perl:1516 git-send-email.perl:1520 +#: git-send-email.perl:1543 git-send-email.perl:1547 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS misslyckades! %s" -#: git-send-email.perl:1529 +#: git-send-email.perl:1556 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:1547 +#: git-send-email.perl:1574 #, perl-format msgid "Failed to send %s\n" msgstr "Misslyckades sända %s\n" -#: git-send-email.perl:1550 +#: git-send-email.perl:1577 #, perl-format msgid "Dry-Sent %s\n" msgstr "Test-Sände %s\n" -#: git-send-email.perl:1550 +#: git-send-email.perl:1577 #, perl-format msgid "Sent %s\n" msgstr "Sände %s\n" -#: git-send-email.perl:1552 +#: git-send-email.perl:1579 msgid "Dry-OK. Log says:\n" msgstr "Test-OK. Loggen säger:\n" -#: git-send-email.perl:1552 +#: git-send-email.perl:1579 msgid "OK. Log says:\n" msgstr "OK. Loggen säger:\n" -#: git-send-email.perl:1564 +#: git-send-email.perl:1591 msgid "Result: " msgstr "Resultat: " -#: git-send-email.perl:1567 +#: git-send-email.perl:1594 msgid "Result: OK\n" msgstr "Resultat: OK\n" -#: git-send-email.perl:1585 +#: git-send-email.perl:1612 #, perl-format msgid "can't open file %s" msgstr "kan inte öppna filen %s" -#: git-send-email.perl:1632 git-send-email.perl:1652 +#: git-send-email.perl:1659 git-send-email.perl:1679 #, 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:1638 +#: git-send-email.perl:1665 #, 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:1691 +#: git-send-email.perl:1718 #, 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:1726 +#: git-send-email.perl:1753 #, 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:1837 +#: git-send-email.perl:1864 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Kunde inte köra \"%s\"" -#: git-send-email.perl:1844 +#: git-send-email.perl:1871 #, 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:1848 +#: git-send-email.perl:1875 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) misslyckades stänga röret till \"%s\"" -#: git-send-email.perl:1878 +#: git-send-email.perl:1905 msgid "cannot send message as 7bit" msgstr "kan inte sända brev som sjubitars" -#: git-send-email.perl:1886 +#: git-send-email.perl:1913 msgid "invalid transfer encoding" msgstr "ogiltig överföringskondning" -#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989 +#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 #, perl-format msgid "unable to open %s: %s\n" msgstr "kunde inte öppna %s: %s\n" -#: git-send-email.perl:1930 +#: git-send-email.perl:1957 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: patchen innehåller en rad längre än 998 tecken" -#: git-send-email.perl:1947 +#: git-send-email.perl:1974 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" @@ -22964,11 +23519,72 @@ msgstr "" "säkerhetskopior.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1951 +#: git-send-email.perl:1978 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "Server supports multi_ack_detailed" +#~ msgstr "Servern stöder \"multi_ack_detailed\"" + +#~ msgid "Server supports no-done" +#~ msgstr "Servern stöder \"no-done\"" + +#~ msgid "Server supports multi_ack" +#~ msgstr "Servern stöder \"multi_ack\"" + +#~ msgid "Server supports side-band-64k" +#~ msgstr "Servern stöder \"side-band-64k\"" + +#~ msgid "Server supports side-band" +#~ msgstr "Servern stöder \"side-band\"" + +#~ msgid "Server supports allow-tip-sha1-in-want" +#~ msgstr "Servern stöder \"allow-tip-sha1-in-want\"" + +#~ msgid "Server supports allow-reachable-sha1-in-want" +#~ msgstr "Servern stöder \"allow-reachable-sha1-in-want\"" + +#~ msgid "Server supports ofs-delta" +#~ msgstr "Servern stöder \"ofs-delta\"" + +#~ msgid "(HEAD detached at %s)" +#~ msgstr "(HEAD frånkopplat vid %s)" + +#~ msgid "(HEAD detached from %s)" +#~ msgstr "(HEAD frånkopplat från %s)" + +#~ msgid "Checking out files" +#~ msgstr "Checkar ut filer" + +#~ msgid "cannot be interactive without stdin connected to a terminal." +#~ msgstr "" +#~ "kan inte vara interaktiv om standard in inte är ansluten till en terminal." + +#~ msgid "failed to open '%s'" +#~ msgstr "misslyckades öppna \"%s\"" + +#~ msgid "failed to stat %s\n" +#~ msgstr "misslyckades ta status på %s\n" + +#~ msgid "" +#~ "If you wish to skip this commit, use:\n" +#~ "\n" +#~ " git reset\n" +#~ "\n" +#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n" +#~ "the remaining commits.\n" +#~ msgstr "" +#~ "Om du vill hoppa över incheckningen, använd:\n" +#~ "\n" +#~ " git reset\n" +#~ "\n" +#~ "\"git cherry-pick --continue\" kommer därefter att återuppta\n" +#~ "cherry-pick för återstående incheckningar.\n" + +#~ msgid "unrecognized verb: %s" +#~ msgstr "okänt verb: %s" + #~ msgid "hash version %X does not match version %X" #~ msgstr "hash-versionen %X stämmer inte med versionen %X" @@ -23073,9 +23689,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgstr "" #~ "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..." -#~ msgid "--reschedule-failed-exec requires an interactive rebase" -#~ msgstr "--reschedule-failed-exec kräver en interaktiv ombasering" - #~ msgid "ignoring unknown color-moved-ws mode '%s'" #~ msgstr "ignorerar okänt läge för color-mode-ws \"%s\"" @@ -23146,12 +23759,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "cannot remove a locked working tree" #~ msgstr "kan inte ta bort en låst arbetskatalog" -#~ msgid "Applied autostash." -#~ msgstr "Tillämpade autostash." - -#~ msgid "Cannot store $stash_sha1" -#~ msgstr "Kan inte spara $stash_sha1" - #~ msgid "" #~ "\n" #~ "\tHowever, if you remove everything, the rebase will be aborted.\n" |