diff options
| author |  Peter Krefting <peter@softwolves.pp.se> | 2019-05-14 15:46:15 +0100 |
|---|---|---|
| committer | Peter Krefting <peter@softwolves.pp.se> | 2019-05-14 15:46:15 +0100 |
| commit | 4ae76f5e1d686299b989268822a27b05f5ad3f15 (patch) | |
| tree | 98e6280a8e28cd56a7b22bb9f0369b5ad6b14350 /po | |
| parent | l10n: sv.po: Update Swedish translation (diff) | |
| download | tgif-4ae76f5e1d686299b989268822a27b05f5ad3f15.tar.xz | |
l10n: sv.po: Update Swedish translation (4577t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Diffstat (limited to 'po')
| -rw-r--r-- | po/sv.po | 7213 |
1 files changed, 4140 insertions, 3073 deletions
@@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.21.0\n" +"Project-Id-Version: git 2.22.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-02-15 10:09+0800\n" -"PO-Revision-Date: 2019-02-15 09:03+0100\n" +"POT-Creation-Date: 2019-05-14 17:09+0800\n" +"PO-Revision-Date: 2019-05-14 15:44+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -18,47 +18,47 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 2.91.7\n" -#: advice.c:101 +#: advice.c:103 #, c-format msgid "%shint: %.*s%s\n" msgstr "%stips: %.*s%s\n" -#: advice.c:154 +#: advice.c:156 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits " "samman." -#: advice.c:156 +#: advice.c:158 msgid "Committing is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en incheckning eftersom du har filer som inte slagits " "samman." -#: advice.c:158 +#: advice.c:160 msgid "Merging is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits " "samman." -#: advice.c:160 +#: advice.c:162 msgid "Pulling is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman." -#: advice.c:162 +#: advice.c:164 msgid "Reverting is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits " "samman." -#: advice.c:164 +#: advice.c:166 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" "Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman." -#: advice.c:172 +#: advice.c:174 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -66,23 +66,23 @@ msgstr "" "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n" "som lämpligt för att ange lösning och checka in." -#: advice.c:180 +#: advice.c:182 msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:185 builtin/merge.c:1290 +#: advice.c:187 builtin/merge.c:1320 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: advice.c:187 +#: advice.c:189 msgid "Please, commit your changes before merging." msgstr "Checka in dina ändringar innan du utför sammanslagningen." -#: advice.c:188 +#: advice.c:190 msgid "Exiting because of unfinished merge." msgstr "Avslutar på grund av ofullbordad sammanslagning." -#: advice.c:194 +#: advice.c:196 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -119,92 +119,92 @@ msgstr "kommandorad avslutas med \\" msgid "unclosed quote" msgstr "citat ej stängt" -#: apply.c:59 +#: apply.c:63 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "okänt alternativ för whitespace: \"%s\"" -#: apply.c:75 +#: apply.c:79 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: apply.c:125 +#: apply.c:129 msgid "--reject and --3way cannot be used together." msgstr "--reject och --3way kan inte användas samtidigt." -#: apply.c:127 +#: apply.c:131 msgid "--cached and --3way cannot be used together." msgstr "--cached och --3way kan inte användas samtidigt." -#: apply.c:130 +#: apply.c:134 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: apply.c:141 +#: apply.c:145 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: apply.c:144 +#: apply.c:148 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: apply.c:825 +#: apply.c:829 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: apply.c:834 +#: apply.c:838 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: apply.c:908 +#: apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen på rad %d" -#: apply.c:946 +#: apply.c:950 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d" -#: apply.c:952 +#: apply.c:956 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d" -#: apply.c:953 +#: apply.c:957 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d" -#: apply.c:958 +#: apply.c:962 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d" -#: apply.c:987 +#: apply.c:991 #, c-format msgid "invalid mode on line %d: %s" msgstr "ogiltigt läge på rad %d: %s" -#: apply.c:1306 +#: apply.c:1310 #, c-format msgid "inconsistent header lines %d and %d" msgstr "huvudet är inkonsekvent mellan rad %d och %d" -#: apply.c:1478 +#: apply.c:1482 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: apply.c:1547 +#: apply.c:1551 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: apply.c:1567 +#: apply.c:1571 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -220,82 +220,82 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: apply.c:1580 +#: apply.c:1584 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)" -#: apply.c:1768 +#: apply.c:1772 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: apply.c:1770 +#: apply.c:1774 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: apply.c:1804 +#: apply.c:1808 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: apply.c:1841 +#: apply.c:1845 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: apply.c:1843 +#: apply.c:1847 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: apply.c:1846 +#: apply.c:1850 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** varning: filen %s blir tom men har inte tagits bort" -#: apply.c:1993 +#: apply.c:1997 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: apply.c:2030 +#: apply.c:2034 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: apply.c:2192 +#: apply.c:2196 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: apply.c:2278 +#: apply.c:2282 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: apply.c:2282 +#: apply.c:2286 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: apply.c:2941 +#: apply.c:2945 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: apply.c:3062 +#: apply.c:3066 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Stycke %d lyckades på %d (offset %d rad)." msgstr[1] "Stycke %d lyckades på %d (offset %d rader)." -#: apply.c:3074 +#: apply.c:3078 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d" -#: apply.c:3080 +#: apply.c:3084 #, c-format msgid "" "while searching for:\n" @@ -304,25 +304,25 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: apply.c:3102 +#: apply.c:3106 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: apply.c:3110 +#: apply.c:3114 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s" "\"" -#: apply.c:3157 +#: apply.c:3161 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden" -#: apply.c:3167 +#: apply.c:3171 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -330,427 +330,426 @@ msgstr "" "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande " "innehållet." -#: apply.c:3175 +#: apply.c:3179 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "patchen appliceras på en tom \"%s\", men den är inte tom" -#: apply.c:3193 +#: apply.c:3197 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas" -#: apply.c:3206 +#: apply.c:3210 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: apply.c:3212 +#: apply.c:3216 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)" -#: apply.c:3233 +#: apply.c:3237 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: apply.c:3356 +#: apply.c:3360 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278 +#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" -#: apply.c:3416 +#: apply.c:3420 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk" -#: apply.c:3445 apply.c:3688 +#: apply.c:3449 apply.c:3692 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: apply.c:3531 apply.c:3703 +#: apply.c:3535 apply.c:3707 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: apply.c:3540 apply.c:3711 +#: apply.c:3544 apply.c:3715 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: apply.c:3575 +#: apply.c:3579 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: apply.c:3578 +#: apply.c:3582 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Faller tillbaka på trevägssammanslagning...\n" -#: apply.c:3594 apply.c:3598 +#: apply.c:3598 apply.c:3602 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kunde inte läsa aktuellt innehåll i \"%s\"" -#: apply.c:3610 +#: apply.c:3614 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n" -#: apply.c:3624 +#: apply.c:3628 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Applicerade patchen på \"%s\" med konflikter.\n" -#: apply.c:3629 +#: apply.c:3633 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Tillämpade patchen på \"%s\" rent.\n" -#: apply.c:3655 +#: apply.c:3659 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: apply.c:3728 +#: apply.c:3732 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: apply.c:3730 +#: apply.c:3734 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846 -#: read-cache.c:1299 +#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg ”%s”" -#: apply.c:3939 +#: apply.c:3943 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: apply.c:3942 +#: apply.c:3946 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: apply.c:3962 +#: apply.c:3966 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)" -#: apply.c:3967 +#: apply.c:3971 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s" -#: apply.c:3987 +#: apply.c:3991 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk" -#: apply.c:3991 +#: apply.c:3995 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: apply.c:4006 +#: apply.c:4010 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: apply.c:4098 +#: apply.c:4102 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s" -#: apply.c:4105 +#: apply.c:4109 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "nytt läge för %s, som inte finns i nuvarande HEAD" -#: apply.c:4108 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller är oanvändbar (%s)." -#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143 +#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: apply.c:4117 +#: apply.c:4121 #, c-format msgid "could not add %s to temporary index" msgstr "kunde inte lägga till %s till temporärt index" -#: apply.c:4127 +#: apply.c:4131 #, c-format msgid "could not write temporary index to %s" msgstr "kunde inte skriva temporärt index till %s" -#: apply.c:4265 +#: apply.c:4269 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: apply.c:4299 +#: apply.c:4303 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: apply.c:4305 +#: apply.c:4309 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: apply.c:4313 +#: apply.c:4317 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s" -#: apply.c:4319 apply.c:4464 +#: apply.c:4323 apply.c:4468 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: apply.c:4362 +#: apply.c:4366 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" -#: apply.c:4366 +#: apply.c:4370 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: apply.c:4436 +#: apply.c:4440 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: apply.c:4534 +#: apply.c:4538 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: apply.c:4542 +#: apply.c:4546 msgid "internal error" msgstr "internt fel" -#: apply.c:4545 +#: apply.c:4549 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Tillämpade patchen %%s med %d refuserad..." msgstr[1] "Tillämpade patchen %%s med %d refuserade..." -#: apply.c:4556 +#: apply.c:4560 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118 +#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" -#: apply.c:4578 +#: apply.c:4582 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: apply.c:4582 +#: apply.c:4586 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4692 +#: apply.c:4696 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4700 +#: apply.c:4704 msgid "unrecognized input" msgstr "indata känns inte igen" -#: apply.c:4720 +#: apply.c:4724 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4875 +#: apply.c:4879 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4902 +#: apply.c:4906 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "undertryckte %d fel i blanksteg" msgstr[1] "undertryckte %d fel i blanksteg" -#: apply.c:4908 apply.c:4923 +#: apply.c:4912 apply.c:4927 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d rad lägger till fel i blanksteg." msgstr[1] "%d rader lägger till fel i blanksteg." -#: apply.c:4916 +#: apply.c:4920 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg." msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg." -#: apply.c:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: apply.c:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206 -#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263 -#: builtin/pull.c:200 builtin/submodule--helper.c:407 +#: 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:1850 builtin/submodule--helper.c:1853 -#: builtin/submodule--helper.c:2092 git-add--interactive.perl:197 +#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852 +#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197 msgid "path" msgstr "sökväg" -#: apply.c:4960 +#: apply.c:4964 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:4963 +#: apply.c:4967 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:4965 builtin/am.c:2212 +#: apply.c:4969 builtin/am.c:2219 msgid "num" msgstr "antal" -#: apply.c:4966 +#: apply.c:4970 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:4969 +#: apply.c:4973 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:4971 +#: apply.c:4975 msgid "instead of applying the patch, output diffstat for the input" msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata" -#: apply.c:4975 +#: apply.c:4979 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:4977 +#: apply.c:4981 msgid "instead of applying the patch, output a summary for the input" msgstr "istället för att tillämpa patchen, skriv ut en summering av indata" -#: apply.c:4979 +#: apply.c:4983 msgid "instead of applying the patch, see if the patch is applicable" msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas" -#: apply.c:4981 +#: apply.c:4985 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:4983 +#: apply.c:4987 msgid "mark new files with `git add --intent-to-add`" msgstr "markera nya filer med \"git add --intent-to-add\"" -#: apply.c:4985 +#: apply.c:4989 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:4987 +#: apply.c:4991 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:4990 +#: apply.c:4994 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:4992 +#: apply.c:4996 msgid "attempt three-way merge if a patch does not apply" msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" -#: apply.c:4994 +#: apply.c:4998 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:4997 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: apply.c:4999 +#: apply.c:5003 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97 +#: 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:3314 builtin/rebase.c:1065 +#: builtin/pack-objects.c:3317 builtin/rebase.c:1415 msgid "action" msgstr "åtgärd" -#: apply.c:5001 +#: apply.c:5005 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:5004 apply.c:5007 +#: apply.c:5008 apply.c:5011 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:5010 +#: apply.c:5014 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:5012 +#: apply.c:5016 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:5014 +#: apply.c:5018 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:5016 +#: apply.c:5020 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:5017 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724 -#: builtin/log.c:2037 builtin/mv.c:123 builtin/read-tree.c:128 -#: builtin/rebase--interactive.c:159 +#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22 +#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786 +#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "var pratsam" -#: apply.c:5019 +#: apply.c:5023 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:5022 +#: apply.c:5026 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:5024 builtin/am.c:2200 +#: apply.c:5028 builtin/am.c:2207 msgid "root" msgstr "rot" -#: apply.c:5025 +#: apply.c:5029 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" @@ -773,7 +772,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:515 builtin/rm.c:299 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" @@ -805,7 +804,7 @@ msgstr "fmt" msgid "archive format" msgstr "arkivformat" -#: archive.c:456 builtin/log.c:1549 +#: archive.c:456 builtin/log.c:1557 msgid "prefix" msgstr "prefix" @@ -813,11 +812,11 @@ msgstr "prefix" msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:458 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129 -#: builtin/fast-export.c:1091 builtin/fast-export.c:1093 builtin/grep.c:895 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:162 +#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091 +#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105 +#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:176 msgid "file" msgstr "fil" @@ -849,8 +848,8 @@ msgstr "komprimera bättre" msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 -#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859 +#: archive.c:477 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858 msgid "repo" msgstr "arkiv" @@ -858,7 +857,7 @@ msgstr "arkiv" 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:715 +#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:713 #: builtin/notes.c:498 msgid "command" msgstr "kommando" @@ -904,16 +903,16 @@ msgstr "filens läge stöds ej: 0%o (SHA1: %s)" msgid "cannot read %s" msgstr "kan inte läsa %s" -#: archive-tar.c:458 +#: archive-tar.c:459 #, c-format msgid "unable to start '%s' filter" msgstr "kunde inte starta filtret \"%s\"" -#: archive-tar.c:461 +#: archive-tar.c:462 msgid "unable to redirect descriptor" msgstr "kan inte omdirigera handtag" -#: archive-tar.c:468 +#: archive-tar.c:469 #, c-format msgid "'%s' filter reported error" msgstr "filtret \"%s\" rapporterade fel" @@ -928,7 +927,7 @@ msgstr "sökvägen är inte giltig UTF-8: %s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s" -#: archive-zip.c:474 builtin/pack-objects.c:225 builtin/pack-objects.c:228 +#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" @@ -1031,26 +1030,26 @@ 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:237 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: bisect.c:937 builtin/merge.c:139 +#: bisect.c:928 builtin/merge.c:146 #, c-format msgid "could not read file '%s'" msgstr "kunde inte läsa filen \"%s\"" -#: bisect.c:967 +#: bisect.c:958 msgid "reading bisect refs failed" msgstr "misslyckades läsa bisect-referenser" -#: bisect.c:986 +#: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "%s var både %s och %s\n" -#: bisect.c:994 +#: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" @@ -1059,7 +1058,7 @@ msgstr "" "Ingen testbar incheckning hittades.\n" "Kanske du startade med felaktiga sökvägsparametrar?\n" -#: bisect.c:1013 +#: bisect.c:1004 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1069,53 +1068,53 @@ msgstr[1] "(ungefär %d steg)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1019 +#: bisect.c:1010 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n" msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n" -#: blame.c:1792 +#: blame.c:1794 msgid "--contents and --reverse do not blend well." msgstr "--contents och --reverse fungerar inte så bra tillsammans." -#: blame.c:1806 +#: blame.c:1808 msgid "cannot use --contents with final commit object name" msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt" -#: blame.c:1827 +#: blame.c:1829 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: blame.c:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993 -#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936 -#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407 -#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152 +#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030 +#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940 +#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415 +#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" -#: blame.c:1854 +#: blame.c:1856 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent tillsammans kräver ett intervall på första-förälder-" "kedjan" -#: blame.c:1865 +#: blame.c:1867 #, c-format msgid "no such path %s in %s" msgstr "sökvägen %s i %s finns inte" -#: blame.c:1876 +#: blame.c:1878 #, c-format msgid "cannot read blob %s for path %s" msgstr "kan inte läsa objektet %s för sökvägen %s" -#: branch.c:52 +#: branch.c:53 #, c-format msgid "" "\n" @@ -1128,92 +1127,92 @@ msgstr "" "fjärrspårningsinformationen genom att utföra\n" "\"git branch --set-upstream-to=%s%s%s\"." -#: branch.c:66 +#: branch.c:67 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "Ställer inte in grenen %s som sin egen uppströmsgren." -#: branch.c:92 +#: branch.c:93 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "" "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\" genom " "ombasering." -#: branch.c:93 +#: branch.c:94 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\"." -#: branch.c:97 +#: branch.c:98 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "" "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\" genom " "ombasering." -#: branch.c:98 +#: branch.c:99 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"." -#: branch.c:103 +#: branch.c:104 #, c-format msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "" "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\" genom ombasering." -#: branch.c:104 +#: branch.c:105 #, c-format msgid "Branch '%s' set up to track remote ref '%s'." msgstr "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\"." -#: branch.c:108 +#: branch.c:109 #, c-format msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "" "Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\" genom " "ombasering." -#: branch.c:109 +#: branch.c:110 #, c-format msgid "Branch '%s' set up to track local ref '%s'." msgstr "Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\"." -#: branch.c:118 +#: branch.c:119 msgid "Unable to write upstream branch configuration" msgstr "Kan inte skriva inställningar för uppströmsgren" -#: branch.c:155 +#: branch.c:156 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "Spårar inte: tvetydig information för referensen %s" -#: branch.c:188 +#: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." msgstr "\"%s\" är inte ett giltigt grennamn." -#: branch.c:207 +#: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "Det finns redan en gren som heter ”%s”." -#: branch.c:212 +#: branch.c:213 msgid "Cannot force update the current branch." msgstr "Kan inte tvinga uppdatering av aktuell gren." -#: branch.c:232 +#: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren." -#: branch.c:234 +#: branch.c:235 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte" -#: branch.c:236 +#: branch.c:237 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1233,17 +1232,17 @@ msgstr "" "spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n" "för att ställa in uppströmskonfigurationen när du sänder in." -#: branch.c:280 +#: branch.c:281 #, c-format msgid "Not a valid object name: '%s'." msgstr "Objektnamnet är inte giltigt: \"%s\"." -#: branch.c:300 +#: branch.c:301 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Objektnamnet är tvetydigt: \"%s\"." -#: branch.c:305 +#: branch.c:306 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Avgreningspunkten är inte giltig: ”%s”." @@ -1268,8 +1267,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:2215 sequencer.c:2763 -#: builtin/commit.c:776 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916 +#: builtin/commit.c:788 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -1317,7 +1316,7 @@ msgstr "rev-list dog" msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:457 builtin/log.c:193 builtin/log.c:1701 builtin/shortlog.c:306 +#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -1340,9 +1339,8 @@ msgstr "index-pack dog" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:50 sequencer.c:2567 builtin/am.c:355 builtin/am.c:399 -#: builtin/am.c:1375 builtin/am.c:2019 builtin/replace.c:376 -#: builtin/replace.c:448 +#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399 +#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -1372,29 +1370,29 @@ msgstr "" "Slå av detta meddelande genom att skriva\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1122 +#: commit.c:1128 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s." -#: commit.c:1125 +#: commit.c:1131 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s." -#: commit.c:1128 +#: commit.c:1134 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: commit.c:1131 +#: commit.c:1137 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n" -#: commit.c:1385 +#: commit.c:1391 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1404,132 +1402,203 @@ 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:101 -#, c-format -msgid "graph file %s is too small" -msgstr "graffilen %s är för liten" +#: commit-graph.c:105 +msgid "commit-graph file is too small" +msgstr "incheckningsgraffilen %s är för liten" -#: commit-graph.c:136 +#: commit-graph.c:170 #, c-format -msgid "graph signature %X does not match signature %X" -msgstr "grafsignaturen %X stämmer inte med signaturen %X" +msgid "commit-graph signature %X does not match signature %X" +msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X" -#: commit-graph.c:143 +#: commit-graph.c:177 #, c-format -msgid "graph version %X does not match version %X" -msgstr "grafversionen %X stämmer inte med versionen %X" +msgid "commit-graph version %X does not match version %X" +msgstr "incheckningsgrafens version %X stämmer inte med versionen %X" -#: commit-graph.c:150 +#: commit-graph.c:184 #, c-format -msgid "hash version %X does not match version %X" -msgstr "hash-versionen %X stämmer inte med versionen %X" +msgid "commit-graph hash version %X does not match version %X" +msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X" -#: commit-graph.c:173 -msgid "chunk lookup table entry missing; graph file may be incomplete" +#: commit-graph.c:207 +msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" -"post saknas i styckeuppslagningstabell; graffilen kan vara ofullständig" +"incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara " +"ofullständig" -#: commit-graph.c:184 +#: commit-graph.c:218 #, c-format -msgid "improper chunk offset %08x%08x" -msgstr "felaktigt offset för stycke %08x%08x" +msgid "commit-graph improper chunk offset %08x%08x" +msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen" -#: commit-graph.c:221 +#: commit-graph.c:255 #, c-format -msgid "chunk id %08x appears multiple times" -msgstr "stycke-id %08x förekommer flera gånger" +msgid "commit-graph chunk id %08x appears multiple times" +msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger" -#: commit-graph.c:334 +#: commit-graph.c:388 #, c-format msgid "could not find commit %s" msgstr "kunde inte hitta incheckningen %s" -#: commit-graph.c:671 builtin/pack-objects.c:2646 +#: commit-graph.c:730 builtin/pack-objects.c:2649 #, c-format msgid "unable to get type of object %s" msgstr "kunde inte hämta typ för objektet %s" -#: commit-graph.c:704 +#: commit-graph.c:763 msgid "Loading known commits in commit graph" msgstr "Läser in kända incheckningar i incheckningsgraf" -#: commit-graph.c:720 +#: commit-graph.c:779 msgid "Expanding reachable commits in commit graph" msgstr "Expanderar nåbara incheckningar i incheckningsgraf" -#: commit-graph.c:732 +#: commit-graph.c:791 msgid "Clearing commit marks in commit graph" msgstr "Rensar incheckningsmärken i incheckningsgraf" -#: commit-graph.c:752 +#: commit-graph.c:811 msgid "Computing commit graph generation numbers" msgstr "Beräknar generationsvärden för incheckningsgraf" -#: commit-graph.c:869 +#: commit-graph.c:928 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket" msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket" -#: commit-graph.c:882 +#: commit-graph.c:941 #, c-format msgid "error adding pack %s" msgstr "fel vid tillägg av paketet %s" -#: commit-graph.c:884 +#: commit-graph.c:943 #, c-format msgid "error opening index for %s" msgstr "fel vid öppning av indexet för %s" -#: commit-graph.c:898 +#: commit-graph.c:957 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "Söker incheckningar för incheckingsgraf från %d referens" msgstr[1] "Söker incheckningar för incheckingsgraf från %d referenser" -#: commit-graph.c:930 +#: commit-graph.c:989 msgid "Finding commits for commit graph among packed objects" msgstr "Söker incheckningar för incheckingsgraf i packade objekt" -#: commit-graph.c:943 +#: commit-graph.c:1002 msgid "Counting distinct commits in commit graph" msgstr "Räknar olika incheckningar i incheckningsgraf" -#: commit-graph.c:956 +#: 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:965 +#: commit-graph.c:1024 msgid "Finding extra edges in commit graph" msgstr "Söker ytterligare kanter i incheckingsgraf" -#: commit-graph.c:989 +#: 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:996 midx.c:769 +#: commit-graph.c:1055 midx.c:805 #, c-format msgid "unable to create leading directories of %s" msgstr "kunde inte skapa inledande kataloger för %s" -#: commit-graph.c:1036 +#: commit-graph.c:1095 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Skriver ut incheckningsgraf i %d pass" msgstr[1] "Skriver ut incheckningsgraf i %d pass" -#: commit-graph.c:1109 +#: commit-graph.c:1160 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig" -#: commit-graph.c:1153 +#: commit-graph.c:1170 +#, c-format +msgid "commit-graph has incorrect OID order: %s then %s" +msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s" + +#: commit-graph.c:1180 commit-graph.c:1195 +#, c-format +msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" +msgstr "" +"incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u" + +#: commit-graph.c:1187 +#, c-format +msgid "failed to parse commit %s from commit-graph" +msgstr "kunde inte tolka incheckning %s från incheckningsgraf" + +#: commit-graph.c:1204 msgid "Verifying commits in commit graph" -msgstr "Bekräftar incheckningar i incheckningsgraf" +msgstr "Bekräftar incheckningar i incheckningsgrafen" + +#: commit-graph.c:1217 +#, c-format +msgid "failed to parse commit %s from object database for commit-graph" +msgstr "" +"misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf" + +#: commit-graph.c:1224 +#, c-format +msgid "root tree OID for commit %s in commit-graph is %s != %s" +msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s" + +#: commit-graph.c:1234 +#, c-format +msgid "commit-graph parent list for commit %s is too long" +msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång" + +#: commit-graph.c:1240 +#, c-format +msgid "commit-graph parent for %s is %s != %s" +msgstr "incheckningsgrafens förälder för %s är %s != %s" + +#: commit-graph.c:1253 +#, c-format +msgid "commit-graph parent list for commit %s terminates early" +msgstr "" +"incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt" + +#: commit-graph.c:1258 +#, c-format +msgid "" +"commit-graph has generation number zero for commit %s, but non-zero elsewhere" +msgstr "" +"incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-" +"noll på annan plats" + +#: commit-graph.c:1262 +#, c-format +msgid "" +"commit-graph has non-zero generation number for commit %s, but zero elsewhere" +msgstr "" +"incheckningsgrafen har generationsnummer skilt från noll för incheckningen " +"%s, men noll på annan plats" + +#: commit-graph.c:1277 +#, c-format +msgid "commit-graph generation for commit %s is %u != %u" +msgstr "incheckningsgrafens generation för incheckningen %s är %u != %u" + +#: commit-graph.c:1283 +#, c-format +msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" +msgstr "" +"incheckningsdatumet för incheckningen %s i incheckningsgrafen är %<PRIuMAX> !" +"= %<PRIuMAX>" #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" @@ -1573,7 +1642,7 @@ msgstr "nyckeln innehåller inte ett stycke: %s" msgid "key does not contain variable name: %s" msgstr "nyckeln innehåller inte variabelnamn: %s" -#: config.c:378 sequencer.c:2330 +#: config.c:378 sequencer.c:2459 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" @@ -1716,136 +1785,136 @@ msgstr "felformat värde för %s: %s" 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:1481 builtin/pack-objects.c:3394 +#: config.c:1483 builtin/pack-objects.c:3397 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1602 +#: config.c:1604 #, c-format msgid "unable to load config blob object '%s'" msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\"" -#: config.c:1605 +#: config.c:1607 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referensen \"%s\" pekar inte på en blob" -#: config.c:1622 +#: config.c:1624 #, c-format msgid "unable to resolve config blob '%s'" msgstr "kan inte slå upp konfigurerings-bloben \"%s\"" -#: config.c:1652 +#: config.c:1654 #, c-format msgid "failed to parse %s" msgstr "kunde inte tolka %s" -#: config.c:1705 +#: config.c:1710 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:2037 +#: config.c:2059 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2207 +#: config.c:2229 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:2250 +#: config.c:2272 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\"" -#: config.c:2276 +#: config.c:2298 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100" -#: config.c:2322 +#: config.c:2344 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2324 +#: config.c:2346 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d" -#: config.c:2405 +#: config.c:2427 #, c-format msgid "invalid section name '%s'" msgstr "felaktigt sektionsnamn \"%s\"" -#: config.c:2437 +#: config.c:2459 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2466 +#: config.c:2488 #, c-format msgid "failed to write new configuration file %s" msgstr "kan inte skriva nya konfigurationsfilen \"%s\"" -#: config.c:2716 config.c:3040 +#: config.c:2740 config.c:3064 #, c-format msgid "could not lock config file %s" msgstr "kunde inte låsa konfigurationsfilen %s" -#: config.c:2727 +#: config.c:2751 #, c-format msgid "opening %s" msgstr "öppnar %s" -#: config.c:2762 builtin/config.c:328 +#: config.c:2786 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "ogiltigt mönster: %s" -#: config.c:2787 +#: config.c:2811 #, c-format msgid "invalid config file %s" msgstr "ogiltig konfigurationsfil: \"%s\"" -#: config.c:2800 config.c:3053 +#: config.c:2824 config.c:3077 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:2811 +#: config.c:2835 #, c-format msgid "unable to mmap '%s'" msgstr "kunde inte utföra mmap på \"%s\"" -#: config.c:2820 config.c:3058 +#: config.c:2844 config.c:3082 #, c-format msgid "chmod on %s failed" msgstr "chmod misslyckades på %s" -#: config.c:2905 config.c:3155 +#: config.c:2929 config.c:3179 #, c-format msgid "could not write config file %s" msgstr "kunde inte skriva konfigurationsfilen %s" -#: config.c:2939 +#: config.c:2963 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:2941 builtin/remote.c:782 +#: config.c:2965 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" -#: config.c:3031 +#: config.c:3055 #, c-format msgid "invalid section name: %s" msgstr "felaktigt namn på stycke: %s" -#: config.c:3198 +#: config.c:3222 #, c-format msgid "missing value for '%s'" msgstr "värde saknas för \"%s\"" @@ -2000,30 +2069,30 @@ msgstr "ssh-varianten \"simple\" stöder inte -6" msgid "ssh variant 'simple' does not support setting port" msgstr "ssh-varianten \"simple\" stöder inte val av port" -#: connect.c:1259 +#: connect.c:1260 #, c-format msgid "strange pathname '%s' blocked" msgstr "konstigt sökvägsnamn \"%s\" blockerat" -#: connect.c:1304 +#: connect.c:1307 msgid "unable to fork" msgstr "kunde inte grena (fork)" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: connected.c:68 builtin/fsck.c:221 builtin/prune.c:146 +#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" -#: connected.c:80 +#: connected.c:97 msgid "Could not run 'git rev-list'" msgstr "Kunde inte köra \"git rev-list\"" -#: connected.c:100 +#: connected.c:117 msgid "failed write to rev-list" msgstr "kunde inte skriva till rev-list" -#: connected.c:107 +#: connected.c:124 msgid "failed to close rev-list's stdin" msgstr "kunde inte stänga rev-list:s standard in" @@ -2256,22 +2325,29 @@ msgstr "kunde inte läsa orderfilen \"%s\"" msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" -#: diff.c:108 -#, c-format -msgid "option '%s' requires a value" -msgstr "flaggan \"%s\" behöver ett värde" +#: diff-no-index.c:238 +msgid "git diff --no-index [<options>] <path> <path>" +msgstr "git diff --no-index [<flaggor>] <sökväg> <sökväg>" + +#: diff-no-index.c:263 +msgid "" +"Not a git repository. Use --no-index to compare two paths outside a working " +"tree" +msgstr "" +"Inte ett git-arkiv. Använd --no-index för att jämföra två sökvägar utanför " +"en arbetskatalog." -#: diff.c:158 +#: diff.c:155 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n" -#: diff.c:163 +#: diff.c:160 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Okänd dirstat-parameter \"%s\"\n" -#: diff.c:291 +#: diff.c:296 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -2279,7 +2355,7 @@ msgstr "" "färginställningen för flyttade block måste vara en av \"no\", \"default\", " "\"blocks\", \"zebra\", \"dimmed_zebra\", \"plain\"" -#: diff.c:319 +#: diff.c:324 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " @@ -2289,7 +2365,7 @@ msgstr "" "\", \"ignore-space-at-eol\", \"ignore-all-space\", \"allow-indentation-change" "\"" -#: diff.c:327 +#: diff.c:332 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" @@ -2297,12 +2373,12 @@ msgstr "" "color-moved-ws: allow-indentation-change kan inte kombineras med andra " "blankstegslägen" -#: diff.c:400 +#: diff.c:405 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:460 +#: diff.c:465 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -2311,24 +2387,35 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:4211 +#: diff.c:4210 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:4553 +#: diff.c:4555 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" -#: diff.c:4556 +#: diff.c:4558 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S och --find-object är ömsesidigt uteslutande" -#: diff.c:4634 +#: diff.c:4636 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:4800 +#: diff.c:4684 +#, c-format +msgid "invalid --stat value: %s" +msgstr "ogiltigt värde för --stat: %s" + +#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5216 +#: parse-options.c:200 +#, c-format +msgid "%s expects a numerical value" +msgstr "%s förväntar ett numeriskt värde" + +#: diff.c:4721 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2337,61 +2424,543 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:4814 +#: diff.c:4806 +#, c-format +msgid "unknown change class '%c' in --diff-filter=%s" +msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s" + +#: diff.c:4830 #, c-format -msgid "Failed to parse --submodule option parameter: '%s'" -msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" +msgid "unknown value after ws-error-highlight=%.*s" +msgstr "okänt värde efter ws-error-highlight=%.*s" + +#: diff.c:4844 +#, c-format +msgid "unable to resolve '%s'" +msgstr "kunde inte slå upp \"%s\"" + +#: diff.c:4894 diff.c:4900 +#, c-format +msgid "%s expects <n>/<m> form" +msgstr "%s förväntar formen <n>/<m>" + +#: diff.c:4912 +#, c-format +msgid "%s expects a character, got '%s'" +msgstr "%s förväntar ett tecken, fick \"%s\"" + +#: diff.c:4933 +#, c-format +msgid "bad --color-moved argument: %s" +msgstr "felaktigt argument till --color-moved: %s" + +#: diff.c:4952 +#, c-format +msgid "invalid mode '%s' in --color-moved-ws" +msgstr "ogiltigt läge %s\" i --color-moved-ws" + +#: diff.c:4992 +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och " +"\"histogram\"" + +#: diff.c:5028 diff.c:5048 +#, c-format +msgid "invalid argument to %s" +msgstr "ogiltigt argument för %s" + +#: diff.c:5186 +#, c-format +msgid "failed to parse --submodule option parameter: '%s'" +msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\"" + +#: diff.c:5240 +#, c-format +msgid "bad --word-diff argument: %s" +msgstr "felaktigt argument --word-diff: %s" + +#: diff.c:5263 +msgid "Diff output format options" +msgstr "Formatflaggor för diff-utdata" + +#: diff.c:5265 diff.c:5271 +msgid "generate patch" +msgstr "skapar patch" + +#: diff.c:5268 builtin/log.c:167 +msgid "suppress diff output" +msgstr "undertryck diff-utdata" + +#: diff.c:5273 diff.c:5387 diff.c:5394 +msgid "<n>" +msgstr "<n>" + +#: diff.c:5274 diff.c:5277 +msgid "generate diffs with <n> lines context" +msgstr "skapa diffar med <n> rader sammanhang" + +#: diff.c:5279 +msgid "generate the diff in raw format" +msgstr "generera diff i råformat" + +#: diff.c:5282 +msgid "synonym for '-p --raw'" +msgstr "synonym till \"-p --raw\"" + +#: diff.c:5286 +msgid "synonym for '-p --stat'" +msgstr "synonym till \"-p --stat\"" + +#: diff.c:5290 +msgid "machine friendly --stat" +msgstr "maskinläsbar --stat" + +#: diff.c:5293 +msgid "output only the last line of --stat" +msgstr "skriv bara ut den sista raden för --stat" + +#: diff.c:5295 diff.c:5303 +msgid "<param1,param2>..." +msgstr "<param1,param2>..." + +#: diff.c:5296 +msgid "" +"output the distribution of relative amount of changes for each sub-directory" +msgstr "" +"skriv ut distributionen av relativa mängder ändringar för varje underkatalog" + +#: diff.c:5300 +msgid "synonym for --dirstat=cumulative" +msgstr "synonym för --dirstat=cumulative" + +#: diff.c:5304 +msgid "synonym for --dirstat=files,param1,param2..." +msgstr "synonym för --dirstat=filer,param1,param2..." + +#: diff.c:5308 +msgid "warn if changes introduce conflict markers or whitespace errors" +msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel" + +#: diff.c:5311 +msgid "condensed summary such as creations, renames and mode changes" +msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen" + +#: diff.c:5314 +msgid "show only names of changed files" +msgstr "visa endast namnen på ändrade filer" + +#: diff.c:5317 +msgid "show only names and status of changed files" +msgstr "visa endast namn och status för ändrade filer" + +#: diff.c:5319 +msgid "<width>[,<name-width>[,<count>]]" +msgstr "<bredd>[,<namn-bredd>[,<antal>]]" + +#: diff.c:5320 +msgid "generate diffstat" +msgstr "skapa diffstat" + +#: diff.c:5322 diff.c:5325 diff.c:5328 +msgid "<width>" +msgstr "<bredd>" + +#: diff.c:5323 +msgid "generate diffstat with a given width" +msgstr "generera en diffstat med given bredd" + +#: diff.c:5326 +msgid "generate diffstat with a given name width" +msgstr "generera en diffstat med given namnbredd" + +#: diff.c:5329 +msgid "generate diffstat with a given graph width" +msgstr "generera en diffstat med given grafbredd" + +#: diff.c:5331 +msgid "<count>" +msgstr "<antal>" + +#: diff.c:5332 +msgid "generate diffstat with limited lines" +msgstr "generera diffstat med begränsade rader" + +#: diff.c:5335 +msgid "generate compact summary in diffstat" +msgstr "skapa kompakt översikt i diffstat" + +#: diff.c:5338 +msgid "output a binary diff that can be applied" +msgstr "skapa en binärdiff som kan appliceras" + +#: diff.c:5341 +msgid "show full pre- and post-image object names on the \"index\" lines" +msgstr "" +"visa fullständiga objektnamn i \"index\"-rader för läget både före och efter" + +#: diff.c:5343 +msgid "show colored diff" +msgstr "visa färgad diff" + +#: diff.c:5344 +msgid "<kind>" +msgstr "<typ>" + +#: diff.c:5345 +msgid "" +"highlight whitespace errors in the 'context', 'old' or 'new' lines in the " +"diff" +msgstr "" +"ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller " +"\"new\" (nya) rader i diffen" + +#: diff.c:5348 +msgid "" +"do not munge pathnames and use NULs as output field terminators in --raw or " +"--numstat" +msgstr "" +"skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw " +"eller --numstat" + +#: diff.c:5351 diff.c:5354 diff.c:5357 diff.c:5463 +msgid "<prefix>" +msgstr "<prefix>" + +#: diff.c:5352 +msgid "show the given source prefix instead of \"a/\"" +msgstr "visa givet källprefix istället för \"a/\"" + +#: diff.c:5355 +msgid "show the given source prefix instead of \"b/\"" +msgstr "visa givet källprefix istället för \"b/\"" + +#: diff.c:5358 +msgid "prepend an additional prefix to every line of output" +msgstr "lägg till ytterligare prefix på alla rader i utdata" + +#: diff.c:5361 +msgid "do not show any source or destination prefix" +msgstr "visa inte käll- eller målprefix" + +#: diff.c:5364 +msgid "show context between diff hunks up to the specified number of lines" +msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader" + +#: diff.c:5368 diff.c:5373 diff.c:5378 +msgid "<char>" +msgstr "<tecken>" + +#: diff.c:5369 +msgid "specify the character to indicate a new line instead of '+'" +msgstr "ange tecken för att ange ny rad istället för \"+\"" + +#: diff.c:5374 +msgid "specify the character to indicate an old line instead of '-'" +msgstr "ange tecken för att ange gammal rad istället för \"-\"" + +#: diff.c:5379 +msgid "specify the character to indicate a context instead of ' '" +msgstr "ange tecken för att ange sammanhang istället för \" \"" + +#: diff.c:5382 +msgid "Diff rename options" +msgstr "Diff-namnbytesflaggor" + +#: diff.c:5383 +msgid "<n>[/<m>]" +msgstr "<n>[/<m>]" + +#: diff.c:5384 +msgid "break complete rewrite changes into pairs of delete and create" +msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par" + +#: diff.c:5388 +msgid "detect renames" +msgstr "detektera namnändringar" + +#: diff.c:5392 +msgid "omit the preimage for deletes" +msgstr "ta bort för-version för borttagningar" + +#: diff.c:5395 +msgid "detect copies" +msgstr "detektera kopior" + +#: diff.c:5399 +msgid "use unmodified files as source to find copies" +msgstr "använd oförändrade som källa för att hitta kopior" + +#: diff.c:5401 +msgid "disable rename detection" +msgstr "inaktivera detektering av namnbyten" + +#: diff.c:5404 +msgid "use empty blobs as rename source" +msgstr "använd tomma blob:ar som namnändringskälla" + +#: diff.c:5406 +msgid "continue listing the history of a file beyond renames" +msgstr "fortsätt lista historiken för en fil bortom namnändringar" + +#: diff.c:5409 +msgid "" +"prevent rename/copy detection if the number of rename/copy targets exceeds " +"given limit" +msgstr "" +"förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver " +"given gräns" + +#: diff.c:5411 +msgid "Diff algorithm options" +msgstr "Alternativ för diff-algoritm" + +#: diff.c:5413 +msgid "produce the smallest possible diff" +msgstr "skapa minsta möjliga diff" + +#: diff.c:5416 +msgid "ignore whitespace when comparing lines" +msgstr "ignorera blanktecken vid radjämförelse" + +#: diff.c:5419 +msgid "ignore changes in amount of whitespace" +msgstr "ignorera ändringar i antal blanktecken vid radjämförelse" + +#: diff.c:5422 +msgid "ignore changes in whitespace at EOL" +msgstr "ignorera blanktecken vid radslut" + +#: diff.c:5425 +msgid "ignore carrier-return at the end of line" +msgstr "ignorera CR-tecken vid radslut" + +#: diff.c:5428 +msgid "ignore changes whose lines are all blank" +msgstr "ignorera ändringar i rader som är helt blanka" + +#: diff.c:5431 +msgid "heuristic to shift diff hunk boundaries for easy reading" +msgstr "heuristik för att flytta diff-gränser för lättare läsning" + +#: diff.c:5434 +msgid "generate diff using the \"patience diff\" algorithm" +msgstr "skapa diffar med algoritmen \"patience diff\"" + +#: diff.c:5438 +msgid "generate diff using the \"histogram diff\" algorithm" +msgstr "skapa diffar med algoritmen \"histogram diff\"" -#: diff.c:5900 +#: diff.c:5440 +msgid "<algorithm>" +msgstr "<algoritm>" + +#: diff.c:5441 +msgid "choose a diff algorithm" +msgstr "välj en diff-algoritm" + +#: diff.c:5443 +msgid "<text>" +msgstr "<text>" + +#: diff.c:5444 +msgid "generate diff using the \"anchored diff\" algorithm" +msgstr "skapa diffar med algoritmen \"anchored diff\"" + +#: diff.c:5446 diff.c:5455 diff.c:5458 +msgid "<mode>" +msgstr "<läge>" + +#: diff.c:5447 +msgid "show word diff, using <mode> to delimit changed words" +msgstr "visa orddiff, där <läge> avgränsar ändrade ord" + +#: diff.c:5449 diff.c:5452 diff.c:5497 +msgid "<regex>" +msgstr "<reguttr>" + +#: diff.c:5450 +msgid "use <regex> to decide what a word is" +msgstr "använd <reguttr> för att bestämma vad som är ett ord" + +#: diff.c:5453 +msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" +msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>" + +#: diff.c:5456 +msgid "move lines of code are colored differently" +msgstr "flyttade kodrader färgas på annat sätt" + +#: diff.c:5459 +msgid "how white spaces are ignored in --color-moved" +msgstr "hur blanktecken ignoreras i --color-moved" + +#: diff.c:5462 +msgid "Diff other options" +msgstr "Andra diff-flaggor" + +#: diff.c:5464 +msgid "when run from subdir, exclude changes outside and show relative paths" +msgstr "" +"vid start från underkatalog, uteslut ändringar utanför och visa relativa " +"sökvägar" + +#: diff.c:5468 +msgid "treat all files as text" +msgstr "hantera alla filer som text" + +#: diff.c:5470 +msgid "swap two inputs, reverse the diff" +msgstr "växla två indatafiler, vänd diffen" + +#: diff.c:5472 +msgid "exit with 1 if there were differences, 0 otherwise" +msgstr "avsluta med 1 vid ändringar, annars 0" + +#: diff.c:5474 +msgid "disable all output of the program" +msgstr "slå av alla utdata från programmet" + +#: diff.c:5476 +msgid "allow an external diff helper to be executed" +msgstr "tillåt köra en extern diff-hjälpare" + +#: diff.c:5478 +msgid "run external text conversion filters when comparing binary files" +msgstr "kör externt textkonverteringsfiler när binärfiler jämförs" + +#: diff.c:5480 +msgid "<when>" +msgstr "<när>" + +#: diff.c:5481 +msgid "ignore changes to submodules in the diff generation" +msgstr "ignorera ändringar i undermoduler när diffen skapas" + +#: diff.c:5484 +msgid "<format>" +msgstr "<format>" + +#: diff.c:5485 +msgid "specify how differences in submodules are shown" +msgstr "ange hur ändringar i undermoduler visas" + +#: diff.c:5489 +msgid "hide 'git add -N' entries from the index" +msgstr "dölj \"git add -N\"-poster från indexet" + +#: diff.c:5492 +msgid "treat 'git add -N' entries as real in the index" +msgstr "tolka \"git add -N\"-poster som äkta i indexet" + +#: diff.c:5494 +msgid "<string>" +msgstr "<sträng>" + +#: diff.c:5495 +msgid "" +"look for differences that change the number of occurrences of the specified " +"string" +msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng" + +#: diff.c:5498 +msgid "" +"look for differences that change the number of occurrences of the specified " +"regex" +msgstr "" +"se efter ändringar som ändrar antalet förekomster av angivet reguljärt " +"uttryck" + +#: diff.c:5501 +msgid "show all changes in the changeset with -S or -G" +msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G" + +#: diff.c:5504 +msgid "treat <string> in -S as extended POSIX regular expression" +msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck" + +#: diff.c:5507 +msgid "control the order in which files appear in the output" +msgstr "styr ordningen i vilken filer visas i utdata" + +#: diff.c:5508 +msgid "<object-id>" +msgstr "<objekt-id>" + +#: diff.c:5509 +msgid "" +"look for differences that change the number of occurrences of the specified " +"object" +msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt" + +#: diff.c:5511 +msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" +msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" + +#: diff.c:5512 +msgid "select files by diff type" +msgstr "välj filter efter diff-typ" + +#: diff.c:5514 +msgid "<file>" +msgstr "<fil>" + +#: diff.c:5515 +msgid "Output to a specific file" +msgstr "Skriv utdata till en specifik fil" + +#: diff.c:6148 msgid "inexact rename detection was skipped due to too many files." msgstr "" "onöjaktig namnbytesdetektering utfördes inte på grund av för många filer." -#: diff.c:5903 +#: diff.c:6151 msgid "only found copies from modified paths due to too many files." msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer." -#: diff.c:5906 +#: diff.c:6154 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" "du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt." -#: dir.c:538 +#: dir.c:537 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några av git kända filer" -#: dir.c:927 +#: dir.c:926 #, c-format msgid "cannot use %s as an exclude file" msgstr "kan inte använda %s som exkluderingsfil" -#: dir.c:1842 +#: dir.c:1843 #, c-format msgid "could not open directory '%s'" msgstr "kunde inte öppna katalogen \"%s\"" -#: dir.c:2084 +#: dir.c:2085 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:2208 +#: dir.c:2209 msgid "untracked cache is disabled on this system or location" msgstr "ospårad cache är inaktiverad på systemet eller platsen" -#: dir.c:3009 +#: dir.c:3013 #, c-format msgid "index file corrupt in repo %s" msgstr "indexfilen trasig i arkivet %s" -#: dir.c:3054 dir.c:3059 +#: dir.c:3058 dir.c:3063 #, c-format msgid "could not create directories for %s" msgstr "kunde inte skapa kataloger för %s" -#: dir.c:3088 +#: dir.c:3092 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" @@ -2405,7 +2974,7 @@ msgstr "tips: Väntar på att textredigeringsprogrammet skall stänga filen...%c msgid "Filtering content" msgstr "Filtrerar innehåll" -#: entry.c:465 +#: entry.c:476 #, c-format msgid "could not stat file '%s'" msgstr "kunde inte ta status på filen \"%s\"" @@ -2420,7 +2989,7 @@ msgstr "felaktig git-namnrymdssökväg \"%s\"" msgid "could not set GIT_DIR to '%s'" msgstr "kunde inte ställa in GIT_DIR till \"%s\"" -#: exec-cmd.c:361 +#: exec-cmd.c:363 #, c-format msgid "too many args to run %s" msgstr "för många flaggor för att köra %s" @@ -2446,227 +3015,235 @@ msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket" msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\"" -#: fetch-pack.c:256 +#: fetch-pack.c:196 +msgid "unable to write to remote" +msgstr "kunde inte skriva till fjärren" + +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc kräver ”multi_ack_detailed”" -#: fetch-pack.c:358 fetch-pack.c:1264 +#: fetch-pack.c:360 fetch-pack.c:1271 #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" -#: fetch-pack.c:364 fetch-pack.c:1271 +#: fetch-pack.c:366 fetch-pack.c:1277 #, c-format msgid "invalid unshallow line: %s" msgstr "ogiltig \"unshallow\"-rad: %s" -#: fetch-pack.c:366 fetch-pack.c:1273 +#: fetch-pack.c:368 fetch-pack.c:1279 #, c-format msgid "object not found: %s" msgstr "objektet hittades inte: %s" -#: fetch-pack.c:369 fetch-pack.c:1276 +#: fetch-pack.c:371 fetch-pack.c:1282 #, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" -#: fetch-pack.c:371 fetch-pack.c:1278 +#: fetch-pack.c:373 fetch-pack.c:1284 #, c-format msgid "no shallow found: %s" msgstr "ingen \"shallow\" hittades: %s" -#: fetch-pack.c:374 fetch-pack.c:1282 +#: fetch-pack.c:376 fetch-pack.c:1288 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "förväntade shallow/unshallow, fick %s" -#: fetch-pack.c:415 +#: fetch-pack.c:417 #, c-format msgid "got %s %d %s" msgstr "fick %s %d %s" -#: fetch-pack.c:432 +#: fetch-pack.c:434 #, c-format msgid "invalid commit %s" msgstr "ogiltig incheckning %s" -#: fetch-pack.c:463 +#: fetch-pack.c:465 msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:475 progress.c:229 +#: fetch-pack.c:477 progress.c:284 msgid "done" msgstr "klart" -#: fetch-pack.c:487 +#: fetch-pack.c:489 #, c-format msgid "got %s (%d) %s" msgstr "fick %s (%d) %s" -#: fetch-pack.c:533 +#: fetch-pack.c:535 #, c-format msgid "Marking %s as complete" msgstr "Markerar %s som komplett" -#: fetch-pack.c:740 +#: fetch-pack.c:744 #, c-format msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:779 +#: fetch-pack.c:783 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:787 +#: fetch-pack.c:791 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:855 +#: fetch-pack.c:859 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-patch: kunde inte grena av %s" -#: fetch-pack.c:871 +#: fetch-pack.c:875 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:873 +#: fetch-pack.c:877 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:902 +#: fetch-pack.c:906 msgid "Server does not support shallow clients" msgstr "Servern stöder inte klienter med grunda arkiv" -#: fetch-pack.c:906 +#: fetch-pack.c:910 msgid "Server supports multi_ack_detailed" msgstr "Servern stöder \"multi_ack_detailed\"" -#: fetch-pack.c:909 +#: fetch-pack.c:913 msgid "Server supports no-done" msgstr "Servern stöder \"no-done\"" -#: fetch-pack.c:915 +#: fetch-pack.c:919 msgid "Server supports multi_ack" msgstr "Servern stöder \"multi_ack\"" -#: fetch-pack.c:919 +#: fetch-pack.c:923 msgid "Server supports side-band-64k" msgstr "Servern stöder \"side-band-64k\"" -#: fetch-pack.c:923 +#: fetch-pack.c:927 msgid "Server supports side-band" msgstr "Servern stöder \"side-band\"" -#: fetch-pack.c:927 +#: fetch-pack.c:931 msgid "Server supports allow-tip-sha1-in-want" msgstr "Servern stöder \"allow-tip-sha1-in-want\"" -#: fetch-pack.c:931 +#: fetch-pack.c:935 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Servern stöder \"allow-reachable-sha1-in-want\"" -#: fetch-pack.c:941 +#: fetch-pack.c:945 msgid "Server supports ofs-delta" msgstr "Servern stöder \"ofs-delta\"" -#: fetch-pack.c:947 fetch-pack.c:1140 +#: fetch-pack.c:951 fetch-pack.c:1144 msgid "Server supports filter" msgstr "Servern stöder filter" -#: fetch-pack.c:955 +#: fetch-pack.c:959 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:961 +#: fetch-pack.c:965 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:965 +#: fetch-pack.c:969 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:967 +#: fetch-pack.c:971 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:984 +#: fetch-pack.c:988 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:996 fetch-pack.c:1419 +#: fetch-pack.c:1000 fetch-pack.c:1449 msgid "git fetch-pack: fetch failed." msgstr "git fetch-patch: hämtning misslyckades." -#: fetch-pack.c:1134 +#: fetch-pack.c:1138 msgid "Server does not support shallow requests" msgstr "Servern stöder inte grunda förfrågningar" -#: fetch-pack.c:1184 +#: fetch-pack.c:1171 +msgid "unable to write request to remote" +msgstr "kunde inte skriva anrop till fjärren" + +#: fetch-pack.c:1189 #, c-format msgid "error reading section header '%s'" msgstr "fel vid läsning av styckehuvudet \"%s\"" -#: fetch-pack.c:1190 +#: fetch-pack.c:1195 #, c-format msgid "expected '%s', received '%s'" msgstr "förväntade \"%s\", tog emot \"%s\"" -#: fetch-pack.c:1229 +#: fetch-pack.c:1234 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "förväntade bekräftelserad: \"%s\"" -#: fetch-pack.c:1234 +#: fetch-pack.c:1239 #, c-format msgid "error processing acks: %d" msgstr "fel vid hantering av bekräftelser: %d" -#: fetch-pack.c:1244 +#: fetch-pack.c:1249 msgid "expected packfile to be sent after 'ready'" msgstr "väntade att paketfil skulle sändas efter \"ready\"" -#: fetch-pack.c:1246 +#: fetch-pack.c:1251 msgid "expected no other sections to be sent after no 'ready'" msgstr "" "väntade inte att några ytterligare sektioner skulle sändas efter \"ready\"" -#: fetch-pack.c:1287 +#: fetch-pack.c:1293 #, c-format msgid "error processing shallow info: %d" msgstr "fel vid hantering av grund (\"shallow\") info: %d" -#: fetch-pack.c:1308 +#: fetch-pack.c:1340 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "förväntade wanted-ref, fick %s" -#: fetch-pack.c:1318 +#: fetch-pack.c:1345 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "oväntad wanted-ref: \"%s\"" -#: fetch-pack.c:1322 +#: fetch-pack.c:1350 #, c-format msgid "error processing wanted refs: %d" msgstr "fel vid hantering av önskade referenser: %d" -#: fetch-pack.c:1646 +#: fetch-pack.c:1676 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1664 builtin/clone.c:671 +#: fetch-pack.c:1699 builtin/clone.c:676 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: fetch-pack.c:1690 +#: fetch-pack.c:1726 #, c-format msgid "no such remote ref %s" msgstr "ingen sådan fjärreferens: %s" -#: fetch-pack.c:1693 +#: fetch-pack.c:1729 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s" @@ -2694,7 +3271,7 @@ msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors" msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2130 setup.c:164 builtin/clone.c:414 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" @@ -2770,28 +3347,28 @@ 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:90 +#: help.c:363 git.c:97 #, c-format msgid "unsupported command listing type '%s'" msgstr "okänd kommandolisttyp \"%s\"" -#: help.c:410 +#: help.c:403 msgid "The common Git guides are:" msgstr "De vanliga Git-vägledningarna är:" -#: help.c:519 +#: help.c:512 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "Se \"git help <kommando>\" för att läsa om ett specifikt underkommando" -#: help.c:524 +#: help.c:517 msgid "External commands" msgstr "Externa kommandon" -#: help.c:539 +#: help.c:532 msgid "Command aliases" msgstr "Kommadoalias" -#: help.c:603 +#: help.c:596 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -2800,32 +3377,32 @@ msgstr "" "\"%s\" verkar vara ett git-kommando, men vi kan inte\n" "köra det. Kanske git-%s är trasigt?" -#: help.c:662 +#: help.c:655 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls." -#: help.c:684 +#: help.c:677 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns." -#: help.c:689 +#: help.c:682 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Fortsätter under förutsättningen att du menade ”%s”." -#: help.c:694 +#: help.c:687 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" "Fortsätter om %0.1f sekunder, under förutsättningen att du menade ”%s”." -#: help.c:702 +#: help.c:695 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"." -#: help.c:706 +#: help.c:699 msgid "" "\n" "The most similar command is" @@ -2839,16 +3416,16 @@ msgstr[1] "" "\n" "Mest lika kommandon är" -#: help.c:721 +#: help.c:714 msgid "git version [<options>]" msgstr "git version [<flaggor>]" -#: help.c:789 +#: help.c:782 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:793 +#: help.c:786 msgid "" "\n" "Did you mean this?" @@ -2862,7 +3439,7 @@ msgstr[1] "" "\n" "Menade du ett av dessa?" -#: ident.c:345 +#: ident.c:349 msgid "" "\n" "*** Please tell me who you are.\n" @@ -2888,39 +3465,54 @@ msgstr "" "Kör utan --global för att endast ändra i aktuellt arkiv.\n" "\n" -#: ident.c:369 +#: ident.c:379 msgid "no email was given and auto-detection is disabled" msgstr "ingen e-post angavs och autodetektering är inaktiverad" -#: ident.c:374 +#: ident.c:384 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "kunde inte autodetektera e-postadress (fick \"%s\")" -#: ident.c:384 +#: ident.c:401 msgid "no name was given and auto-detection is disabled" msgstr "inget namn angavs och autodetektering är inaktiverad" -#: ident.c:390 +#: ident.c:407 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "kunde inte autodetektera namn (fick \"%s\")" -#: ident.c:398 +#: ident.c:415 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "tomt ident-namn (för <%s>) ej tillåtet" -#: ident.c:404 +#: ident.c:421 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "namnet består enbart av ej tillåtna tecken: %s" -#: ident.c:419 builtin/commit.c:608 +#: ident.c:436 builtin/commit.c:608 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" +#: list-objects.c:129 +#, c-format +msgid "entry '%s' in tree %s has tree mode, but is not a tree" +msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd" + +#: list-objects.c:142 +#, c-format +msgid "entry '%s' in tree %s has blob mode, but is not a blob" +msgstr "posten \"%s\" i trädet %s har blob-läge, men är inte en blob" + +#: list-objects.c:378 +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "kunde inte läsa in rot-trädet för incheckningen %s" + #: list-objects-filter-options.c:36 msgid "multiple filter-specs cannot be combined" msgstr "flera filterspecifikationer kan inte kombineras" @@ -2929,7 +3521,7 @@ msgstr "flera filterspecifikationer kan inte kombineras" msgid "expected 'tree:<depth>'" msgstr "förväntade \"tree:<djup>\"" -#: list-objects-filter-options.c:152 +#: list-objects-filter-options.c:156 msgid "cannot change partial clone promisor remote" msgstr "kan inte ändra kontraktsfjärr för delvis kloning" @@ -2962,120 +3554,121 @@ 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:1884 builtin/am.c:1918 -#: builtin/checkout.c:416 builtin/checkout.c:745 builtin/clone.c:771 +#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921 +#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:776 +#: builtin/stash.c:264 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: merge-recursive.c:332 +#: merge-recursive.c:322 msgid "(bad commit)\n" msgstr "(felaktig incheckning)\n" -#: merge-recursive.c:355 +#: merge-recursive.c:345 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" "add_cahceinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen." -#: merge-recursive.c:364 +#: merge-recursive.c:354 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar " "sammanslagningen." -#: merge-recursive.c:447 +#: merge-recursive.c:437 msgid "error building trees" msgstr "fel vid byggande av träd" -#: merge-recursive.c:902 +#: merge-recursive.c:861 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:913 +#: merge-recursive.c:872 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Tar bort %s för att göra plats för underkatalog\n" -#: merge-recursive.c:927 merge-recursive.c:946 +#: merge-recursive.c:886 merge-recursive.c:905 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:936 +#: merge-recursive.c:895 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:978 builtin/cat-file.c:40 +#: merge-recursive.c:936 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:980 +#: merge-recursive.c:939 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:1004 +#: merge-recursive.c:963 #, c-format msgid "failed to open '%s': %s" msgstr "misslyckades öppna \"%s\": %s" -#: merge-recursive.c:1015 +#: merge-recursive.c:974 #, c-format msgid "failed to symlink '%s': %s" msgstr "misslyckades skapa symboliska länken \"%s\": %s" -#: merge-recursive.c:1020 +#: merge-recursive.c:979 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "vet inte hur %06o %s \"%s\" skall hanteras" -#: merge-recursive.c:1211 +#: merge-recursive.c:1175 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)" -#: merge-recursive.c:1218 +#: merge-recursive.c:1182 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)" -#: merge-recursive.c:1225 +#: merge-recursive.c:1189 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Misslyckades slå ihop undermodulen %s (incheckningar följer inte " "sammanslagningsbasen)" -#: merge-recursive.c:1233 merge-recursive.c:1245 +#: merge-recursive.c:1197 merge-recursive.c:1209 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Snabbspolar undermodulen %s till följande incheckning:" -#: merge-recursive.c:1236 merge-recursive.c:1248 +#: merge-recursive.c:1200 merge-recursive.c:1212 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Snabbspolar undermodulen %s" -#: merge-recursive.c:1271 +#: merge-recursive.c:1235 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar " "hittades inte)" -#: merge-recursive.c:1275 +#: merge-recursive.c:1239 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)" -#: merge-recursive.c:1276 +#: merge-recursive.c:1240 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n" -#: merge-recursive.c:1279 +#: merge-recursive.c:1243 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3092,32 +3685,32 @@ msgstr "" "\n" "vilket godtar lösningen.\n" -#: merge-recursive.c:1288 +#: merge-recursive.c:1252 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)" -#: merge-recursive.c:1361 +#: merge-recursive.c:1325 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:1366 +#: merge-recursive.c:1330 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:1398 +#: merge-recursive.c:1362 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1419 +#: merge-recursive.c:1385 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället." -#: merge-recursive.c:1486 +#: merge-recursive.c:1457 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3126,7 +3719,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet." -#: merge-recursive.c:1491 +#: merge-recursive.c:1462 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3135,7 +3728,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av " "%s lämnad i trädet." -#: merge-recursive.c:1498 +#: merge-recursive.c:1469 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3144,7 +3737,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet vid %s." -#: merge-recursive.c:1503 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3153,40 +3746,40 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av " "%s lämnad i trädet vid %s." -#: merge-recursive.c:1537 +#: merge-recursive.c:1509 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1537 +#: merge-recursive.c:1509 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213 +#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Vägrar förlora lortig fil vid \"%s\"" -#: merge-recursive.c:1643 +#: merge-recursive.c:1599 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen." -#: merge-recursive.c:1706 +#: merge-recursive.c:1657 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s" -#: merge-recursive.c:1734 +#: merge-recursive.c:1687 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s är en katalog i %s lägger till som %s istället" -#: merge-recursive.c:1739 +#: merge-recursive.c:1692 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället" -#: merge-recursive.c:1759 +#: merge-recursive.c:1711 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3195,17 +3788,17 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1764 +#: merge-recursive.c:1716 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1868 +#: merge-recursive.c:1825 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s" -#: merge-recursive.c:2064 +#: merge-recursive.c:2030 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3216,7 +3809,7 @@ msgstr "" "katalogen %s bytte namn till flera andra kataloger, utan att någon " "destination fick en majoritet av filerna." -#: merge-recursive.c:2096 +#: merge-recursive.c:2062 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3225,7 +3818,7 @@ msgstr "" "KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för " "implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s." -#: merge-recursive.c:2106 +#: merge-recursive.c:2072 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3234,7 +3827,7 @@ msgstr "" "KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till " "%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s" -#: merge-recursive.c:2198 +#: merge-recursive.c:2164 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3243,7 +3836,7 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog " "%s->%s i %s" -#: merge-recursive.c:2443 +#: merge-recursive.c:2408 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -3252,81 +3845,117 @@ msgstr "" "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har " "bytt namn." -#: merge-recursive.c:3022 +#: merge-recursive.c:2929 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:3025 +#: merge-recursive.c:2932 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:3094 +#: merge-recursive.c:2996 msgid "modify" msgstr "ändra" -#: merge-recursive.c:3094 +#: merge-recursive.c:2996 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:3105 +#: merge-recursive.c:3008 msgid "content" msgstr "innehåll" -#: merge-recursive.c:3112 +#: merge-recursive.c:3012 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:3160 +#: merge-recursive.c:3035 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:3182 git-submodule.sh:861 +#: merge-recursive.c:3057 git-submodule.sh:937 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:3183 +#: merge-recursive.c:3058 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3216 +#: merge-recursive.c:3088 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:3319 +#: merge-recursive.c:3170 +#, c-format +msgid "" +"Path updated: %s added in %s inside a directory that was renamed in %s; " +"moving it to %s." +msgstr "" +"Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; " +"flyttar den till %s." + +#: merge-recursive.c:3173 +#, c-format +msgid "" +"CONFLICT (file location): %s added in %s inside a directory that was renamed " +"in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i " +"%s, föreslår att den bör flyttas till%s." + +#: merge-recursive.c:3177 +#, c-format +msgid "" +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " +"%s; moving it to %s." +msgstr "" +"Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte " +"namn i %s; flyttar den till %s." + +#: merge-recursive.c:3180 +#, c-format +msgid "" +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " +"was renamed in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som " +"bytte namn i %s; flyttar den till %s." + +#: merge-recursive.c:3294 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:3345 +#: merge-recursive.c:3317 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:3351 +#: merge-recursive.c:3322 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:3358 +#: merge-recursive.c:3329 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s" -#: merge-recursive.c:3367 +#: merge-recursive.c:3338 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:3376 +#: merge-recursive.c:3347 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3417 +#: merge-recursive.c:3385 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3336,148 +3965,160 @@ msgstr "" "sammanslagning:\n" " %s" -#: merge-recursive.c:3428 +#: merge-recursive.c:3396 msgid "Already up to date!" msgstr "Redan à jour!" -#: merge-recursive.c:3437 +#: merge-recursive.c:3405 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:3536 +#: merge-recursive.c:3504 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:3549 +#: merge-recursive.c:3517 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "hittade %u gemensam förfader:" msgstr[1] "hittade %u gemensamma förfäder:" -#: merge-recursive.c:3588 +#: merge-recursive.c:3556 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:3654 +#: merge-recursive.c:3622 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850 +#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." -#: midx.c:65 +#: midx.c:66 #, c-format msgid "multi-pack-index file %s is too small" msgstr "multi-pack-indexfilen %s är för liten" -#: midx.c:81 +#: midx.c:82 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x" -#: midx.c:86 +#: midx.c:87 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-indexversionen %d stöds inte" -#: midx.c:91 +#: midx.c:92 #, c-format msgid "hash version %u does not match" msgstr "hash-versionen %u stämmer inte" -#: midx.c:105 +#: midx.c:106 msgid "invalid chunk offset (too large)" msgstr "felaktigt offset för stycke (för stort)" -#: midx.c:129 +#: midx.c:130 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "avslutande multi-pack-index-stycke-ID förekommer tidigare än förväntat" -#: midx.c:142 +#: midx.c:143 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index saknar krävd paketnamn-stycke" -#: midx.c:144 +#: midx.c:145 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index saknar krävt OID-utbredningsstycke" -#: midx.c:146 +#: midx.c:147 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke" -#: midx.c:148 +#: midx.c:149 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index saknar krävt objekt-offsetstycke" -#: midx.c:162 +#: midx.c:163 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\"" -#: midx.c:205 +#: midx.c:209 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "bad pack-int-id: %u (%u paket totalt)" -#: midx.c:246 +#: midx.c:250 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten" -#: midx.c:271 +#: midx.c:275 msgid "error preparing packfile from multi-pack-index" msgstr "fel när paketfiler från multi-pack-index skulle förberedas" -#: midx.c:407 +#: midx.c:443 #, c-format msgid "failed to add packfile '%s'" msgstr "misslyckades läsa paketfilen \"%s\"" -#: midx.c:413 +#: midx.c:449 #, c-format msgid "failed to open pack-index '%s'" msgstr "misslyckades öppna paketindexet \"%s\"" -#: midx.c:507 +#: midx.c:543 #, c-format msgid "failed to locate object %d in packfile" msgstr "misslyckades hitta objekt %d i paketfilen" -#: midx.c:943 +#: midx.c:979 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "misslyckades städa multi-pack-index på %s" -#: midx.c:981 +#: midx.c:1034 +msgid "Looking for referenced packfiles" +msgstr "Ser efter refererade packfiler" + +#: midx.c:1049 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" "oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:992 +#: midx.c:1053 +msgid "Verifying OID order in MIDX" +msgstr "Bekräftar OID-ordning i MIDX" + +#: midx.c:1062 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:996 +#: midx.c:1081 +msgid "Sorting objects by packfile" +msgstr "Sorterar objekt efter packfil" + +#: midx.c:1087 msgid "Verifying object offsets" msgstr "Bekräftar offset för objekt" -#: midx.c:1004 +#: midx.c:1103 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "misslyckades läsa paketpost för oid[%d] = %s" -#: midx.c:1010 +#: midx.c:1109 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "misslyckades läsa paketindex för paketfil %s" -#: midx.c:1019 +#: midx.c:1118 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>" @@ -3562,85 +4203,80 @@ msgstr "kunde inte tolka objektet: %s" msgid "hash mismatch %s" msgstr "hashvärde stämmer inte överens %s" -#: packfile.c:607 +#: packfile.c:617 msgid "offset before end of packfile (broken .idx?)" msgstr "offset före slutet av packfilen (trasig .idx?)" -#: packfile.c:1870 +#: packfile.c:1880 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset före slutet av packindex för %s (trasigt index?)" -#: packfile.c:1874 +#: packfile.c:1884 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex för %s (trunkerat index?)" -#: parse-options.c:35 +#: parse-options.c:38 #, c-format msgid "%s requires a value" msgstr "%s behöver ett värde" -#: parse-options.c:69 +#: parse-options.c:73 #, c-format msgid "%s is incompatible with %s" msgstr "%s är inkompatibel med %s" -#: parse-options.c:74 +#: parse-options.c:78 #, c-format msgid "%s : incompatible with something else" msgstr "%s: inkompatibelt med något annat" -#: parse-options.c:88 parse-options.c:92 parse-options.c:260 +#: parse-options.c:92 parse-options.c:96 parse-options.c:287 #, c-format msgid "%s takes no value" msgstr "%s tar inget värde" -#: parse-options.c:90 +#: parse-options.c:94 #, c-format msgid "%s isn't available" msgstr "%s är inte tillgängligt" -#: parse-options.c:178 -#, c-format -msgid "%s expects a numerical value" -msgstr "%s förväntar ett numeriskt värde" - -#: parse-options.c:194 +#: parse-options.c:216 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffix" -#: parse-options.c:322 +#: parse-options.c:356 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)" -#: parse-options.c:356 parse-options.c:364 +#: parse-options.c:390 parse-options.c:398 #, c-format msgid "did you mean `--%s` (with two dashes ?)" msgstr "menade du \"--%s\" (med två bindestreck?)" -#: parse-options.c:649 +#: parse-options.c:733 #, c-format msgid "unknown option `%s'" msgstr "okänd flagga \"%s\"" -#: parse-options.c:651 +#: parse-options.c:735 #, c-format msgid "unknown switch `%c'" msgstr "okänd flagga \"%c\"" -#: parse-options.c:653 +#: parse-options.c:737 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "okänd icke-ascii-flagga i strängen: \"%s\"" -#: parse-options.c:675 +#: parse-options.c:759 msgid "..." msgstr "..." -#: parse-options.c:694 +#: parse-options.c:778 #, c-format msgid "usage: %s" msgstr "användning: %s" @@ -3648,17 +4284,17 @@ msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:700 +#: parse-options.c:784 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:703 +#: parse-options.c:787 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:742 +#: parse-options.c:826 msgid "-NUM" msgstr "-TAL" @@ -3678,12 +4314,12 @@ msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "" "flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)" -#: parse-options-cb.c:110 +#: parse-options-cb.c:127 parse-options-cb.c:144 #, c-format msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: path.c:894 +#: path.c:897 #, c-format msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för gruppen" @@ -3762,45 +4398,53 @@ msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s" msgid "pathspec '%s' is beyond a symbolic link" msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" -#: pkt-line.c:104 +#: pkt-line.c:92 +msgid "unable to write flush packet" +msgstr "kan inte skriva flush-paket" + +#: pkt-line.c:99 +msgid "unable to write delim packet" +msgstr "kan inte skriva delim-paket" + +#: pkt-line.c:106 msgid "flush packet write failed" msgstr "fel vid skrivning av \"flush\"-paket" -#: pkt-line.c:144 pkt-line.c:230 +#: pkt-line.c:146 pkt-line.c:232 msgid "protocol error: impossibly long line" msgstr "protokollfel: omöjligt lång rad" -#: pkt-line.c:160 pkt-line.c:162 +#: pkt-line.c:162 pkt-line.c:164 msgid "packet write with format failed" msgstr "paketskrivning med format misslyckades" -#: pkt-line.c:194 +#: pkt-line.c:196 msgid "packet write failed - data exceeds max packet size" msgstr "paketskrivning misslyckades - data överskrider maximal paketstorlek" -#: pkt-line.c:201 pkt-line.c:208 +#: pkt-line.c:203 pkt-line.c:210 msgid "packet write failed" msgstr "paketskrivning misslyckades" -#: pkt-line.c:293 +#: pkt-line.c:295 msgid "read error" msgstr "läsfel" -#: pkt-line.c:301 +#: pkt-line.c:303 msgid "the remote end hung up unexpectedly" msgstr "fjärren lade på oväntat" -#: pkt-line.c:329 +#: pkt-line.c:331 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "protokollfel: felaktig radlängdstecken: %.4s" -#: pkt-line.c:339 pkt-line.c:344 +#: pkt-line.c:341 pkt-line.c:346 #, c-format msgid "protocol error: bad line length %d" msgstr "protokollfel: felaktig radlängd: %d" -#: pkt-line.c:353 +#: pkt-line.c:362 #, c-format msgid "remote error: %s" msgstr "fjärrfel: %s" @@ -3814,7 +4458,7 @@ msgstr "Uppdaterar indexet" msgid "unable to create threaded lstat: %s" msgstr "kunde inte skapa trådad lstat: %s" -#: pretty.c:963 +#: pretty.c:966 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" @@ -3826,7 +4470,7 @@ msgstr "kunde inte starta \"log\"" msgid "could not read `log` output" msgstr "kunde inte läsa utdata från \"log\"" -#: range-diff.c:74 sequencer.c:4828 +#: range-diff.c:74 sequencer.c:4897 #, c-format msgid "could not parse commit '%s'" msgstr "kunde inte tolka incheckningen \"%s\"" @@ -3840,46 +4484,51 @@ msgstr "misslyckades skapa diff" msgid "could not parse log for '%s'" msgstr "kunde inte tolka loggen för \"%s\"" -#: read-cache.c:673 +#: read-cache.c:680 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "lägger inte till filalias \"%s\" (\"%s\" finns redan i indexet)" -#: read-cache.c:689 +#: read-cache.c:696 msgid "cannot create an empty blob in the object database" msgstr "kan inte skapa tom blob i objektdatabasen" -#: read-cache.c:710 +#: read-cache.c:718 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" "%s: kan bara lägga till vanliga filer, symboliska länkar och git-kataloger" -#: read-cache.c:765 +#: read-cache.c:723 +#, c-format +msgid "'%s' does not have a commit checked out" +msgstr "\"%s\" har inte någon utcheckad incheckning" + +#: read-cache.c:775 #, c-format msgid "unable to index file '%s'" msgstr "kan inte indexera filen \"%s\"" -#: read-cache.c:784 +#: read-cache.c:794 #, c-format msgid "unable to add '%s' to index" msgstr "kan inte lägga till \"%s\" till indexet" -#: read-cache.c:795 +#: read-cache.c:805 #, c-format msgid "unable to stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: read-cache.c:1304 +#: read-cache.c:1314 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "\"%s\" finns både som en fil och en katalog" -#: read-cache.c:1489 +#: read-cache.c:1499 msgid "Refresh index" msgstr "Uppdatera indexet" -#: read-cache.c:1603 +#: read-cache.c:1613 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -3888,7 +4537,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1613 +#: read-cache.c:1623 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -3897,144 +4546,151 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1684 +#: read-cache.c:1679 #, c-format msgid "bad signature 0x%08x" msgstr "felaktig signatur 0x%08x" -#: read-cache.c:1687 +#: read-cache.c:1682 #, c-format msgid "bad index version %d" msgstr "felaktig indexversion %d" -#: read-cache.c:1696 +#: read-cache.c:1691 msgid "bad index file sha1 signature" msgstr "felaktig sha1-signatur för indexfil" -#: read-cache.c:1726 +#: read-cache.c:1721 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "index använder filtillägget %.4s, vilket vi inte förstår" -#: read-cache.c:1728 +#: read-cache.c:1723 #, c-format msgid "ignoring %.4s extension" msgstr "ignorerar filtillägget %.4s" -#: read-cache.c:1765 +#: read-cache.c:1760 #, c-format msgid "unknown index entry format 0x%08x" msgstr "okänt format 0x%08x på indexpost" -#: read-cache.c:1781 +#: read-cache.c:1776 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "felformat namnfält i indexet, nära sökvägen \"%s\"" -#: read-cache.c:1836 +#: read-cache.c:1833 msgid "unordered stage entries in index" msgstr "osorterade köposter i index" -#: read-cache.c:1839 +#: read-cache.c:1836 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "flera köposter för den sammanslagna filen \"%s\"" -#: read-cache.c:1842 +#: read-cache.c:1839 #, c-format msgid "unordered stage entries for '%s'" msgstr "osorterade köposter för \"%s\"" -#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:459 builtin/check-ignore.c:178 builtin/checkout.c:294 -#: builtin/checkout.c:622 builtin/checkout.c:991 builtin/clean.c:955 -#: builtin/commit.c:344 builtin/diff-tree.c:116 builtin/grep.c:498 +#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358 +#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955 +#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498 #: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271 #: builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "indexfilen trasig" -#: read-cache.c:2090 +#: read-cache.c:2087 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "kunde inte läsa in cache_entries-tråden: %s" -#: read-cache.c:2103 +#: read-cache.c:2100 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "kunde inte utföra join på cache_entries-tråden: %s" -#: read-cache.c:2136 +#: read-cache.c:2133 #, c-format msgid "%s: index file open failed" msgstr "%s: öppning av indexfilen misslyckades" -#: read-cache.c:2140 +#: read-cache.c:2137 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: kan inte ta startus på det öppna indexet" -#: read-cache.c:2144 +#: read-cache.c:2141 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: indexfilen mindre än förväntat" -#: read-cache.c:2148 +#: read-cache.c:2145 #, c-format msgid "%s: unable to map index file" msgstr "%s: kan inte koppla indexfilen" -#: read-cache.c:2190 +#: read-cache.c:2187 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "kunde inte skapa load_index_extensions-tråden: %s" -#: read-cache.c:2217 +#: read-cache.c:2214 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "kunde inte utföra join på load_index_extensions-tråden: %s" -#: read-cache.c:2239 +#: read-cache.c:2246 #, c-format msgid "could not freshen shared index '%s'" msgstr "kunde inte uppdatera delat index \"%s\"" -#: read-cache.c:2274 +#: read-cache.c:2293 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "trasigt index, förväntade %s i %s, fick %s" -#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087 +#: read-cache.c:2988 wrapper.c:658 builtin/merge.c:1117 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647 +#: read-cache.c:3091 sequencer.c:2354 sequencer.c:3807 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" -#: read-cache.c:3057 +#: read-cache.c:3104 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte öppna git-katalog: %s" -#: read-cache.c:3069 +#: read-cache.c:3116 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort länken: %s" -#: read-cache.c:3088 +#: read-cache.c:3141 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "kan inte rätta behörighetsbitar på \"%s\"" -#: read-cache.c:3237 +#: read-cache.c:3290 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: kan inte återgå till kö 0" -#: rebase-interactive.c:10 +#: rebase-interactive.c:26 +#, c-format +msgid "" +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." +msgstr "" +"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar." + +#: rebase-interactive.c:35 msgid "" "\n" "Commands:\n" @@ -4078,7 +4734,14 @@ msgstr "" "\n" "Du kan byta ordning på raderna; de utförs uppifrån och ned.\n" -#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173 +#: rebase-interactive.c:56 +#, c-format +msgid "Rebase %s onto %s (%d command)" +msgid_plural "Rebase %s onto %s (%d commands)" +msgstr[0] "Ombasera %s på %s (%d kommando)" +msgstr[1] "Ombasera %s på %s (%d kommandon)" + +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -4087,7 +4750,7 @@ msgstr "" "Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en " "incheckning.\n" -#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -4095,7 +4758,7 @@ msgstr "" "\n" "Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n" -#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -4109,7 +4772,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -4119,125 +4782,157 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900 msgid "Note that empty commits are commented out" msgstr "Observera att tomma incheckningar är utkommenterade" -#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219 -#: sequencer.c:4569 sequencer.c:4625 sequencer.c:4900 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339 +#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format -msgid "could not read '%s'." -msgstr "kunde inte läsa \"%s\"." +msgid "could not write '%s'" +msgstr "kunde inte skriva \"%s\"" + +#: rebase-interactive.c:108 +#, c-format +msgid "could not copy '%s' to '%s'." +msgstr "kunde inte kopiera \"%s\" till \"%s\"." + +#: rebase-interactive.c:173 +#, c-format +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):\n" +msgstr "" +"Varning: vissa incheckningar kan av misstag ha tappats.\n" +"Tappade incheckningar (nyaste först):\n" + +#: rebase-interactive.c:180 +#, c-format +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error.\n" +"\n" +msgstr "" +"För att undvika det här meddelandet kan du använda \"drop\" för att " +"explicit\n" +"kasta en incheckning.\n" +"\n" +"Använd \"git config rebase.missingCommitsCheck\" för att ändra " +"varningsnivån.\n" +"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error" +"\" (fel).\n" +"\n" #: refs.c:192 #, c-format msgid "%s does not point to a valid object!" msgstr "\"%s\" pekar inte på ett giltigt objekt!" -#: refs.c:583 +#: refs.c:597 #, c-format msgid "ignoring dangling symref %s" msgstr "ignorerar dinglande symbolisk referens %s" -#: refs.c:585 ref-filter.c:1976 +#: refs.c:599 ref-filter.c:1982 #, c-format msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" -#: refs.c:711 +#: refs.c:734 #, c-format msgid "could not open '%s' for writing: %s" msgstr "kunde inte öppna \"%s\" för skrivning: %s" -#: refs.c:721 refs.c:772 +#: refs.c:744 refs.c:795 #, c-format msgid "could not read ref '%s'" msgstr "Kunde inte läsa referensen \"%s\"" -#: refs.c:727 +#: refs.c:750 #, c-format msgid "ref '%s' already exists" msgstr "referensen \"%s\" finns redan" -#: refs.c:732 +#: refs.c:755 #, c-format msgid "unexpected object ID when writing '%s'" msgstr "oväntat objekt-id vid skrivning \"%s\"" -#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675 -#: sequencer.c:2689 sequencer.c:2923 sequencer.c:4789 sequencer.c:4852 -#: wrapper.c:656 +#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805 +#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" -#: refs.c:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:713 builtin/rebase.c:575 +#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993 #, c-format msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" -#: refs.c:774 +#: refs.c:797 #, c-format msgid "unexpected object ID when deleting '%s'" msgstr "oväntat objekt-id vid borttagning \"%s\"" -#: refs.c:905 +#: refs.c:928 #, c-format msgid "log for ref %s has gap after %s" msgstr "loggen för referensen %s har lucka efter %s" -#: refs.c:911 +#: refs.c:934 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "loggen för referensen %s slutade oväntat på %s" -#: refs.c:969 +#: refs.c:993 #, c-format msgid "log for %s is empty" msgstr "loggen för %s är tom" -#: refs.c:1061 +#: refs.c:1085 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "vägrar uppdatera referens med trasigt namn \"%s\"" -#: refs.c:1137 +#: refs.c:1161 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref misslyckades för referensen \"%s\": %s" -#: refs.c:1911 +#: refs.c:1942 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "flera uppdateringar för referensen \"%s\" tillåts inte" -#: refs.c:1943 +#: refs.c:1974 msgid "ref updates forbidden inside quarantine environment" msgstr "referensuppdateringar förbjudna i karantänmiljö" -#: refs.c:2039 refs.c:2069 +#: refs.c:2070 refs.c:2100 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "\"%s\" finns; kan inte skapa \"%s\"" -#: refs.c:2045 refs.c:2080 +#: refs.c:2076 refs.c:2111 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt" -#: refs/files-backend.c:1228 +#: refs/files-backend.c:1234 #, c-format msgid "could not remove reference %s" msgstr "kunde inte ta bort referensen %s" -#: refs/files-backend.c:1242 refs/packed-backend.c:1532 +#: refs/files-backend.c:1248 refs/packed-backend.c:1532 #: refs/packed-backend.c:1542 #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" -#: refs/files-backend.c:1245 refs/packed-backend.c:1545 +#: refs/files-backend.c:1251 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" @@ -4247,7 +4942,7 @@ msgstr "kunde inte ta bort referenser: %s" msgid "invalid refspec '%s'" msgstr "felaktig referensspecifikation: \"%s\"" -#: ref-filter.c:39 wt-status.c:1861 +#: ref-filter.c:39 wt-status.c:1907 msgid "gone" msgstr "försvunnen" @@ -4371,79 +5066,79 @@ msgstr "positiv bredd förväntad med atomen %%(align)" msgid "unrecognized %%(if) argument: %s" msgstr "okänt %%(if)-argument: %s" -#: ref-filter.c:527 +#: ref-filter.c:531 #, c-format msgid "malformed field name: %.*s" msgstr "felformat fältnamn: %.*s" -#: ref-filter.c:554 +#: ref-filter.c:558 #, c-format msgid "unknown field name: %.*s" msgstr "okänt fältnamn: %.*s" -#: ref-filter.c:558 +#: ref-filter.c:562 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" "inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata" -#: ref-filter.c:682 +#: ref-filter.c:686 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: atomen %%(if) använd utan en %%(then)-atom" -#: ref-filter.c:745 +#: ref-filter.c:749 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: atomen %%(then) använd utan en %%(if)-atom" -#: ref-filter.c:747 +#: ref-filter.c:751 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: atomen %%(then) använd mer än en gång" -#: ref-filter.c:749 +#: ref-filter.c:753 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atomen %%(then) använd efter %%(else)" -#: ref-filter.c:777 +#: ref-filter.c:781 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: atomen %%(else) använd utan en %%(if)-atom" -#: ref-filter.c:779 +#: ref-filter.c:783 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format: atomen %%(else) använd utan en %%(then)-atom" -#: ref-filter.c:781 +#: ref-filter.c:785 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format: atomen %%(else) använd mer än en gång" -#: ref-filter.c:796 +#: ref-filter.c:800 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: atomen %%(end) använd utan motsvarande atom" -#: ref-filter.c:853 +#: ref-filter.c:857 #, c-format msgid "malformed format string %s" msgstr "felformad formatsträng %s" -#: ref-filter.c:1447 +#: ref-filter.c:1453 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: ref-filter.c:1450 +#: ref-filter.c:1456 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)" -#: ref-filter.c:1453 +#: ref-filter.c:1459 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" @@ -4451,7 +5146,7 @@ msgstr "(ingen gren, \"bisect\" startad på %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1461 +#: ref-filter.c:1467 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD frånkopplat vid %s)" @@ -4459,56 +5154,56 @@ msgstr "(HEAD frånkopplat vid %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1468 +#: ref-filter.c:1474 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD frånkopplat från %s)" -#: ref-filter.c:1472 +#: ref-filter.c:1478 msgid "(no branch)" msgstr "(ingen gren)" -#: ref-filter.c:1506 ref-filter.c:1663 +#: ref-filter.c:1512 ref-filter.c:1669 #, c-format msgid "missing object %s for %s" msgstr "objektet %s saknas för %s" -#: ref-filter.c:1516 +#: ref-filter.c:1522 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer misslyckades på %s för %s" -#: ref-filter.c:1882 +#: ref-filter.c:1888 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:1971 +#: ref-filter.c:1977 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:2257 +#: ref-filter.c:2263 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:2352 +#: ref-filter.c:2363 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "flaggan \"%s\" är inkompatibel med --merged" -#: ref-filter.c:2355 +#: ref-filter.c:2366 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "flaggan \"%s\" är inkompatibel med --no-merged" -#: ref-filter.c:2365 +#: ref-filter.c:2376 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: ref-filter.c:2370 +#: ref-filter.c:2381 #, c-format msgid "option `%s' must point to a commit" msgstr "flaggan \"%s\" måste peka på en incheckning" @@ -4704,42 +5399,42 @@ msgstr "Kunde inte hitta fjärr-referensen %s" msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignorerar märklig referens \"%s\" lokalt" -#: remote.c:1990 +#: remote.c:2016 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n" -#: remote.c:1994 +#: remote.c:2020 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:1997 +#: remote.c:2023 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:2001 +#: remote.c:2027 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n" -#: remote.c:2004 +#: remote.c:2030 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (använd \"%s\" för detaljer)\n" -#: remote.c:2008 +#: remote.c:2034 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n" msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n" -#: remote.c:2014 +#: remote.c:2040 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n" -#: remote.c:2017 +#: remote.c:2043 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -4749,11 +5444,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2025 +#: remote.c:2051 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n" -#: remote.c:2028 +#: remote.c:2054 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -4768,11 +5463,11 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2038 +#: remote.c:2064 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n" -#: remote.c:2221 +#: remote.c:2247 #, c-format msgid "cannot parse expected object name '%s'" msgstr "kan inte tolka förväntat objektnamn \"%s\"" @@ -4800,12 +5495,6 @@ msgstr "trasig MERGE_RR" msgid "unable to write rerere record" msgstr "kunde inte skriva rerere-post" -#: rerere.c:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212 -#: builtin/fsck.c:314 -#, c-format -msgid "could not write '%s'" -msgstr "kunde inte skriva \"%s\"" - #: rerere.c:495 #, c-format msgid "there were errors while writing '%s' (%s)" @@ -4856,8 +5545,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:2012 builtin/submodule--helper.c:1417 -#: builtin/submodule--helper.c:1427 +#: rerere.c:881 submodule.c:2024 builtin/log.c:1750 +#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" @@ -4891,29 +5580,33 @@ 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:2484 +#: revision.c:2476 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2487 +#: revision.c:2479 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar" -#: revision.c:2684 +#: revision.c:2679 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" -#: run-command.c:742 +#: revision.c:2683 +msgid "-L does not yet support diff formats besides -p and -s" +msgstr "-L stöder ännu inte andra diff-format än -p och -s" + +#: run-command.c:763 msgid "open /dev/null failed" msgstr "misslyckades öppna /dev/null" -#: run-command.c:1231 +#: run-command.c:1269 #, c-format msgid "cannot create async thread: %s" msgstr "kan inte skapa asynkron tråd: %s" -#: run-command.c:1295 +#: run-command.c:1333 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -4960,34 +5653,34 @@ msgstr "mottagarsidan stöder inte push med --atomic" msgid "the receiving end does not support push options" msgstr "mottagarsidan stöder inte push-flaggor" -#: sequencer.c:184 +#: sequencer.c:187 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\"" -#: sequencer.c:288 +#: sequencer.c:292 #, c-format msgid "could not delete '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:314 +#: sequencer.c:318 msgid "revert" msgstr "revert" -#: sequencer.c:316 +#: sequencer.c:320 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:318 +#: sequencer.c:322 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:320 +#: sequencer.c:324 #, c-format msgid "unknown action: %d" msgstr "okänd funktion: %d" -#: sequencer.c:378 +#: sequencer.c:382 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -4995,7 +5688,7 @@ msgstr "" "efter att ha löst konflikterna, markera de rättade sökvägarna\n" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"" -#: sequencer.c:381 +#: sequencer.c:385 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -5005,110 +5698,115 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:394 sequencer.c:2671 +#: sequencer.c:398 sequencer.c:2801 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:401 +#: sequencer.c:405 #, c-format msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691 -#: sequencer.c:2931 +#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821 +#: sequencer.c:3084 #, c-format msgid "failed to finalize '%s'" msgstr "misslyckades färdigställa \"%s\"" -#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574 -#: sequencer.c:2913 sequencer.c:3022 builtin/am.c:245 builtin/commit.c:748 -#: builtin/merge.c:1085 builtin/rebase.c:154 +#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704 +#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760 +#: builtin/merge.c:1115 builtin/rebase.c:567 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: sequencer.c:455 +#: sequencer.c:459 #, c-format msgid "your local changes would be overwritten by %s." msgstr "dina lokala ändringar skulle skrivas över av %s." -#: sequencer.c:459 +#: sequencer.c:463 msgid "commit your changes or stash them to proceed." msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta." -#: sequencer.c:491 +#: sequencer.c:495 #, c-format msgid "%s: fast-forward" msgstr "%s: snabbspola" +#: sequencer.c:534 builtin/tag.c:555 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "Felaktigt städningsläge %s" + #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:582 +#: sequencer.c:629 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:598 +#: sequencer.c:646 msgid "unable to update cache tree" msgstr "kan inte uppdatera cacheträd" -#: sequencer.c:612 +#: sequencer.c:660 msgid "could not resolve HEAD commit" msgstr "kunde inte bestämma HEAD:s incheckning" -#: sequencer.c:692 +#: sequencer.c:740 #, c-format msgid "no key present in '%.*s'" msgstr "ingen nyckel i \"%.*s\"" -#: sequencer.c:703 +#: sequencer.c:751 #, c-format msgid "unable to dequote value of '%s'" msgstr "kan inte ta bort citering av värdet \"%s\"" -#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704 -#: builtin/am.c:796 builtin/merge.c:1082 builtin/rebase.c:617 +#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706 +#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: sequencer.c:750 +#: sequencer.c:798 msgid "'GIT_AUTHOR_NAME' already given" msgstr "\"GIT_AUTHOR_NAME\" har redan angivits" -#: sequencer.c:755 +#: sequencer.c:803 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits" -#: sequencer.c:760 +#: sequencer.c:808 msgid "'GIT_AUTHOR_DATE' already given" msgstr "\"GIT_AUTHOR_DATE\" har redan angivits" -#: sequencer.c:764 +#: sequencer.c:812 #, c-format msgid "unknown variable '%s'" msgstr "okänd variabel \"%s\"" -#: sequencer.c:769 +#: sequencer.c:817 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "\"GIT_AUTHOR_NAME\" saknas" -#: sequencer.c:771 +#: sequencer.c:819 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "\"GIT_AUTHOR_EMAIL\" saknas" -#: sequencer.c:773 +#: sequencer.c:821 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "\"GIT_AUTHOR_DATE\" saknas" -#: sequencer.c:833 +#: sequencer.c:881 #, c-format msgid "invalid date format '%s' in '%s'" msgstr "ogiltigt datumformat \"%s\" i \"%s\"" -#: sequencer.c:850 +#: sequencer.c:898 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5137,15 +5835,15 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:945 +#: sequencer.c:992 msgid "writing root commit" msgstr "skriver rotincheckning" -#: sequencer.c:1155 +#: sequencer.c:1213 msgid "'prepare-commit-msg' hook failed" msgstr "kroken \"prepare-commit-msg\" misslyckades" -#: sequencer.c:1162 +#: sequencer.c:1220 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5172,7 +5870,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1175 +#: sequencer.c:1233 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5197,296 +5895,307 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1217 +#: sequencer.c:1275 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: sequencer.c:1219 +#: sequencer.c:1277 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: sequencer.c:1265 +#: sequencer.c:1323 msgid "unable to resolve HEAD after creating commit" msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning" -#: sequencer.c:1267 +#: sequencer.c:1325 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: sequencer.c:1271 +#: sequencer.c:1329 msgid " (root-commit)" msgstr " (rotincheckning)" -#: sequencer.c:1292 +#: sequencer.c:1350 msgid "could not parse HEAD" msgstr "kunde inte tolka HEAD" -#: sequencer.c:1294 +#: sequencer.c:1352 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s är inte en incheckning!" -#: sequencer.c:1298 builtin/commit.c:1546 +#: sequencer.c:1356 builtin/commit.c:1551 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: sequencer.c:1350 sequencer.c:1964 +#: sequencer.c:1408 sequencer.c:2001 msgid "unable to parse commit author" msgstr "kunde inte tolka incheckningens författare" -#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678 +#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: sequencer.c:1377 sequencer.c:1433 +#: sequencer.c:1435 sequencer.c:1496 #, c-format msgid "unable to read commit message from '%s'" msgstr "kunde inte läsa incheckningsmeddelande från \"%s\"" -#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859 -#: builtin/merge.c:884 +#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882 +#: builtin/merge.c:906 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: sequencer.c:1460 +#: sequencer.c:1523 #, c-format msgid "could not parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: sequencer.c:1465 +#: sequencer.c:1528 #, c-format msgid "could not parse parent commit %s" msgstr "kunde inte tolka föräldraincheckningen %s" -#: sequencer.c:1565 sequencer.c:1675 +#: sequencer.c:1602 sequencer.c:1712 #, c-format msgid "unknown command: %d" msgstr "okänt kommando: %d" -#: sequencer.c:1622 sequencer.c:1647 +#: sequencer.c:1659 sequencer.c:1684 #, c-format msgid "This is a combination of %d commits." msgstr "Det här är en kombination av %d incheckningar." -#: sequencer.c:1632 sequencer.c:4808 +#: sequencer.c:1669 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:1634 sequencer.c:2958 +#: sequencer.c:1671 sequencer.c:3111 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:1636 +#: sequencer.c:1673 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:1642 +#: sequencer.c:1679 #, c-format msgid "cannot write '%s'" msgstr "kan inte skriva \"%s\"" -#: sequencer.c:1649 git-rebase--preserve-merges.sh:441 +#: sequencer.c:1686 git-rebase--preserve-merges.sh:441 msgid "This is the 1st commit message:" msgstr "Det här är 1:a incheckningsmeddelandet:" -#: sequencer.c:1657 +#: sequencer.c:1694 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:1664 +#: sequencer.c:1701 #, c-format msgid "This is the commit message #%d:" msgstr "Det här är incheckningsmeddelande %d:" -#: sequencer.c:1670 +#: sequencer.c:1707 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Incheckningsmeddelande %d kommer hoppas över:" -#: sequencer.c:1758 +#: sequencer.c:1795 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:1765 +#: sequencer.c:1802 msgid "cannot fixup root commit" msgstr "kan inte göra \"fixup\" på rotincheckning" -#: sequencer.c:1784 +#: sequencer.c:1821 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte." -#: sequencer.c:1792 sequencer.c:1800 +#: sequencer.c:1829 sequencer.c:1837 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:1806 +#: sequencer.c:1843 #, c-format msgid "cannot get commit message for %s" msgstr "kan inte hämta incheckningsmeddelande för %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1825 +#: sequencer.c:1862 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:1890 +#: sequencer.c:1927 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:1945 +#: sequencer.c:1982 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:1946 +#: sequencer.c:1983 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:2005 +#: sequencer.c:2042 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:2012 +#: sequencer.c:2049 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:2094 +#: sequencer.c:2118 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s tar inte argument: \"%s\"" -#: sequencer.c:2103 +#: sequencer.c:2127 #, c-format msgid "missing arguments for %s" msgstr "argument saknas för %s" -#: sequencer.c:2163 +#: sequencer.c:2164 +#, c-format +msgid "could not parse '%.*s'" +msgstr "kunde inte tolka \"%.*s\"" + +#: sequencer.c:2226 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:2171 +#: sequencer.c:2237 #, c-format msgid "cannot '%s' without a previous commit" msgstr "kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:2243 +#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178 +#: builtin/rebase.c:204 builtin/rebase.c:229 +#, c-format +msgid "could not read '%s'." +msgstr "kunde inte läsa \"%s\"." + +#: sequencer.c:2360 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:2245 +#: sequencer.c:2362 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: ”%s”" -#: sequencer.c:2250 +#: sequencer.c:2367 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:2261 +#: sequencer.c:2378 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:2263 +#: sequencer.c:2380 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:2333 +#: sequencer.c:2462 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:2420 +#: sequencer.c:2549 msgid "unusable squash-onto" msgstr "oanvändbar squash-onto" -#: sequencer.c:2436 +#: sequencer.c:2565 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: ”%s”" -#: sequencer.c:2518 sequencer.c:4067 +#: sequencer.c:2648 sequencer.c:4227 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:2526 +#: 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:2527 +#: sequencer.c:2657 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:2530 +#: sequencer.c:2660 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:2544 +#: sequencer.c:2674 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:2599 sequencer.c:3819 +#: sequencer.c:2729 sequencer.c:3979 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:2601 +#: sequencer.c:2731 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:2603 sequencer.c:2638 +#: sequencer.c:2733 sequencer.c:2768 msgid "cannot abort from a branch yet to be born" msgstr "kan inte avbryta från en gren som ännu inte är född" -#: sequencer.c:2624 builtin/grep.c:732 +#: sequencer.c:2754 builtin/grep.c:732 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:2626 +#: sequencer.c:2756 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:2627 +#: sequencer.c:2757 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:2633 +#: sequencer.c:2763 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig" -#: sequencer.c:2644 +#: sequencer.c:2774 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Du verkar ha flyttat HEAD.\n" "Spolar inte tillbaka, kontrollera HEAD!" -#: sequencer.c:2750 sequencer.c:3735 +#: sequencer.c:2903 sequencer.c:3894 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:2788 sequencer.c:3715 +#: sequencer.c:2941 sequencer.c:3874 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:2805 +#: sequencer.c:2958 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "kan inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:2813 +#: sequencer.c:2966 #, c-format msgid "" "You can amend the commit now, with\n" @@ -5505,27 +6214,27 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:2823 +#: sequencer.c:2976 #, c-format msgid "Could not apply %s... %.*s" msgstr "Kunde inte tillämpa %s... %.*s" -#: sequencer.c:2830 +#: sequencer.c:2983 #, c-format msgid "Could not merge %.*s" msgstr "Kunde inte slå ihop %.*s" -#: sequencer.c:2844 sequencer.c:2848 builtin/difftool.c:641 +#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:2870 sequencer.c:3293 builtin/rebase.c:424 builtin/rebase.c:1230 -#: builtin/rebase.c:1591 builtin/rebase.c:1646 +#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580 +#: builtin/rebase.c:1940 builtin/rebase.c:1995 msgid "could not read index" msgstr "kunde inte läsa indexet" -#: sequencer.c:2875 +#: sequencer.c:3028 #, c-format msgid "" "execution failed: %s\n" @@ -5540,11 +6249,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:2881 +#: sequencer.c:3034 msgid "and made changes to the index and/or the working tree\n" msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n" -#: sequencer.c:2887 +#: sequencer.c:3040 #, c-format msgid "" "execution succeeded: %s\n" @@ -5561,76 +6270,76 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:2948 +#: sequencer.c:3101 #, c-format msgid "illegal label name: '%.*s'" msgstr "ogiltigt etikettnamn: \"%.*s\"" -#: sequencer.c:3002 +#: sequencer.c:3155 msgid "writing fake root commit" msgstr "skriver fejkad rotincheckning" -#: sequencer.c:3007 +#: sequencer.c:3160 msgid "writing squash-onto" msgstr "skriver squash-onto" -#: sequencer.c:3045 builtin/rebase.c:429 builtin/rebase.c:435 +#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850 #, c-format msgid "failed to find tree of %s" msgstr "kunde inte hitta trädet för %s." -#: sequencer.c:3063 builtin/rebase.c:448 +#: sequencer.c:3216 builtin/rebase.c:863 msgid "could not write index" msgstr "kunde inte skriva indexet" -#: sequencer.c:3090 +#: sequencer.c:3243 #, c-format msgid "could not resolve '%s'" msgstr "kunde inte upplösa \"%s\"" -#: sequencer.c:3118 +#: sequencer.c:3271 msgid "cannot merge without a current revision" msgstr "kan inte slå ihop utan en aktuell incheckning" -#: sequencer.c:3140 +#: sequencer.c:3293 #, c-format msgid "unable to parse '%.*s'" msgstr "kan inte tolka \"%.*s\"" -#: sequencer.c:3149 +#: sequencer.c:3302 #, c-format msgid "nothing to merge: '%.*s'" msgstr "inget att slå samman: \"%.*s\"" -#: sequencer.c:3161 +#: sequencer.c:3314 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]" -#: sequencer.c:3176 +#: sequencer.c:3329 #, c-format msgid "could not get commit message of '%s'" msgstr "kunde inte läsa incheckningsmeddelande för \"%s\"" -#: sequencer.c:3325 +#: sequencer.c:3478 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "kunde inte ens försöka slå ihop \"%.*s\"" -#: sequencer.c:3341 +#: sequencer.c:3494 msgid "merge: Unable to write new index file" msgstr "sammanslagning: Kunde inte skriva ny indexfil" -#: sequencer.c:3409 builtin/rebase.c:298 +#: sequencer.c:3562 builtin/rebase.c:711 #, c-format msgid "Applied autostash.\n" msgstr "Tillämpade autostash.\n" -#: sequencer.c:3421 +#: sequencer.c:3574 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:3424 builtin/rebase.c:314 +#: sequencer.c:3577 builtin/rebase.c:727 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -5641,31 +6350,31 @@ msgstr "" "Dina ändringar är säkra i stashen.\n" "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" -#: sequencer.c:3478 +#: sequencer.c:3638 #, c-format msgid "could not checkout %s" msgstr "kunde inte checka ut %s" -#: sequencer.c:3492 +#: sequencer.c:3652 #, c-format msgid "%s: not a valid OID" msgstr "%s: inte ett giltigt OID" -#: sequencer.c:3497 git-rebase--preserve-merges.sh:724 +#: sequencer.c:3657 git-rebase--preserve-merges.sh:724 msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" -#: sequencer.c:3512 +#: sequencer.c:3672 #, c-format msgid "Stopped at HEAD\n" msgstr "Stoppade på HEAD\n" -#: sequencer.c:3514 +#: sequencer.c:3674 #, c-format msgid "Stopped at %s\n" msgstr "Stoppade på %s\n" -#: sequencer.c:3522 +#: sequencer.c:3682 #, c-format msgid "" "Could not execute the todo command\n" @@ -5686,48 +6395,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3597 +#: sequencer.c:3759 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:3677 +#: sequencer.c:3837 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:3723 +#: sequencer.c:3882 msgid "could not read orig-head" msgstr "kunde inte läsa orig-head" -#: sequencer.c:3728 sequencer.c:4805 +#: sequencer.c:3887 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:3742 +#: sequencer.c:3901 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:3831 +#: sequencer.c:3991 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:3840 +#: sequencer.c:4000 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:3842 +#: sequencer.c:4002 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:3844 +#: sequencer.c:4004 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:3847 +#: sequencer.c:4007 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -5737,84 +6446,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:3883 sequencer.c:3921 +#: sequencer.c:4043 sequencer.c:4081 #, c-format msgid "could not write file: '%s'" msgstr "kunde inte skriva fil: \"%s\"" -#: sequencer.c:3936 +#: sequencer.c:4096 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:3943 +#: sequencer.c:4103 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:4044 +#: sequencer.c:4204 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen ”%s”" -#: sequencer.c:4048 +#: sequencer.c:4208 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:4083 +#: sequencer.c:4243 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" -#: sequencer.c:4529 +#: sequencer.c:4686 msgid "make_script: unhandled options" msgstr "make_script: flaggor som inte stöds" -#: sequencer.c:4532 +#: sequencer.c:4689 msgid "make_script: error preparing revisions" msgstr "make_script: fel när revisioner skulle förberedas" -#: sequencer.c:4573 sequencer.c:4629 sequencer.c:4904 -#, c-format -msgid "unusable todo list: '%s'" -msgstr "oanvändbar todo-lista: %s" - -#: sequencer.c:4684 -#, c-format -msgid "" -"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." -msgstr "" -"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar." - -#: sequencer.c:4754 -#, c-format -msgid "" -"Warning: some commits may have been dropped accidentally.\n" -"Dropped commits (newer to older):\n" -msgstr "" -"Varning: vissa incheckningar kan av misstag ha tappats.\n" -"Tappade incheckningar (nyaste först):\n" - -#: sequencer.c:4761 -#, c-format -msgid "" -"To avoid this message, use \"drop\" to explicitly remove a commit.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of " -"warnings.\n" -"The possible behaviours are: ignore, warn, error.\n" -"\n" -msgstr "" -"För att undvika det här meddelandet kan du använda \"drop\" för att " -"explicit\n" -"kasta en incheckning.\n" -"\n" -"Använd \"git config rebase.missingCommitsCheck\" för att ändra " -"varningsnivån.\n" -"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error" -"\" (fel).\n" -"\n" - -#: sequencer.c:4774 -#, c-format +#: sequencer.c:4847 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -5824,31 +6491,15 @@ msgstr "" "continue\".\n" "Avbryt ombaseringen med \"git rebase --abort\".\n" -#: sequencer.c:4912 sequencer.c:4950 +#: sequencer.c:4959 sequencer.c:4976 msgid "nothing to do" msgstr "inget att göra" -#: sequencer.c:4916 -#, c-format -msgid "Rebase %s onto %s (%d command)" -msgid_plural "Rebase %s onto %s (%d commands)" -msgstr[0] "Ombasera %s på %s (%d kommando)" -msgstr[1] "Ombasera %s på %s (%d kommandon)" - -#: sequencer.c:4928 -#, c-format -msgid "could not copy '%s' to '%s'." -msgstr "kunde inte kopiera \"%s\" till \"%s\"." - -#: sequencer.c:4932 sequencer.c:4961 -msgid "could not transform the todo list" -msgstr "kunde inte transformera att göra-listan" - -#: sequencer.c:4964 +#: sequencer.c:4990 msgid "could not skip unnecessary pick commands" msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon" -#: sequencer.c:5047 +#: sequencer.c:5073 msgid "the script was already rearranged." msgstr "skriptet har redan omordnats." @@ -5857,7 +6508,7 @@ msgstr "skriptet har redan omordnats." msgid "'%s' is outside repository" msgstr "\"%s\" är utanför arkivet" -#: setup.c:172 +#: setup.c:173 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -5867,7 +6518,7 @@ msgstr "" "Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns " "lokalt." -#: setup.c:185 +#: setup.c:186 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -5879,12 +6530,12 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:234 +#: setup.c:235 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "flaggan \"%s\" måste anges före argument som inte är flaggor" -#: setup.c:253 +#: setup.c:254 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -5895,92 +6546,92 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:389 +#: setup.c:390 msgid "unable to set up work tree using invalid config" msgstr "kan inte skapa arbetskatalog med felaktig konfiguration" -#: setup.c:393 +#: setup.c:394 msgid "this operation must be run in a work tree" msgstr "funktionen måste köras i en arbetskatalog" -#: setup.c:527 +#: setup.c:540 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Förväntade git-arkivversion <= %d, hittade %d" -#: setup.c:535 +#: setup.c:548 msgid "unknown repository extensions found:" msgstr "okända arkivutökningar hittades:" -#: setup.c:554 +#: setup.c:567 #, c-format msgid "error opening '%s'" msgstr "fel vid öppning av \"%s\"" -#: setup.c:556 +#: setup.c:569 #, c-format msgid "too large to be a .git file: '%s'" msgstr "för stor för att vara en .git-fil: \"%s\"" -#: setup.c:558 +#: setup.c:571 #, c-format msgid "error reading %s" msgstr "fel vid läsning av %s" -#: setup.c:560 +#: setup.c:573 #, c-format msgid "invalid gitfile format: %s" msgstr "ogiltigt gitfilformat: %s" -#: setup.c:562 +#: setup.c:575 #, c-format msgid "no path in gitfile: %s" msgstr "ingen sökväg i gitfil: %s" -#: setup.c:564 +#: setup.c:577 #, c-format msgid "not a git repository: %s" msgstr "inte ett git-arkiv: %s" -#: setup.c:663 +#: setup.c:676 #, c-format msgid "'$%s' too big" msgstr "\"$%s\" för stor" -#: setup.c:677 +#: setup.c:690 #, c-format msgid "not a git repository: '%s'" msgstr "inte ett git-arkiv: \"%s\"" -#: setup.c:706 setup.c:708 setup.c:739 +#: setup.c:719 setup.c:721 setup.c:752 #, c-format msgid "cannot chdir to '%s'" msgstr "kan inte byta katalog (chdir) till \"%s\"" -#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 +#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 msgid "cannot come back to cwd" msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)" -#: setup.c:838 +#: setup.c:851 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "misslyckades ta status på \"%*ss%s%s\"" -#: setup.c:1068 +#: setup.c:1083 msgid "Unable to read current working directory" msgstr "Kan inte läsa aktuell arbetskatalog" -#: setup.c:1077 setup.c:1083 +#: setup.c:1092 setup.c:1098 #, c-format msgid "cannot change to '%s'" msgstr "kan inte byta till \"%s\"" -#: setup.c:1088 +#: setup.c:1103 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "inte ett git-arkiv (eller någon av föräldrakatalogerna): %s" -#: setup.c:1094 +#: setup.c:1109 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -5990,7 +6641,7 @@ msgstr "" "monteringspunkten %s)\n" "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." -#: setup.c:1204 +#: setup.c:1220 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -5999,278 +6650,278 @@ msgstr "" "problem med filläges-värdet i core.sharedRepository (0%.3o).\n" "Ägaren av filerna måste alltid ha läs- och skrivbehörighet." -#: setup.c:1247 +#: setup.c:1264 msgid "open /dev/null or dup failed" msgstr "misslyckades öppna /dev/null eller \"dup\"" -#: setup.c:1262 +#: setup.c:1279 msgid "fork failed" msgstr "\"fork\" misslyckades" -#: setup.c:1267 +#: setup.c:1284 msgid "setsid failed" msgstr "\"setsid\" misslyckades" -#: sha1-file.c:445 +#: sha1-file.c:453 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates" -#: sha1-file.c:496 +#: sha1-file.c:504 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "kunde inte normalisera alternativ objektsökväg: %s" -#: sha1-file.c:568 +#: sha1-file.c:576 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: ignorerar alternativa objektlagringar, för djup nästling" -#: sha1-file.c:575 +#: sha1-file.c:583 #, c-format msgid "unable to normalize object directory: %s" msgstr "kan inte normalisera objektkatalogen: %s" -#: sha1-file.c:618 +#: sha1-file.c:626 msgid "unable to fdopen alternates lockfile" msgstr "kan inte utföra \"fdopen\" på låsfil för \"alternates\"" -#: sha1-file.c:636 +#: sha1-file.c:644 msgid "unable to read alternates file" msgstr "kan inte läsa \"alternates\"-filen" -#: sha1-file.c:643 +#: sha1-file.c:651 msgid "unable to move new alternates file into place" msgstr "kan inte flytta ny \"alternates\"-fil på plats" -#: sha1-file.c:678 +#: sha1-file.c:686 #, c-format msgid "path '%s' does not exist" msgstr "sökvägen \"%s\" finns inte" -#: sha1-file.c:704 +#: sha1-file.c:712 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu." -#: sha1-file.c:710 +#: sha1-file.c:718 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: sha1-file.c:716 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: sha1-file.c:724 +#: sha1-file.c:732 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: sha1-file.c:838 +#: sha1-file.c:846 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>" -#: sha1-file.c:863 +#: sha1-file.c:871 msgid "mmap failed" msgstr "mmap misslyckades" -#: sha1-file.c:1027 +#: sha1-file.c:1035 #, c-format msgid "object file %s is empty" msgstr "objektfilen %s är tom" -#: sha1-file.c:1151 sha1-file.c:2288 +#: sha1-file.c:1159 sha1-file.c:2297 #, c-format msgid "corrupt loose object '%s'" msgstr "trasigt löst objekt \"%s\"" -#: sha1-file.c:1153 sha1-file.c:2292 +#: sha1-file.c:1161 sha1-file.c:2301 #, c-format msgid "garbage at end of loose object '%s'" msgstr "skräp i slutet av löst objekt \"%s\"" -#: sha1-file.c:1195 +#: sha1-file.c:1203 msgid "invalid object type" msgstr "felaktig objekttyp" -#: sha1-file.c:1279 +#: sha1-file.c:1287 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "kan inte packa upp %s-huvud med --allow-unknown-type" -#: sha1-file.c:1282 +#: sha1-file.c:1290 #, c-format msgid "unable to unpack %s header" msgstr "kan inte packa upp %s-huvudet" -#: sha1-file.c:1288 +#: sha1-file.c:1296 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "kan inte tolka %s-huvud med --allow-unknown-type" -#: sha1-file.c:1291 +#: sha1-file.c:1299 #, c-format msgid "unable to parse %s header" msgstr "kan inte tolka %s-huvud" -#: sha1-file.c:1481 +#: sha1-file.c:1490 #, c-format msgid "failed to read object %s" msgstr "misslyckades läsa objektet %s" -#: sha1-file.c:1485 +#: sha1-file.c:1494 #, c-format msgid "replacement %s not found for %s" msgstr "ersättningen %s hittades inte för %s" -#: sha1-file.c:1489 +#: sha1-file.c:1498 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "löst objekt %s (lagrat i %s) är trasigt" -#: sha1-file.c:1493 +#: sha1-file.c:1502 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "packat objekt %s (lagrat i %s) är trasigt" -#: sha1-file.c:1595 +#: sha1-file.c:1604 #, c-format msgid "unable to write file %s" msgstr "kunde inte skriva filen %s" -#: sha1-file.c:1602 +#: sha1-file.c:1611 #, c-format msgid "unable to set permission to '%s'" msgstr "kan inte sätta behörigheten till \"%s\"" -#: sha1-file.c:1609 +#: sha1-file.c:1618 msgid "file write error" msgstr "fel vid skrivning av fil" -#: sha1-file.c:1628 +#: sha1-file.c:1637 msgid "error when closing loose object file" msgstr "fel vid stängning av fil för löst objekt" -#: sha1-file.c:1693 +#: sha1-file.c:1702 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s" -#: sha1-file.c:1695 +#: sha1-file.c:1704 msgid "unable to create temporary file" msgstr "kan inte skapa temporär fil" -#: sha1-file.c:1719 +#: sha1-file.c:1728 msgid "unable to write loose object file" msgstr "kunde inte skriva fil för löst objekt" -#: sha1-file.c:1725 +#: sha1-file.c:1734 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)" -#: sha1-file.c:1729 +#: sha1-file.c:1738 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "\"deflateend\" på objektet %s misslyckades (%d)" -#: sha1-file.c:1733 +#: sha1-file.c:1742 #, c-format msgid "confused by unstable object source data for %s" msgstr "förvirrad av instabil objektkälldata för %s" -#: sha1-file.c:1743 builtin/pack-objects.c:919 +#: sha1-file.c:1752 builtin/pack-objects.c:920 #, c-format msgid "failed utime() on %s" msgstr "\"utime()\" misslyckades på %s" -#: sha1-file.c:1818 +#: sha1-file.c:1827 #, c-format msgid "cannot read object for %s" msgstr "kan inte läsa objekt för %s" -#: sha1-file.c:1858 +#: sha1-file.c:1867 msgid "corrupt commit" msgstr "trasik incheckning" -#: sha1-file.c:1866 +#: sha1-file.c:1875 msgid "corrupt tag" msgstr "trasig tagg" -#: sha1-file.c:1965 +#: sha1-file.c:1974 #, c-format msgid "read error while indexing %s" msgstr "läsfel vid indexering av %s" -#: sha1-file.c:1968 +#: sha1-file.c:1977 #, c-format msgid "short read while indexing %s" msgstr "för lite lästes vid indexering av %s" -#: sha1-file.c:2041 sha1-file.c:2050 +#: sha1-file.c:2050 sha1-file.c:2059 #, c-format msgid "%s: failed to insert into database" msgstr "%s: misslyckades lägga in i databasen" -#: sha1-file.c:2056 +#: sha1-file.c:2065 #, c-format msgid "%s: unsupported file type" msgstr "%s: filtypen stöds ej" -#: sha1-file.c:2080 +#: sha1-file.c:2089 #, c-format msgid "%s is not a valid object" msgstr "%s är inte ett giltigt objekt" -#: sha1-file.c:2082 +#: sha1-file.c:2091 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt \"%s\"-objekt" -#: sha1-file.c:2109 builtin/index-pack.c:154 +#: sha1-file.c:2118 builtin/index-pack.c:154 #, c-format msgid "unable to open %s" msgstr "kan inte öppna %s" -#: sha1-file.c:2299 sha1-file.c:2351 +#: sha1-file.c:2308 sha1-file.c:2360 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "hash stämmer inte för %s (förväntade %s)" -#: sha1-file.c:2323 +#: sha1-file.c:2332 #, c-format msgid "unable to mmap %s" msgstr "kan inte utföra \"mmap\" för %s" -#: sha1-file.c:2328 +#: sha1-file.c:2337 #, c-format msgid "unable to unpack header of %s" msgstr "kan inte packa upp huvud för %s" -#: sha1-file.c:2334 +#: sha1-file.c:2343 #, c-format msgid "unable to parse header of %s" msgstr "kan inte tolka huvud för %s" -#: sha1-file.c:2345 +#: sha1-file.c:2354 #, c-format msgid "unable to unpack contents of %s" msgstr "kan inte tolka innehåll i %s" -#: sha1-name.c:448 +#: sha1-name.c:487 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "kort SHA1 %s är tvetydig" -#: sha1-name.c:459 +#: sha1-name.c:498 msgid "The candidates are:" msgstr "Kandidaterna är:" -#: sha1-name.c:742 +#: sha1-name.c:794 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -6322,51 +6973,51 @@ msgstr "i ej utcheckad undermodul \"%s\"" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" -#: submodule.c:906 +#: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning" -#: submodule.c:1143 builtin/branch.c:656 builtin/submodule--helper.c:1989 +#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens." -#: submodule.c:1477 +#: submodule.c:1481 #, c-format msgid "Could not access submodule '%s'" msgstr "kunde inte komma åt undermodulen \"%s\"" -#: submodule.c:1639 +#: submodule.c:1651 #, c-format msgid "'%s' not recognized as a git repository" msgstr "\"%s\" känns inte igen som ett git-arkiv" -#: submodule.c:1777 +#: submodule.c:1789 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "kunde inte starta \"git status\" i undermodulen \"%s\"" -#: submodule.c:1790 +#: submodule.c:1802 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "kunde inte köra \"git status\" i undermodulen \"%s\"" -#: submodule.c:1805 +#: submodule.c:1817 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Kunde inte ta bort inställningen core.worktree i undermodulen \"%s\"" -#: submodule.c:1895 +#: submodule.c:1907 #, c-format msgid "submodule '%s' has dirty index" msgstr "undermodulen \"%s\" har ett smutsigt index" -#: submodule.c:1947 +#: submodule.c:1959 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Undermoduler \"%s\" kunde inte uppdateras." -#: submodule.c:1996 +#: submodule.c:2008 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -6374,12 +7025,12 @@ msgstr "" "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " "stöds ej" -#: submodule.c:2008 submodule.c:2064 +#: submodule.c:2020 submodule.c:2076 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" -#: submodule.c:2015 +#: submodule.c:2027 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -6390,16 +7041,16 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:2099 +#: submodule.c:2111 #, c-format msgid "could not recurse into submodule '%s'" msgstr "kunde inte rekursera in i undermodulen \"%s\"" -#: submodule.c:2143 +#: submodule.c:2155 msgid "could not start ls-files in .." msgstr "kunde inte starta ls-files i .." -#: submodule.c:2182 +#: submodule.c:2194 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en oväntad returkod %d" @@ -6409,21 +7060,21 @@ msgstr "ls-tree returnerade en oväntad returkod %d" msgid "ignoring suspicious submodule name: %s" msgstr "ignorerar misstänkt undermodulnamn: %s" -#: submodule-config.c:296 +#: submodule-config.c:299 msgid "negative values not allowed for submodule.fetchjobs" msgstr "negativa värden är inte tillåtna för submodule.fetchjobs" -#: submodule-config.c:390 +#: submodule-config.c:397 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "ignorerar \"%s\" som kan tolkas som en kommandoradsflagga: %s" -#: submodule-config.c:479 +#: submodule-config.c:486 #, c-format msgid "invalid value for %s" msgstr "ogiltigt värde för %s" -#: submodule-config.c:754 +#: submodule-config.c:755 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Kunde inte uppdatera .gitmodules-posten %s" @@ -6497,29 +7148,37 @@ msgstr "kunde inte läsa paketet (bundlen) \"%s\"" msgid "transport: invalid depth option '%s'" msgstr "transport: ogiltig flagga för depth: ”%s”" -#: transport.c:617 +#: transport.c:259 +msgid "see protocol.version in 'git help config' for more details" +msgstr "se protocol.version i \"git help config\" för mer information" + +#: transport.c:260 +msgid "server options require protocol version 2 or later" +msgstr "serverflaggor kräver protokollversion 2 eller senare" + +#: transport.c:625 msgid "could not parse transport.color.* config" msgstr "kunde inte tolka inställningen för transport.color.*" -#: transport.c:690 +#: transport.c:698 msgid "support for protocol v2 not implemented yet" msgstr "stöd för protokoll v2 ännu ej implementerat" -#: transport.c:817 +#: transport.c:825 #, c-format msgid "unknown value for config '%s': %s" msgstr "okänt värde för inställningen \"%s\": %s" -#: transport.c:883 +#: transport.c:891 #, c-format msgid "transport '%s' not allowed" msgstr "transporten \"%s\" tillåts inte" -#: transport.c:937 +#: transport.c:945 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync stöds inte längre" -#: transport.c:1032 +#: transport.c:1040 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -6528,7 +7187,7 @@ msgstr "" "Följande undermodulsökvägar innehåller ändringar som\n" "inte kan hittas av fjärrarna:\n" -#: transport.c:1036 +#: transport.c:1044 #, c-format msgid "" "\n" @@ -6555,19 +7214,19 @@ msgstr "" "för att sända dem till fjärren.\n" "\n" -#: transport.c:1044 +#: transport.c:1052 msgid "Aborting." msgstr "Avbryter." -#: transport.c:1184 +#: transport.c:1193 msgid "failed to push all needed submodules" msgstr "kunde inte sända alla nödvändiga undermoduler" -#: transport.c:1317 transport-helper.c:643 +#: transport.c:1326 transport-helper.c:645 msgid "operation not supported by protocol" msgstr "funktionen stöds inte av protokollet" -#: transport.c:1421 +#: transport.c:1430 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "felaktig rad vid tolkning av alternativa referenser: %s" @@ -6576,16 +7235,16 @@ msgstr "felaktig rad vid tolkning av alternativa referenser: %s" msgid "full write to remote helper failed" msgstr "komplett skrivning till fjärrhjälpare misslyckades" -#: transport-helper.c:132 +#: transport-helper.c:134 #, c-format msgid "unable to find remote helper for '%s'" msgstr "kan inte hitta fjärrhjälpare för \"%s\"" -#: transport-helper.c:148 transport-helper.c:557 +#: transport-helper.c:150 transport-helper.c:559 msgid "can't dup helper output fd" msgstr "kunde inte duplicera utdata-filhandtag" -#: transport-helper.c:199 +#: transport-helper.c:201 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -6594,101 +7253,101 @@ msgstr "" "okänd krävd förmåga (capability) %s; fjärrhjälparen behöver antagligen en " "nyare version av Git" -#: transport-helper.c:205 +#: transport-helper.c:207 msgid "this remote helper should implement refspec capability" msgstr "" "fjärrhjälparen behöver implementera förmåga för referensspecifikationer " "(refspec)" -#: transport-helper.c:272 transport-helper.c:412 +#: transport-helper.c:274 transport-helper.c:414 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s sade oväntat: \"%s\"" -#: transport-helper.c:401 +#: transport-helper.c:403 #, c-format msgid "%s also locked %s" msgstr "%s låste också %s" -#: transport-helper.c:479 +#: transport-helper.c:481 msgid "couldn't run fast-import" msgstr "kunde inte köra fast-import" -#: transport-helper.c:502 +#: transport-helper.c:504 msgid "error while running fast-import" msgstr "fel när fast-import kördes" -#: transport-helper.c:531 transport-helper.c:1097 +#: transport-helper.c:533 transport-helper.c:1099 #, c-format msgid "could not read ref %s" msgstr "kunde inte läsa referensen %s" -#: transport-helper.c:576 +#: transport-helper.c:578 #, c-format msgid "unknown response to connect: %s" msgstr "okänt svar på ansluntning: %s" -#: transport-helper.c:598 +#: transport-helper.c:600 msgid "setting remote service path not supported by protocol" msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst" -#: transport-helper.c:600 +#: transport-helper.c:602 msgid "invalid remote service path" msgstr "felaktig sökväg till fjärrtjänst" -#: transport-helper.c:646 +#: transport-helper.c:648 #, c-format msgid "can't connect to subservice %s" msgstr "kan inte ansluta till undertjänsten %s" -#: transport-helper.c:718 +#: transport-helper.c:720 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\"" -#: transport-helper.c:771 +#: transport-helper.c:773 #, c-format msgid "helper reported unexpected status of %s" msgstr "hjälparen returnerade oväntad status %s" -#: transport-helper.c:832 +#: transport-helper.c:834 #, c-format msgid "helper %s does not support dry-run" msgstr "hjälparen %s stöder inte dry-run" -#: transport-helper.c:835 +#: transport-helper.c:837 #, c-format msgid "helper %s does not support --signed" msgstr "hjälparen %s stöder inte --signed" -#: transport-helper.c:838 +#: transport-helper.c:840 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "hjälparen %s stöder inte --signed=if-asked" -#: transport-helper.c:845 +#: transport-helper.c:847 #, c-format msgid "helper %s does not support 'push-option'" msgstr "hjälparen %s stöder inte \"push-option\"" -#: transport-helper.c:937 +#: transport-helper.c:939 msgid "remote-helper doesn't support push; refspec needed" msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs" -#: transport-helper.c:942 +#: transport-helper.c:944 #, c-format msgid "helper %s does not support 'force'" msgstr "hjälparen %s stöder inte \"force\"" -#: transport-helper.c:989 +#: transport-helper.c:991 msgid "couldn't run fast-export" msgstr "kunde inte köra fast-export" -#: transport-helper.c:994 +#: transport-helper.c:996 msgid "error while running fast-export" msgstr "fel vid körning av fast-export" -#: transport-helper.c:1019 +#: transport-helper.c:1021 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -6697,47 +7356,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:1083 +#: transport-helper.c:1085 #, c-format msgid "malformed response in ref list: %s" msgstr "felformat svar i referenslistan: %s" -#: transport-helper.c:1236 +#: transport-helper.c:1238 #, c-format msgid "read(%s) failed" msgstr "läs(%s) misslyckades" -#: transport-helper.c:1263 +#: transport-helper.c:1265 #, c-format msgid "write(%s) failed" msgstr "skriv(%s) misslyckades" -#: transport-helper.c:1312 +#: transport-helper.c:1314 #, c-format msgid "%s thread failed" msgstr "%s-tråden misslyckades" -#: transport-helper.c:1316 +#: transport-helper.c:1318 #, c-format msgid "%s thread failed to join: %s" msgstr "%s-tråden misslyckades ansluta: %s" -#: transport-helper.c:1335 transport-helper.c:1339 +#: transport-helper.c:1337 transport-helper.c:1341 #, 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:1376 +#: transport-helper.c:1378 #, c-format msgid "%s process failed to wait" msgstr "processen %s misslyckades vänta" -#: transport-helper.c:1380 +#: transport-helper.c:1382 #, c-format msgid "%s process failed" msgstr "processen %s misslyckades" -#: transport-helper.c:1398 transport-helper.c:1407 +#: transport-helper.c:1400 transport-helper.c:1409 msgid "can't start thread for copying data" msgstr "kan inte skapa tråd för kopiering av data" @@ -6984,16 +7643,16 @@ msgstr "" "Kan inte uppdatera undermodul:\n" "%s" -#: unpack-trees.c:253 +#: unpack-trees.c:256 #, c-format msgid "Aborting\n" msgstr "Avbryter\n" -#: unpack-trees.c:335 +#: unpack-trees.c:318 msgid "Checking out files" msgstr "Checkar ut filer" -#: unpack-trees.c:367 +#: unpack-trees.c:350 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -7032,32 +7691,32 @@ msgstr "felaktigt portnummer" msgid "invalid '..' path segment" msgstr "felaktigt \"..\"-sökvägssegment" -#: worktree.c:249 builtin/am.c:2094 +#: worktree.c:255 builtin/am.c:2097 #, c-format msgid "failed to read '%s'" msgstr "misslyckades läsa \"%s\"" -#: worktree.c:295 +#: worktree.c:301 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen" -#: worktree.c:306 +#: worktree.c:312 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen" -#: worktree.c:318 +#: worktree.c:324 #, c-format msgid "'%s' does not exist" msgstr "\"%s\" finns inte" -#: worktree.c:324 +#: worktree.c:330 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "\"%s\" är inte en .git-fil, felkod %d" -#: worktree.c:332 +#: worktree.c:338 #, c-format msgid "'%s' does not point back to '%s'" msgstr "\"%s\" pekar inte tillbaka till \"%s\"" @@ -7076,155 +7735,155 @@ msgstr "kan inte komma åt \"%s\"" msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" -#: wt-status.c:155 +#: wt-status.c:156 msgid "Unmerged paths:" msgstr "Ej sammanslagna sökvägar:" -#: wt-status.c:182 wt-status.c:209 +#: wt-status.c:183 wt-status.c:210 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)" -#: wt-status.c:184 wt-status.c:211 +#: wt-status.c:185 wt-status.c:212 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)" -#: wt-status.c:188 +#: wt-status.c:189 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (använd \"git add <fil>...\" för att ange lösning)" -#: wt-status.c:190 wt-status.c:194 +#: wt-status.c:191 wt-status.c:195 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)" -#: wt-status.c:192 +#: wt-status.c:193 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:203 wt-status.c:1046 +#: wt-status.c:204 wt-status.c:1064 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:221 wt-status.c:1055 +#: wt-status.c:222 wt-status.c:1073 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" -#: wt-status.c:225 +#: wt-status.c:226 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)" -#: wt-status.c:227 +#: wt-status.c:228 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)" -#: wt-status.c:228 +#: wt-status.c:229 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (använd \"git checkout -- <fil>...\" för att förkasta ändringar i " "arbetskatalogen)" -#: wt-status.c:230 +#: wt-status.c:231 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)" -#: wt-status.c:242 +#: wt-status.c:243 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)" -#: wt-status.c:257 +#: wt-status.c:258 msgid "both deleted:" msgstr "borttaget av bägge:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "added by us:" msgstr "tillagt av oss:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "deleted by them:" msgstr "borttaget av dem:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "added by them:" msgstr "tillagt av dem:" -#: wt-status.c:265 +#: wt-status.c:266 msgid "deleted by us:" msgstr "borttaget av oss:" -#: wt-status.c:267 +#: wt-status.c:268 msgid "both added:" msgstr "tillagt av bägge:" -#: wt-status.c:269 +#: wt-status.c:270 msgid "both modified:" msgstr "ändrat av bägge:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "new file:" msgstr "ny fil:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "copied:" msgstr "kopierad:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "deleted:" msgstr "borttagen:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "modified:" msgstr "ändrad:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "renamed:" msgstr "namnbytt:" -#: wt-status.c:289 +#: wt-status.c:290 msgid "typechange:" msgstr "typbyte:" -#: wt-status.c:291 +#: wt-status.c:292 msgid "unknown:" msgstr "okänd:" -#: wt-status.c:293 +#: wt-status.c:294 msgid "unmerged:" msgstr "osammanslagen:" -#: wt-status.c:373 +#: wt-status.c:374 msgid "new commits, " msgstr "nya incheckningar, " -#: wt-status.c:375 +#: wt-status.c:376 msgid "modified content, " msgstr "ändrat innehåll, " -#: wt-status.c:377 +#: wt-status.c:378 msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:884 +#: wt-status.c:896 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Stashen innehåller just nu %d post" msgstr[1] "Stashen innehåller just nu %d poster" -#: wt-status.c:916 +#: wt-status.c:928 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:918 +#: wt-status.c:930 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:1000 +#: wt-status.c:1012 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -7232,107 +7891,107 @@ msgstr "" "Raden ovan får inte ändras eller tas bort.\n" "Allt under den kommer tas bort." -#: wt-status.c:1101 +#: wt-status.c:1119 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:1104 +#: wt-status.c:1122 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:1106 +#: wt-status.c:1124 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)" -#: wt-status.c:1110 +#: wt-status.c:1128 msgid "All conflicts fixed but you are still merging." msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning." -#: wt-status.c:1113 +#: wt-status.c:1131 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:1122 +#: wt-status.c:1140 msgid "You are in the middle of an am session." msgstr "Du är i mitten av en körning av \"git am\"." -#: wt-status.c:1125 +#: wt-status.c:1143 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:1129 +#: wt-status.c:1147 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:1131 +#: wt-status.c:1149 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:1133 +#: wt-status.c:1151 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" -#: wt-status.c:1264 +#: wt-status.c:1282 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo saknas." -#: wt-status.c:1266 +#: wt-status.c:1284 msgid "No commands done." msgstr "Inga kommandon utförda." -#: wt-status.c:1269 +#: wt-status.c:1287 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Sista kommandot utfört (%d kommando utfört):" msgstr[1] "Sista kommandot utfört (%d kommandon utfört):" -#: wt-status.c:1280 +#: wt-status.c:1298 #, c-format msgid " (see more in file %s)" msgstr " (se fler i filen %s)" -#: wt-status.c:1285 +#: wt-status.c:1303 msgid "No commands remaining." msgstr "Inga kommandon återstår." -#: wt-status.c:1288 +#: wt-status.c:1306 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Nästa kommando att utföra (%d kommando återstår):" msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):" -#: wt-status.c:1296 +#: wt-status.c:1314 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)" -#: wt-status.c:1308 +#: wt-status.c:1326 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"." -#: wt-status.c:1313 +#: wt-status.c:1331 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1326 +#: wt-status.c:1344 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1328 +#: wt-status.c:1346 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1330 +#: wt-status.c:1348 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)" -#: wt-status.c:1337 +#: wt-status.c:1355 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1341 +#: wt-status.c:1359 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -7340,126 +7999,142 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1346 +#: wt-status.c:1364 msgid "You are currently splitting a commit during a rebase." msgstr "Du håller på att dela upp en incheckning i en ombasering." -#: wt-status.c:1349 +#: wt-status.c:1367 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")" -#: wt-status.c:1353 +#: wt-status.c:1371 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1358 +#: wt-status.c:1376 msgid "You are currently editing a commit during a rebase." msgstr "Du håller på att redigera en incheckning under en ombasering." -#: wt-status.c:1361 +#: wt-status.c:1379 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)" -#: wt-status.c:1363 +#: wt-status.c:1381 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)" -#: wt-status.c:1372 +#: wt-status.c:1392 +msgid "Cherry-pick currently in progress." +msgstr "Cherry-pick pågår." + +#: wt-status.c:1395 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s." -#: wt-status.c:1377 +#: wt-status.c:1402 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1380 +#: wt-status.c:1405 +msgid " (run \"git cherry-pick --continue\" to continue)" +msgstr " (kör \"git cherry-pick --continue\" för att fortsätta)" + +#: wt-status.c:1408 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1382 +#: wt-status.c:1410 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-" "operationen)" -#: wt-status.c:1390 +#: wt-status.c:1420 +msgid "Revert currently in progress." +msgstr "Ångring pågår." + +#: wt-status.c:1423 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1395 +#: wt-status.c:1429 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1398 +#: wt-status.c:1432 +msgid " (run \"git revert --continue\" to continue)" +msgstr " (kör \"git revert --continue\" för att fortsätta)" + +#: wt-status.c:1435 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1400 +#: wt-status.c:1437 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1410 +#: wt-status.c:1447 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"." -#: wt-status.c:1414 +#: wt-status.c:1451 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1417 +#: wt-status.c:1454 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)" -#: wt-status.c:1617 +#: wt-status.c:1663 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1624 +#: wt-status.c:1670 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå " -#: wt-status.c:1626 +#: wt-status.c:1672 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå " -#: wt-status.c:1631 +#: wt-status.c:1677 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1633 +#: wt-status.c:1679 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1636 +#: wt-status.c:1682 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1653 +#: wt-status.c:1699 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1654 +#: wt-status.c:1700 msgid "No commits yet" msgstr "Inga incheckningar ännu" -#: wt-status.c:1668 +#: wt-status.c:1714 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1670 +#: wt-status.c:1716 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1674 +#: wt-status.c:1720 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -7471,32 +8146,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1680 +#: wt-status.c:1726 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1682 +#: wt-status.c:1728 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1688 +#: wt-status.c:1734 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1693 +#: wt-status.c:1739 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a" "\")\n" -#: wt-status.c:1696 +#: wt-status.c:1742 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1699 +#: wt-status.c:1745 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -7505,62 +8180,62 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1702 +#: wt-status.c:1748 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "inget köat för incheckning, men ospårade filer finns\n" -#: wt-status.c:1705 +#: wt-status.c:1751 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n" -#: wt-status.c:1708 wt-status.c:1713 +#: wt-status.c:1754 wt-status.c:1759 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1711 +#: wt-status.c:1757 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "inget att checka in (använd -u för att visa ospårade filer)\n" -#: wt-status.c:1715 +#: wt-status.c:1761 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1828 +#: wt-status.c:1874 msgid "No commits yet on " msgstr "Inga incheckningar ännu på " -#: wt-status.c:1832 +#: wt-status.c:1878 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1863 +#: wt-status.c:1909 msgid "different" msgstr "olika" -#: wt-status.c:1865 wt-status.c:1873 +#: wt-status.c:1911 wt-status.c:1919 msgid "behind " msgstr "efter " -#: wt-status.c:1868 wt-status.c:1871 +#: wt-status.c:1914 wt-status.c:1917 msgid "ahead " msgstr "före " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2386 +#: wt-status.c:2441 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "kan inte %s: Du har oköade ändringar." -#: wt-status.c:2392 +#: wt-status.c:2447 msgid "additionally, your index contains uncommitted changes." msgstr "dessutom innehåller dit index ändringar som inte har checkats in." -#: wt-status.c:2394 +#: wt-status.c:2449 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in." @@ -7623,7 +8298,7 @@ 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:214 builtin/push.c:560 +#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560 #: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "testkörning" @@ -7632,7 +8307,7 @@ msgstr "testkörning" msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:294 builtin/checkout.c:1304 builtin/reset.c:306 +#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306 msgid "select hunks interactively" msgstr "välj stycken interaktivt" @@ -7676,7 +8351,7 @@ msgstr "hoppa bara över filer som inte kan läggas till på grund av fel" msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: builtin/add.c:309 builtin/update-index.c:991 +#: builtin/add.c:309 builtin/update-index.c:1001 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" @@ -7725,29 +8400,29 @@ msgstr "lägger till inbäddat git-arkiv: %s" msgid "Use -f if you really want to add them.\n" msgstr "Använd -f om du verkligen vill lägga till dem.\n" -#: builtin/add.c:380 +#: builtin/add.c:379 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:418 +#: builtin/add.c:419 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:425 +#: builtin/add.c:426 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" -#: builtin/add.c:429 +#: builtin/add.c:430 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x" -#: builtin/add.c:444 +#: builtin/add.c:445 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:445 +#: builtin/add.c:446 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" @@ -7761,104 +8436,104 @@ msgstr "kunde inte tolka författarskript" msgid "'%s' was deleted by the applypatch-msg hook" msgstr "\"%s\" togs bort av kroken applypatch-msg" -#: builtin/am.c:473 +#: builtin/am.c:474 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/am.c:510 +#: builtin/am.c:512 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/am.c:536 +#: builtin/am.c:538 msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:724 +#: builtin/am.c:726 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:789 +#: builtin/am.c:791 msgid "Only one StGIT patch series can be applied at once" msgstr "Endast en StGIT-patchserie kan tillämpas åt gången" -#: builtin/am.c:837 +#: builtin/am.c:839 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:842 builtin/am.c:854 +#: builtin/am.c:844 builtin/am.c:856 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:849 +#: builtin/am.c:851 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:942 +#: builtin/am.c:944 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:947 builtin/clone.c:409 +#: builtin/am.c:949 builtin/clone.c:412 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:952 +#: builtin/am.c:954 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1082 builtin/commit.c:371 +#: builtin/am.c:1084 builtin/commit.c:371 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/am.c:1096 +#: builtin/am.c:1098 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "När du har löst problemet, kör \"%s --continue\"." -#: builtin/am.c:1097 +#: builtin/am.c:1099 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället." -#: builtin/am.c:1098 +#: builtin/am.c:1100 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"." -#: builtin/am.c:1181 +#: builtin/am.c:1183 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Patch sänd med format=flowed; blanksteg på slut av rader kan ha tappats." -#: builtin/am.c:1209 +#: builtin/am.c:1211 msgid "Patch is empty." msgstr "Patchen är tom." -#: builtin/am.c:1275 +#: builtin/am.c:1277 #, c-format msgid "invalid ident line: %.*s" msgstr "ogiltig ident-rad: %.*s" -#: builtin/am.c:1297 +#: builtin/am.c:1299 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: builtin/am.c:1493 +#: builtin/am.c:1495 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: builtin/am.c:1495 +#: builtin/am.c:1497 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1514 +#: builtin/am.c:1516 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -7866,30 +8541,30 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1520 +#: builtin/am.c:1522 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1546 +#: builtin/am.c:1548 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1578 +#: builtin/am.c:1580 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1624 builtin/am.c:1628 +#: builtin/am.c:1627 builtin/am.c:1631 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1644 +#: 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:1649 +#: builtin/am.c:1652 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -7897,35 +8572,35 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1659 +#: builtin/am.c:1662 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: " -#: builtin/am.c:1709 +#: builtin/am.c:1712 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1749 builtin/am.c:1817 +#: builtin/am.c:1752 builtin/am.c:1820 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1766 +#: builtin/am.c:1769 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1772 +#: builtin/am.c:1775 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1776 +#: builtin/am.c:1779 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" "Använd \"git am --show-current-patch\" för att se patchen som misslyckades" -#: builtin/am.c:1820 +#: builtin/am.c:1823 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -7935,7 +8610,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:1827 +#: builtin/am.c:1830 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -7947,17 +8622,17 @@ msgstr "" "lösta.\n" "Du kan köra ”git rm” för att godta ”borttagen av dem” för den." -#: builtin/am.c:1934 builtin/am.c:1938 builtin/am.c:1950 builtin/reset.c:329 +#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329 #: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet ”%s”." -#: builtin/am.c:1986 +#: builtin/am.c:1989 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2030 +#: builtin/am.c:2033 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -7965,143 +8640,143 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2123 +#: builtin/am.c:2130 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt värde för --patch-format: %s" -#: builtin/am.c:2159 +#: builtin/am.c:2166 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2160 +#: builtin/am.c:2167 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2166 +#: builtin/am.c:2173 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2168 +#: builtin/am.c:2175 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2170 +#: builtin/am.c:2177 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2171 builtin/init-db.c:486 builtin/prune-packed.c:58 -#: builtin/repack.c:306 +#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:306 builtin/stash.c:805 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2173 +#: builtin/am.c:2180 msgid "add a Signed-off-by line to the commit message" msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet" -#: builtin/am.c:2176 +#: builtin/am.c:2183 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2178 +#: builtin/am.c:2185 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2180 +#: builtin/am.c:2187 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2182 +#: builtin/am.c:2189 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2184 +#: builtin/am.c:2191 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet" -#: builtin/am.c:2187 +#: builtin/am.c:2194 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr" -#: builtin/am.c:2190 +#: builtin/am.c:2197 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2192 builtin/am.c:2195 builtin/am.c:2198 builtin/am.c:2201 -#: builtin/am.c:2204 builtin/am.c:2207 builtin/am.c:2210 builtin/am.c:2213 -#: builtin/am.c:2219 +#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208 +#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220 +#: builtin/am.c:2226 msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2209 builtin/commit.c:1343 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:240 -#: builtin/pull.c:152 builtin/pull.c:210 builtin/rebase.c:1062 +#: 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:386 -#: parse-options.h:144 parse-options.h:146 parse-options.h:266 +#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:397 +#: parse-options.h:140 parse-options.h:161 parse-options.h:303 msgid "n" msgstr "n" -#: builtin/am.c:2215 builtin/branch.c:637 builtin/for-each-ref.c:38 -#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39 +#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38 +#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39 msgid "format" msgstr "format" -#: builtin/am.c:2216 +#: builtin/am.c:2223 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2222 +#: builtin/am.c:2229 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2224 +#: builtin/am.c:2231 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2227 +#: builtin/am.c:2234 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2230 +#: builtin/am.c:2237 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2233 +#: builtin/am.c:2240 msgid "restore the original branch and abort the patching operation." msgstr "återställ originalgrenen och avbryt patchningen." -#: builtin/am.c:2236 +#: builtin/am.c:2243 msgid "abort the patching operation but keep HEAD where it is." msgstr "avbryt patchningen men behåll HEAD där det är." -#: builtin/am.c:2239 +#: builtin/am.c:2246 msgid "show the patch being applied." msgstr "visa patchen som tillämpas." -#: builtin/am.c:2243 +#: builtin/am.c:2250 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2245 +#: builtin/am.c:2252 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2247 builtin/commit.c:1486 builtin/merge.c:274 -#: builtin/pull.c:185 builtin/rebase.c:1106 builtin/rebase--interactive.c:185 -#: builtin/revert.c:114 builtin/tag.c:402 +#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491 +#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489 +#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2248 builtin/rebase.c:1107 builtin/rebase--interactive.c:186 +#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2251 +#: builtin/am.c:2258 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2269 +#: builtin/am.c:2276 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -8109,16 +8784,16 @@ msgstr "" "Flaggan -b/--binary har varit utan funktion länge, och\n" "kommer tas bort. Vi ber dig att inte använda den längre." -#: builtin/am.c:2276 +#: builtin/am.c:2283 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2291 +#: builtin/am.c:2298 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs." -#: builtin/am.c:2315 +#: builtin/am.c:2322 #, c-format msgid "" "Stray %s directory found.\n" @@ -8127,7 +8802,7 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2321 +#: builtin/am.c:2328 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." @@ -8351,8 +9026,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 @@ -8439,141 +9113,141 @@ msgstr "--bisect-next-check kräver 2 eller 3 argument" msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms kräver noll eller ett argument" -#: builtin/blame.c:31 +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" -#: builtin/blame.c:406 +#: builtin/blame.c:407 #, c-format msgid "expecting a color: %s" msgstr "förväntade en färg: %s" -#: builtin/blame.c:413 +#: builtin/blame.c:414 msgid "must end with a color" msgstr "måste sluta med en färg" -#: builtin/blame.c:700 +#: builtin/blame.c:701 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "felaktig färg \"%s\" i color.blame.repeatedLines" -#: builtin/blame.c:718 +#: builtin/blame.c:719 msgid "invalid value for blame.coloring" msgstr "ogiltigt värde för blame.coloring" -#: builtin/blame.c:793 +#: builtin/blame.c:794 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:794 +#: builtin/blame.c:795 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" -#: builtin/blame.c:795 +#: builtin/blame.c:796 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:796 +#: builtin/blame.c:797 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:797 +#: builtin/blame.c:798 msgid "Force progress reporting" msgstr "Tvinga förloppsrapportering" -#: builtin/blame.c:798 +#: builtin/blame.c:799 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:799 +#: builtin/blame.c:800 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:800 +#: builtin/blame.c:801 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:801 +#: builtin/blame.c:802 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:802 +#: builtin/blame.c:803 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:803 +#: builtin/blame.c:804 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Använd samma utdataläge som git-annotate (Standard: av)" -#: builtin/blame.c:804 +#: builtin/blame.c:805 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:805 +#: builtin/blame.c:806 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:806 +#: builtin/blame.c:807 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:807 +#: builtin/blame.c:808 msgid "Show author email instead of name (Default: off)" msgstr "Visa författarens e-post istället för namn (Standard: av)" -#: builtin/blame.c:808 +#: builtin/blame.c:809 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:809 +#: builtin/blame.c:810 msgid "color redundant metadata from previous line differently" msgstr "färglägg redundant metadata från tidigare rader annorlunda" -#: builtin/blame.c:810 +#: builtin/blame.c:811 msgid "color lines by age" msgstr "färglägg rader efter ålder" -#: builtin/blame.c:817 +#: builtin/blame.c:818 msgid "Use an experimental heuristic to improve diffs" msgstr "Använd en experimentell algoritm för att förbättra diffar" -#: builtin/blame.c:819 +#: builtin/blame.c:820 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:820 +#: builtin/blame.c:821 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list" -#: builtin/blame.c:821 +#: builtin/blame.c:822 msgid "Use <file>'s contents as the final image" msgstr "Använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:822 builtin/blame.c:823 +#: builtin/blame.c:823 builtin/blame.c:824 msgid "score" msgstr "poäng" -#: builtin/blame.c:822 +#: builtin/blame.c:823 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:823 +#: builtin/blame.c:824 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:824 +#: builtin/blame.c:825 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:824 +#: builtin/blame.c:825 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med början på 1" -#: builtin/blame.c:875 +#: builtin/blame.c:876 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress kan inte användas med --incremental eller porslinsformat" @@ -8585,18 +9259,18 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:926 +#: builtin/blame.c:927 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" -#: builtin/blame.c:1018 +#: builtin/blame.c:1031 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "filen %s har bara %lu rad" msgstr[1] "filen %s har bara %lu rader" -#: builtin/blame.c:1064 +#: builtin/blame.c:1077 msgid "Blaming lines" msgstr "Klandra rader" @@ -8707,66 +9381,75 @@ msgstr "Tog bort fjärrspårande grenen %s (var %s).\n" msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:421 builtin/tag.c:59 +#: builtin/branch.c:421 builtin/tag.c:60 msgid "unable to parse format string" msgstr "kan inte tolka formatsträng" +#: builtin/branch.c:452 +msgid "could not resolve HEAD" +msgstr "kunde inte slå upp HEAD" + #: builtin/branch.c:458 #, c-format +msgid "HEAD (%s) points outside of refs/heads/" +msgstr "HEAD (%s) pekar utenför refs/heads/" + +#: builtin/branch.c:473 +#, c-format msgid "Branch %s is being rebased at %s" msgstr "Grenen %s ombaseras på %s" -#: builtin/branch.c:462 +#: builtin/branch.c:477 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" på %s" -#: builtin/branch.c:479 +#: builtin/branch.c:494 msgid "cannot copy the current branch while not on any." msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon." -#: builtin/branch.c:481 +#: builtin/branch.c:496 msgid "cannot rename the current branch while not on any." msgstr "" "kunde inte byta namn på aktuell gren när du inte befinner dig på någon." -#: builtin/branch.c:492 +#: builtin/branch.c:507 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:519 +#: builtin/branch.c:534 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:521 +#: builtin/branch.c:536 msgid "Branch copy failed" msgstr "Misslyckades kopiera gren" -#: builtin/branch.c:525 +#: builtin/branch.c:540 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Skapade kopia av felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:528 +#: builtin/branch.c:543 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:534 +#: builtin/branch.c:549 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!" -#: builtin/branch.c:543 +#: builtin/branch.c:558 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:545 +#: builtin/branch.c:560 msgid "Branch is copied, but update of config-file failed" msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:561 +#: builtin/branch.c:576 #, c-format msgid "" "Please edit the description for the branch\n" @@ -8777,223 +9460,217 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/branch.c:594 +#: builtin/branch.c:610 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:596 +#: builtin/branch.c:612 msgid "show hash and subject, give twice for upstream branch" msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren" -#: builtin/branch.c:597 +#: builtin/branch.c:613 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:598 +#: builtin/branch.c:614 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:600 +#: builtin/branch.c:616 msgid "do not use" msgstr "använd ej" -#: builtin/branch.c:602 builtin/rebase--interactive.c:182 +#: builtin/branch.c:618 builtin/rebase.c:485 msgid "upstream" msgstr "uppströms" -#: builtin/branch.c:602 +#: builtin/branch.c:618 msgid "change the upstream info" msgstr "ändra uppströmsinformationen" -#: builtin/branch.c:603 +#: builtin/branch.c:619 msgid "Unset the upstream info" msgstr "Ta bort uppströmsinformationen" -#: builtin/branch.c:604 +#: builtin/branch.c:620 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:605 +#: builtin/branch.c:621 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:607 builtin/branch.c:609 +#: builtin/branch.c:623 builtin/branch.c:625 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:608 builtin/branch.c:610 +#: builtin/branch.c:624 builtin/branch.c:626 msgid "print only branches that don't contain the commit" msgstr "visa endast grenar som inte innehåller incheckningen" -#: builtin/branch.c:613 +#: builtin/branch.c:629 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:614 +#: builtin/branch.c:630 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:616 +#: builtin/branch.c:632 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:617 +#: builtin/branch.c:633 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:618 +#: builtin/branch.c:634 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:619 +#: builtin/branch.c:635 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:620 +#: builtin/branch.c:636 msgid "copy a branch and its reflog" msgstr "kopiera en gren och dess reflogg" -#: builtin/branch.c:621 +#: builtin/branch.c:637 msgid "copy a branch, even if target exists" msgstr "kopiera en gren, även om målet finns" -#: builtin/branch.c:622 +#: builtin/branch.c:638 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:623 +#: builtin/branch.c:639 +msgid "show current branch name" +msgstr "visa namn på aktuell gren" + +#: builtin/branch.c:640 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:625 +#: builtin/branch.c:642 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:626 +#: builtin/branch.c:643 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:627 +#: builtin/branch.c:644 msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:628 +#: builtin/branch.c:645 msgid "print only branches that are not merged" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:629 +#: builtin/branch.c:646 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 -#: builtin/tag.c:415 -msgid "key" -msgstr "nyckel" - -#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 -#: builtin/tag.c:416 -msgid "field name to sort on" -msgstr "fältnamn att sortera på" - -#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415 +#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:418 +#: builtin/tag.c:427 msgid "object" msgstr "objekt" -#: builtin/branch.c:634 +#: builtin/branch.c:650 msgid "print only branches of the object" msgstr "visa endast grenar för objektet" -#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425 +#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434 msgid "sorting and filtering are case insensitive" msgstr "sortering och filtrering skiljer gemener och VERSALER" -#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423 +#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/branch.c:660 builtin/clone.c:746 +#: builtin/branch.c:676 builtin/clone.c:751 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:683 +#: builtin/branch.c:700 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758 +#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:725 +#: builtin/branch.c:745 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:730 +#: builtin/branch.c:750 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:737 +#: builtin/branch.c:757 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu." -#: builtin/branch.c:740 +#: builtin/branch.c:760 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:755 +#: builtin/branch.c:775 msgid "too many branches for a copy operation" msgstr "för många grenar för kopiering" -#: builtin/branch.c:764 +#: builtin/branch.c:784 msgid "too many arguments for a rename operation" msgstr "för många flaggor för namnbyte" -#: builtin/branch.c:769 +#: builtin/branch.c:789 msgid "too many arguments to set new upstream" msgstr "för många flaggor för att byta uppström" -#: builtin/branch.c:773 +#: builtin/branch.c:793 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren." -#: builtin/branch.c:776 builtin/branch.c:799 +#: builtin/branch.c:796 builtin/branch.c:819 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:780 +#: builtin/branch.c:800 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:793 +#: builtin/branch.c:813 msgid "too many arguments to unset upstream" msgstr "för många flaggor för att ta bort uppström" -#: builtin/branch.c:797 +#: builtin/branch.c:817 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren." -#: builtin/branch.c:803 +#: builtin/branch.c:823 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:813 +#: builtin/branch.c:833 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett " "grennamn" -#: builtin/branch.c:816 +#: builtin/branch.c:836 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -9062,7 +9739,7 @@ msgstr "för blob-objekt, kör filter på objektets innehåll" msgid "for blob objects, run filters on object's content" msgstr "för blob-objekt, kör filger på objektets innehåll" -#: builtin/cat-file.c:643 git-submodule.sh:860 +#: builtin/cat-file.c:643 git-submodule.sh:936 msgid "blob" msgstr "blob" @@ -9123,8 +9800,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:1280 builtin/gc.c:517 -#: builtin/worktree.c:496 +#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538 +#: builtin/worktree.c:499 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -9215,8 +9892,8 @@ 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:1857 -#: builtin/worktree.c:669 +#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856 +#: builtin/worktree.c:672 msgid "string" msgstr "sträng" @@ -9236,126 +9913,140 @@ msgstr "git checkout [<flaggor>] <gren>" msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..." -#: builtin/checkout.c:147 builtin/checkout.c:181 +#: builtin/checkout.c:151 builtin/checkout.c:190 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:149 builtin/checkout.c:183 +#: builtin/checkout.c:153 builtin/checkout.c:192 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:165 +#: builtin/checkout.c:169 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner" -#: builtin/checkout.c:210 +#: builtin/checkout.c:219 #, c-format msgid "path '%s' does not have necessary versions" msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner" -#: builtin/checkout.c:228 +#: builtin/checkout.c:237 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:244 +#: builtin/checkout.c:253 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:267 builtin/checkout.c:270 builtin/checkout.c:273 -#: builtin/checkout.c:276 +#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337 +#: builtin/checkout.c:340 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar" -#: builtin/checkout.c:279 builtin/checkout.c:282 +#: builtin/checkout.c:343 builtin/checkout.c:346 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:285 +#: builtin/checkout.c:349 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt." -#: builtin/checkout.c:354 builtin/checkout.c:361 +#: builtin/checkout.c:396 builtin/checkout.c:403 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:397 +#: builtin/checkout.c:442 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Återskapade %d sammanslagningskonflikt" msgstr[1] "Återskapade %d sammanslagningskonflikter" -#: builtin/checkout.c:402 +#: builtin/checkout.c:447 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Uppdaterade %d sökväg från %s" msgstr[1] "Uppdaterade %d sökvägar från %s" -#: builtin/checkout.c:409 +#: builtin/checkout.c:454 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Uppdaterade %d sökväg från indexet" msgstr[1] "Uppdaterade %d sökvägar från indexet" -#: builtin/checkout.c:645 +#: builtin/checkout.c:695 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:782 +#: builtin/checkout.c:744 +#, c-format +msgid "" +"cannot continue with staged changes in the following files:\n" +"%s" +msgstr "" +"kan inte fortsätta med köade ändringar i följande filer:\n" +"%s" + +#: builtin/checkout.c:751 +#, c-format +msgid "staged changes in the following files may be lost: %s" +msgstr "köade ändringar i följande filer kan gå förlorade: %s" + +#: builtin/checkout.c:848 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:824 +#: builtin/checkout.c:890 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:828 builtin/clone.c:699 +#: builtin/checkout.c:894 builtin/clone.c:704 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:832 +#: builtin/checkout.c:898 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:835 +#: builtin/checkout.c:901 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:839 +#: builtin/checkout.c:905 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:841 builtin/checkout.c:1212 +#: builtin/checkout.c:907 builtin/checkout.c:1283 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:843 +#: builtin/checkout.c:909 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:960 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:900 +#: builtin/checkout.c:966 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -9378,7 +10069,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:919 +#: builtin/checkout.c:985 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -9405,24 +10096,24 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:1017 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:955 +#: builtin/checkout.c:1021 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:983 builtin/checkout.c:1207 +#: builtin/checkout.c:1052 builtin/checkout.c:1278 msgid "You are on a branch yet to be born" msgstr "Du är på en gren som ännu inte är född" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1173 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1209 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -9431,144 +10122,152 @@ 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:1153 builtin/worktree.c:290 builtin/worktree.c:445 +#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1182 +#: builtin/checkout.c:1251 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1221 +#: builtin/checkout.c:1292 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1224 builtin/checkout.c:1228 +#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1232 builtin/checkout.c:1235 builtin/checkout.c:1240 -#: builtin/checkout.c:1243 +#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315 +#: builtin/checkout.c:1318 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1248 +#: builtin/checkout.c:1323 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1281 builtin/checkout.c:1283 builtin/clone.c:120 -#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:489 -#: builtin/worktree.c:491 +#: 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:1282 +#: builtin/checkout.c:1357 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1284 +#: builtin/checkout.c:1359 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1285 +#: builtin/checkout.c:1360 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1286 builtin/worktree.c:493 +#: builtin/checkout.c:1361 builtin/worktree.c:496 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1287 +#: builtin/checkout.c:1362 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1289 +#: builtin/checkout.c:1364 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1289 +#: builtin/checkout.c:1364 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1291 +#: 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:1294 +#: builtin/checkout.c:1369 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1296 +#: builtin/checkout.c:1371 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1298 +#: 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:1300 builtin/merge.c:276 +#: builtin/checkout.c:1375 builtin/merge.c:284 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1302 builtin/log.c:1586 parse-options.h:272 +#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:309 msgid "style" msgstr "stil" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1378 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1306 +#: 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:1308 +#: 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:1310 +#: builtin/checkout.c:1385 msgid "do not check if another worktree is holding the given ref" msgstr "" "kontrollera inte om en annan arbetskatalog håller den angivna referensen" -#: builtin/checkout.c:1314 builtin/clone.c:87 builtin/fetch.c:141 -#: builtin/merge.c:273 builtin/pull.c:130 builtin/push.c:575 +#: 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:1345 +#: builtin/checkout.c:1390 +msgid "use overlay mode (default)" +msgstr "använd överläggsläge (standard)" + +#: builtin/checkout.c:1422 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1362 +#: builtin/checkout.c:1425 +msgid "-p and --overlay are mutually exclusive" +msgstr "-p och --overlay är ömsesidigt uteslutande" + +#: builtin/checkout.c:1442 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1367 +#: builtin/checkout.c:1447 msgid "missing branch name; try -b" msgstr "grennamn saknas; försök med -b" -#: builtin/checkout.c:1404 +#: builtin/checkout.c:1484 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1491 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "”%s” är inte en incheckning och grenen ”%s” kan inte skapas från den" -#: builtin/checkout.c:1415 +#: builtin/checkout.c:1495 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\"" -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1499 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -9576,7 +10275,7 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/checkout.c:1439 +#: builtin/checkout.c:1519 #, c-format msgid "" "'%s' matched more than one remote tracking branch.\n" @@ -9755,8 +10454,8 @@ 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:167 builtin/log.c:169 -#: builtin/ls-files.c:557 builtin/name-rev.c:415 builtin/name-rev.c:417 +#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173 +#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 #: builtin/show-ref.c:178 msgid "pattern" msgstr "mönster" @@ -9797,142 +10496,154 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:89 +#: builtin/clone.c:90 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:90 builtin/clone.c:92 builtin/init-db.c:481 +#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:94 +#: builtin/clone.c:95 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:96 +#: builtin/clone.c:97 msgid "to clone from a local repository" msgstr "för att klona från ett lokalt arkiv" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hårda länkar, kopiera alltid" -#: builtin/clone.c:100 +#: builtin/clone.c:101 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:102 builtin/clone.c:106 +#: builtin/clone.c:103 builtin/clone.c:107 msgid "pathspec" msgstr "sökvägsangivelse" -#: builtin/clone.c:102 builtin/clone.c:106 +#: builtin/clone.c:103 builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:109 +#: builtin/clone.c:110 msgid "number of submodules cloned in parallel" msgstr "antal undermoduler som klonas parallellt" -#: builtin/clone.c:110 builtin/init-db.c:478 +#: builtin/clone.c:111 builtin/init-db.c:486 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:111 builtin/init-db.c:479 +#: builtin/clone.c:112 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1379 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1379 +#: builtin/submodule--helper.c:1859 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:117 builtin/submodule--helper.c:1381 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1381 +#: builtin/submodule--helper.c:1861 msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" -#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3303 builtin/repack.c:329 +#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3306 builtin/repack.c:329 msgid "name" msgstr "namn" -#: builtin/clone.c:119 +#: builtin/clone.c:120 msgid "use <name> instead of 'origin' to track upstream" msgstr "använd <namn> istället för \"origin\" för att spåra uppströms" -#: builtin/clone.c:121 +#: builtin/clone.c:122 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checka ut <gren> istället för fjärrens HEAD" -#: builtin/clone.c:123 +#: builtin/clone.c:124 msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:124 builtin/fetch.c:142 builtin/grep.c:836 -#: builtin/pull.c:218 +#: builtin/clone.c:125 builtin/fetch.c:142 builtin/grep.c:836 +#: builtin/pull.c:225 msgid "depth" msgstr "djup" -#: builtin/clone.c:125 +#: builtin/clone.c:126 msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:126 builtin/fetch.c:144 builtin/pack-objects.c:3292 +#: builtin/clone.c:127 builtin/fetch.c:144 builtin/pack-objects.c:3295 msgid "time" msgstr "tid" -#: builtin/clone.c:127 +#: builtin/clone.c:128 msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon från en angiven tidpunkt" -#: builtin/clone.c:128 builtin/fetch.c:146 builtin/fetch.c:169 -#: builtin/rebase.c:1039 +#: builtin/clone.c:129 builtin/fetch.c:146 builtin/fetch.c:169 +#: builtin/rebase.c:1389 msgid "revision" msgstr "revision" -#: builtin/clone.c:129 builtin/fetch.c:147 +#: builtin/clone.c:130 builtin/fetch.c:147 msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" -#: builtin/clone.c:131 +#: builtin/clone.c:132 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:133 +#: builtin/clone.c:134 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "klona inga taggar och gör att senare hämtningar inte följer dem" -#: builtin/clone.c:135 +#: builtin/clone.c:136 msgid "any cloned submodules will be shallow" msgstr "klonade undermoduler kommer vara grunda" -#: builtin/clone.c:136 builtin/init-db.c:487 +#: builtin/clone.c:137 builtin/init-db.c:495 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:137 builtin/init-db.c:488 +#: builtin/clone.c:138 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" -#: builtin/clone.c:138 +#: builtin/clone.c:139 msgid "key=value" msgstr "nyckel=värde" -#: builtin/clone.c:139 +#: builtin/clone.c:140 msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:231 +#: builtin/clone.c:142 builtin/fetch.c:164 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:172 +msgid "server-specific" +msgstr "serverspecifik" + +#: builtin/clone.c:142 builtin/fetch.c:164 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:173 +msgid "option to transmit" +msgstr "" +"inget att checka in\n" +"flagga att sända" + +#: builtin/clone.c:143 builtin/fetch.c:165 builtin/pull.c:238 #: builtin/push.c:586 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:234 +#: builtin/clone.c:145 builtin/fetch.c:167 builtin/pull.c:241 #: builtin/push.c:588 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" -#: builtin/clone.c:280 +#: builtin/clone.c:283 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -9940,47 +10651,47 @@ msgstr "" "Kunde inte gissa katalognamn.\n" "Ange en katalog på kommandoraden" -#: builtin/clone.c:333 +#: builtin/clone.c:336 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n" -#: builtin/clone.c:405 +#: builtin/clone.c:408 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: builtin/clone.c:413 +#: builtin/clone.c:416 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:427 +#: builtin/clone.c:430 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" -#: builtin/clone.c:444 +#: builtin/clone.c:447 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" -#: builtin/clone.c:449 +#: builtin/clone.c:452 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:453 +#: builtin/clone.c:456 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:479 +#: builtin/clone.c:482 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:493 +#: builtin/clone.c:496 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -9990,133 +10701,133 @@ msgstr "" "Du kan inspektera det som checkades ut med \"git status\"\n" "och försöka checka ut igen med \"git checkout -f HEAD\"\n" -#: builtin/clone.c:570 +#: builtin/clone.c:573 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Kunde inte hitta fjärrgrenen %s för att klona." -#: builtin/clone.c:687 +#: builtin/clone.c:692 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:737 +#: builtin/clone.c:742 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n" -#: builtin/clone.c:768 +#: builtin/clone.c:773 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:813 +#: builtin/clone.c:818 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:876 +#: builtin/clone.c:881 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:878 +#: builtin/clone.c:883 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:918 builtin/receive-pack.c:1941 +#: builtin/clone.c:923 builtin/receive-pack.c:1952 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:922 +#: builtin/clone.c:927 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:935 +#: builtin/clone.c:940 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:938 +#: builtin/clone.c:943 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:951 +#: builtin/clone.c:956 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:957 builtin/fetch.c:1608 +#: builtin/clone.c:962 builtin/fetch.c:1610 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:967 +#: builtin/clone.c:972 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." -#: builtin/clone.c:977 +#: builtin/clone.c:982 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:992 builtin/clone.c:1013 builtin/difftool.c:272 -#: builtin/worktree.c:296 builtin/worktree.c:326 +#: builtin/clone.c:997 builtin/clone.c:1018 builtin/difftool.c:270 +#: builtin/worktree.c:296 builtin/worktree.c:328 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:997 +#: builtin/clone.c:1002 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:1017 +#: builtin/clone.c:1022 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:1019 +#: builtin/clone.c:1024 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:1043 +#: builtin/clone.c:1048 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" "clone --recursive är inte kompatibel med --reference och --reference-if-able" -#: builtin/clone.c:1104 +#: builtin/clone.c:1109 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1106 +#: builtin/clone.c:1111 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1108 +#: builtin/clone.c:1113 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1110 +#: builtin/clone.c:1115 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1113 +#: builtin/clone.c:1118 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1118 +#: builtin/clone.c:1123 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1192 builtin/clone.c:1200 +#: builtin/clone.c:1200 builtin/clone.c:1208 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1203 +#: builtin/clone.c:1211 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -10152,6 +10863,74 @@ msgstr "Spaltfyllnad mellan spalter" msgid "--command must be the first argument" msgstr "--command måste vara första argument" +#: builtin/commit-tree.c:18 +msgid "" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " +"<file>)...] <tree>" +msgstr "" +"git commit-tree [(-p <föräldrer>)...] [-S[<nyckelid>]] [(-m " +"<meddelande>)...] [(-F <fil>)...] <träd>" + +#: builtin/commit-tree.c:31 +#, c-format +msgid "duplicate parent %s ignored" +msgstr "duplicerad förälder %s ignorerades" + +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520 +#, c-format +msgid "not a valid object name %s" +msgstr "objektnamnet är inte giltigt: %s" + +#: builtin/commit-tree.c:93 +#, c-format +msgid "git commit-tree: failed to open '%s'" +msgstr "git commit-tree: misslyckades öppna \"%s\"" + +#: builtin/commit-tree.c:96 +#, c-format +msgid "git commit-tree: failed to read '%s'" +msgstr "git commit-tree: misslyckades läsa \"%s\"" + +#: builtin/commit-tree.c:98 +#, c-format +msgid "git commit-tree: failed to close '%s'" +msgstr "git commit-tree: misslyckades stänga \"%s\"" + +#: builtin/commit-tree.c:111 +msgid "parent" +msgstr "förälder" + +#: builtin/commit-tree.c:112 +msgid "id of a parent commit object" +msgstr "id på ett förälderincheckningsobjekt" + +#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473 +#: builtin/tag.c:406 +msgid "message" +msgstr "meddelande" + +#: builtin/commit-tree.c:115 builtin/commit.c:1480 +msgid "commit message" +msgstr "incheckningsmeddelande" + +#: builtin/commit-tree.c:118 +msgid "read commit log message from file" +msgstr "läs incheckningsloggmeddelande från fil" + +#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283 +#: builtin/pull.c:193 builtin/revert.c:117 +msgid "GPG sign commit" +msgstr "GPG-signera incheckning" + +#: builtin/commit-tree.c:133 +msgid "must give exactly one tree" +msgstr "måste ange exakt ett träd" + +#: builtin/commit-tree.c:140 +msgid "git commit-tree: failed to read" +msgstr "git commit-tree: misslyckades läsa" + #: builtin/commit.c:41 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<flaggor>] [--] <sökväg>..." @@ -10258,7 +11037,7 @@ msgstr "incheckningen \"%s\" har felformaterat författarhuvud" msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:652 +#: builtin/commit.c:653 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -10266,38 +11045,38 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1052 +#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:701 builtin/shortlog.c:319 +#: builtin/commit.c:703 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:703 +#: builtin/commit.c:705 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:707 +#: builtin/commit.c:709 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:736 builtin/commit.c:744 +#: builtin/commit.c:740 builtin/commit.c:756 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:741 +#: builtin/commit.c:747 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:795 +#: builtin/commit.c:807 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:813 +#: builtin/commit.c:826 #, c-format msgid "" "\n" @@ -10312,7 +11091,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:818 +#: builtin/commit.c:831 #, c-format msgid "" "\n" @@ -10327,7 +11106,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:831 +#: builtin/commit.c:844 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -10337,7 +11116,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:839 +#: builtin/commit.c:852 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -10348,148 +11127,144 @@ msgstr "" "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:856 +#: builtin/commit.c:869 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:864 +#: builtin/commit.c:877 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:871 +#: builtin/commit.c:884 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:889 +#: builtin/commit.c:902 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:956 +#: builtin/commit.c:969 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:970 builtin/tag.c:258 +#: builtin/commit.c:983 builtin/tag.c:269 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" -#: builtin/commit.c:1014 +#: builtin/commit.c:1027 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare" -#: builtin/commit.c:1028 +#: builtin/commit.c:1041 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Ogiltigt ignorerat läge \"%s\"" -#: builtin/commit.c:1042 builtin/commit.c:1279 +#: builtin/commit.c:1059 builtin/commit.c:1284 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1080 +#: builtin/commit.c:1097 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1113 +#: builtin/commit.c:1130 msgid "Using both --reset-author and --author does not make sense" msgstr "Kan inte använda både --reset-author och --author" -#: builtin/commit.c:1122 +#: builtin/commit.c:1139 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1125 +#: builtin/commit.c:1142 msgid "You are in the middle of a merge -- cannot amend." msgstr "Du är i mitten av en sammanslagning -- kan inte utöka." -#: builtin/commit.c:1127 +#: builtin/commit.c:1144 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Du är i mitten av en cherry-pick -- kan inte utöka." -#: builtin/commit.c:1130 +#: builtin/commit.c:1147 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1140 +#: builtin/commit.c:1157 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Endast en av -c/-C/-F/--fixup kan användas." -#: builtin/commit.c:1142 +#: builtin/commit.c:1159 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F." -#: builtin/commit.c:1150 +#: builtin/commit.c:1167 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author kan endast användas med -C, -c eller --amend." -#: builtin/commit.c:1167 +#: builtin/commit.c:1184 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Endast en av --include/--only/--all/--interactive/--patch kan användas." -#: builtin/commit.c:1169 +#: builtin/commit.c:1186 msgid "No paths with --include/--only does not make sense." msgstr "Du måste ange sökvägar tillsammans med --include/--only." -#: builtin/commit.c:1183 builtin/tag.c:546 +#: builtin/commit.c:1192 #, c-format -msgid "Invalid cleanup mode %s" -msgstr "Felaktigt städningsläge %s" - -#: builtin/commit.c:1188 -msgid "Paths with -a does not make sense." -msgstr "Kan inte ange sökvägar med -a." +msgid "paths '%s ...' with -a does not make sense" +msgstr "sökvägarna \"%s ...\" med -a ger ingen mening" -#: builtin/commit.c:1314 builtin/commit.c:1498 +#: builtin/commit.c:1319 builtin/commit.c:1503 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1316 builtin/commit.c:1500 +#: builtin/commit.c:1321 builtin/commit.c:1505 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1318 +#: builtin/commit.c:1323 msgid "show stash information" msgstr "visa information om stash" -#: builtin/commit.c:1320 builtin/commit.c:1502 +#: builtin/commit.c:1325 builtin/commit.c:1507 msgid "compute full ahead/behind values" msgstr "beräkna fullständiga före-/efter-värden" -#: builtin/commit.c:1322 +#: builtin/commit.c:1327 msgid "version" msgstr "version" -#: builtin/commit.c:1322 builtin/commit.c:1504 builtin/push.c:561 -#: builtin/worktree.c:640 +#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561 +#: builtin/worktree.c:643 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1325 builtin/commit.c:1506 +#: builtin/commit.c:1330 builtin/commit.c:1511 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1328 builtin/commit.c:1509 +#: builtin/commit.c:1333 builtin/commit.c:1514 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1330 builtin/commit.c:1334 builtin/commit.c:1512 -#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1118 -#: builtin/tag.c:400 +#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517 +#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465 +#: parse-options.h:323 msgid "mode" msgstr "läge" -#: builtin/commit.c:1331 builtin/commit.c:1512 +#: builtin/commit.c:1336 builtin/commit.c:1517 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "visa ospårade filer, valfria lägen: all, normal, no. (Standard: all)" -#: builtin/commit.c:1335 +#: builtin/commit.c:1340 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -10497,11 +11272,11 @@ msgstr "" "visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: " "traditional)" -#: builtin/commit.c:1337 parse-options.h:164 +#: builtin/commit.c:1342 parse-options.h:178 msgid "when" msgstr "när" -#: builtin/commit.c:1338 +#: builtin/commit.c:1343 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -10509,189 +11284,167 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1340 +#: builtin/commit.c:1345 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1341 +#: builtin/commit.c:1346 msgid "do not detect renames" msgstr "detektera inte namnändringar" -#: builtin/commit.c:1343 +#: builtin/commit.c:1348 msgid "detect renames, optionally set similarity index" msgstr "detektera namnändringar, möjligen sätt likhetsindex" -#: builtin/commit.c:1363 +#: builtin/commit.c:1368 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "Kombinationen av argument för ignorerade och ospårade filer stöds ej" -#: builtin/commit.c:1468 +#: builtin/commit.c:1473 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1469 +#: builtin/commit.c:1474 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1471 +#: builtin/commit.c:1476 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1472 builtin/merge.c:264 builtin/tag.c:397 +#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1473 +#: builtin/commit.c:1478 msgid "author" msgstr "författare" -#: builtin/commit.c:1473 +#: builtin/commit.c:1478 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1474 builtin/gc.c:518 +#: builtin/commit.c:1479 builtin/gc.c:539 msgid "date" msgstr "datum" -#: builtin/commit.c:1474 +#: builtin/commit.c:1479 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1475 builtin/merge.c:260 builtin/notes.c:409 -#: builtin/notes.c:575 builtin/tag.c:395 -msgid "message" -msgstr "meddelande" - -#: builtin/commit.c:1475 -msgid "commit message" -msgstr "incheckningsmeddelande" - -#: builtin/commit.c:1476 builtin/commit.c:1477 builtin/commit.c:1478 -#: builtin/commit.c:1479 parse-options.h:278 ref-filter.h:92 +#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483 +#: builtin/commit.c:1484 parse-options.h:315 ref-filter.h:92 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1476 +#: builtin/commit.c:1481 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1477 +#: builtin/commit.c:1482 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1478 +#: builtin/commit.c:1483 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1479 +#: builtin/commit.c:1484 msgid "use autosquash formatted message to squash specified commit" msgstr "" "använd autosquash-formaterat meddelande för att slå ihop med angiven " "incheckning" -#: builtin/commit.c:1480 +#: builtin/commit.c:1485 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)" -#: builtin/commit.c:1481 builtin/log.c:1533 builtin/merge.c:277 -#: builtin/pull.c:156 builtin/revert.c:107 +#: builtin/commit.c:1486 builtin/log.c:1541 builtin/merge.c:285 +#: builtin/pull.c:162 builtin/revert.c:109 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1482 +#: builtin/commit.c:1487 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1483 +#: builtin/commit.c:1488 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1484 -msgid "default" -msgstr "standard" - -#: builtin/commit.c:1484 builtin/tag.c:401 -msgid "how to strip spaces and #comments from message" -msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" - -#: builtin/commit.c:1485 +#: builtin/commit.c:1490 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1487 builtin/merge.c:275 builtin/pull.c:186 -#: builtin/revert.c:115 -msgid "GPG sign commit" -msgstr "GPG-signera incheckning" - -#: builtin/commit.c:1490 +#: builtin/commit.c:1495 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1491 +#: builtin/commit.c:1496 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1492 +#: builtin/commit.c:1497 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1493 +#: builtin/commit.c:1498 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1494 +#: builtin/commit.c:1499 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1495 +#: builtin/commit.c:1500 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1496 +#: builtin/commit.c:1501 msgid "bypass pre-commit and commit-msg hooks" msgstr "förbigå pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1497 +#: builtin/commit.c:1502 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1510 +#: builtin/commit.c:1515 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1511 +#: builtin/commit.c:1516 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1516 +#: builtin/commit.c:1521 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1518 +#: builtin/commit.c:1523 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1591 +#: builtin/commit.c:1596 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1598 +#: builtin/commit.c:1603 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1617 +#: builtin/commit.c:1622 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1628 +#: builtin/commit.c:1629 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1633 +#: builtin/commit.c:1634 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" @@ -10727,34 +11480,39 @@ msgstr "" "git commit-graph write [--object-dir <objkat>] [--append] [--reachable|--" "stdin-packs|--stdin-commits]" -#: builtin/commit-graph.c:48 builtin/commit-graph.c:78 -#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153 -#: builtin/log.c:1553 +#: builtin/commit-graph.c:51 builtin/commit-graph.c:89 +#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153 +#: builtin/log.c:1561 msgid "dir" msgstr "kat" -#: builtin/commit-graph.c:49 builtin/commit-graph.c:79 -#: builtin/commit-graph.c:133 builtin/commit-graph.c:191 +#: builtin/commit-graph.c:52 builtin/commit-graph.c:90 +#: builtin/commit-graph.c:148 builtin/commit-graph.c:206 msgid "The object directory to store the graph" msgstr "Objektkatalogen där grafen skall lagras" -#: builtin/commit-graph.c:135 +#: builtin/commit-graph.c:68 builtin/commit-graph.c:105 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "Kunde inte öppna incheckningsgrafen \"%s\"" + +#: builtin/commit-graph.c:150 msgid "start walk at all refs" msgstr "starta traversering vid alla referenser" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:152 msgid "scan pack-indexes listed by stdin for commits" msgstr "sök paketindex listade på standard in efter incheckningar" -#: builtin/commit-graph.c:139 +#: builtin/commit-graph.c:154 msgid "start walk at commits listed by stdin" msgstr "börja gå genom incheckningar listade på standard in" -#: builtin/commit-graph.c:141 +#: builtin/commit-graph.c:156 msgid "include all commits already in the commit-graph file" msgstr "ta med alla incheckningar redan i filen commit-graph" -#: builtin/commit-graph.c:150 +#: builtin/commit-graph.c:165 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "använd som mest en av --reachable, --stdin-commit och --stdin-packs" @@ -11156,7 +11914,7 @@ msgstr "" msgid "describe %s\n" msgstr "beskriva %s\n" -#: builtin/describe.c:513 builtin/log.c:516 +#: builtin/describe.c:513 #, c-format msgid "Not a valid object name %s" msgstr "Objektnamnet är inte giltigt: %s" @@ -11206,7 +11964,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:424 +#: builtin/describe.c:551 builtin/name-rev.c:426 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" @@ -11248,21 +12006,21 @@ msgstr "\"%s\": inte en normal fil eller symbolisk länk" msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:364 +#: builtin/diff.c:350 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:408 +#: builtin/diff.c:394 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:417 +#: builtin/diff.c:403 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:422 +#: builtin/diff.c:408 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." @@ -11272,27 +12030,27 @@ msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" "git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]" -#: builtin/difftool.c:261 +#: builtin/difftool.c:259 #, c-format msgid "failed: %d" msgstr "misslyckades: %d" -#: builtin/difftool.c:303 +#: builtin/difftool.c:301 #, c-format msgid "could not read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/difftool.c:305 +#: builtin/difftool.c:303 #, c-format msgid "could not read symlink file %s" msgstr "kunde inte läsa symbolisk länk-fil %s" -#: builtin/difftool.c:313 +#: builtin/difftool.c:311 #, c-format msgid "could not read object %s for symlink %s" msgstr "kunde inte läsa objektet %s för symboliska länken %s" -#: builtin/difftool.c:414 +#: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -11300,53 +12058,53 @@ msgstr "" "kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n" "katalogdiffläge (\"-d\" och \"--dir-diff\")." -#: builtin/difftool.c:634 +#: builtin/difftool.c:632 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "bägge filerna ändrade: \"%s\" och \"%s\"." -#: builtin/difftool.c:636 +#: builtin/difftool.c:634 msgid "working tree file has been left." msgstr "filen i arbetskatalogen lämnades kvar." -#: builtin/difftool.c:647 +#: builtin/difftool.c:645 #, c-format msgid "temporary files exist in '%s'." msgstr "temporära filer finns i \"%s\"." -#: builtin/difftool.c:648 +#: builtin/difftool.c:646 msgid "you may want to cleanup or recover these." msgstr "du kanske vill städa eller rädda dem." -#: builtin/difftool.c:697 +#: builtin/difftool.c:695 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "använd \"diff.guitool\" istället för \"diff.tool\"" -#: builtin/difftool.c:699 +#: builtin/difftool.c:697 msgid "perform a full-directory diff" msgstr "utför diff för hela katalogen" -#: builtin/difftool.c:701 +#: builtin/difftool.c:699 msgid "do not prompt before launching a diff tool" msgstr "fråga inte vid start av diff-verktyg" -#: builtin/difftool.c:706 +#: builtin/difftool.c:704 msgid "use symlinks in dir-diff mode" msgstr "använd symboliska länkar i katalogdiffläge" -#: builtin/difftool.c:707 +#: builtin/difftool.c:705 msgid "tool" msgstr "verktyg" -#: builtin/difftool.c:708 +#: builtin/difftool.c:706 msgid "use the specified diff tool" msgstr "använd angivet diff-verktyg" -#: builtin/difftool.c:710 +#: builtin/difftool.c:708 msgid "print a list of diff tools that may be used with `--tool`" msgstr "visa en lista över diff-verktyg som kan användas med ”--tool”" -#: builtin/difftool.c:713 +#: builtin/difftool.c:711 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -11354,15 +12112,23 @@ msgstr "" "låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde " "skilt från noll" -#: builtin/difftool.c:716 +#: builtin/difftool.c:714 msgid "specify a custom command for viewing diffs" msgstr "ange eget kommando för att visa diffar" -#: builtin/difftool.c:740 +#: builtin/difftool.c:715 +msgid "passed to `diff`" +msgstr "sändes till \"diff\"" + +#: builtin/difftool.c:730 +msgid "difftool requires worktree or --no-index" +msgstr "difftool kräver en arbetskatalog eller --no-index" + +#: builtin/difftool.c:744 msgid "no <tool> given for --tool=<tool>" msgstr "inget <verktyg> angavs för --tool=<verktyg>" -#: builtin/difftool.c:747 +#: builtin/difftool.c:751 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "inget <kommando> angavs för --extcmd=<kommando>" @@ -11406,7 +12172,7 @@ msgstr "Använd done-funktionen för att avsluta strömmen" msgid "Skip output of blob data" msgstr "Hoppa över skrivning av blob-data" -#: builtin/fast-export.c:1102 builtin/log.c:1601 +#: builtin/fast-export.c:1102 builtin/log.c:1609 msgid "refspec" msgstr "referensspecifikation" @@ -11442,15 +12208,15 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:115 builtin/pull.c:195 +#: builtin/fetch.c:115 builtin/pull.c:202 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:117 builtin/pull.c:198 +#: builtin/fetch.c:117 builtin/pull.c:205 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över" -#: builtin/fetch.c:119 builtin/pull.c:201 +#: builtin/fetch.c:119 builtin/pull.c:208 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" @@ -11462,7 +12228,7 @@ msgstr "tvinga överskrivning av lokal referens" msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:124 builtin/pull.c:205 +#: builtin/fetch.c:124 builtin/pull.c:212 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" @@ -11474,7 +12240,7 @@ msgstr "hämta inte alla taggar (--no-tags)" msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:130 builtin/pull.c:208 +#: builtin/fetch.c:130 builtin/pull.c:215 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" @@ -11483,7 +12249,7 @@ 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:133 +#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139 msgid "on-demand" msgstr "on-demand" @@ -11491,7 +12257,7 @@ msgstr "on-demand" msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:138 builtin/pull.c:216 +#: builtin/fetch.c:138 builtin/pull.c:223 msgid "keep downloaded pack" msgstr "behåll hämtade paket" @@ -11499,7 +12265,7 @@ msgstr "behåll hämtade paket" msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:219 +#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" @@ -11507,7 +12273,7 @@ msgstr "fördjupa historik för grund klon" 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:222 +#: builtin/fetch.c:151 builtin/pull.c:229 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" @@ -11523,30 +12289,18 @@ msgstr "" "standard för rekursiv hämtning av undermoduler (lägre prioritet än " "konfigurationsfiler)" -#: builtin/fetch.c:161 builtin/pull.c:225 +#: builtin/fetch.c:161 builtin/pull.c:232 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:162 builtin/pull.c:227 +#: builtin/fetch.c:162 builtin/pull.c:234 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:163 builtin/pull.c:228 +#: builtin/fetch.c:163 builtin/pull.c:235 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585 -#: builtin/send-pack.c:172 -msgid "server-specific" -msgstr "serverspecifik" - -#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585 -#: builtin/send-pack.c:173 -msgid "option to transmit" -msgstr "" -"inget att checka in\n" -"flagga att sända" - #: builtin/fetch.c:170 msgid "report that we have only objects reachable from this object" msgstr "rapportera att vi bara har objekt nåbara från detta objektet" @@ -11697,40 +12451,40 @@ msgstr "" msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1592 +#: builtin/fetch.c:1594 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1594 +#: builtin/fetch.c:1596 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1599 +#: builtin/fetch.c:1601 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1601 +#: builtin/fetch.c:1603 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1617 +#: builtin/fetch.c:1619 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1619 +#: builtin/fetch.c:1621 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1628 +#: builtin/fetch.c:1630 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1635 +#: builtin/fetch.c:1637 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" -#: builtin/fetch.c:1651 +#: builtin/fetch.c:1653 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -11801,27 +12555,27 @@ 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:424 +#: builtin/for-each-ref.c:39 builtin/tag.c:433 msgid "respect format colors" msgstr "använd formatfärger" -#: builtin/for-each-ref.c:43 +#: builtin/for-each-ref.c:42 msgid "print only refs which points at the given object" msgstr "visa endast referenser som pekar på objektet" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:44 msgid "print only refs that are merged" msgstr "visa endast referenser som slagits samman" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:45 msgid "print only refs that are not merged" msgstr "visa endast referenser som ej slagits samman" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:46 msgid "print only refs which contain the commit" msgstr "visa endast referenser som innehåller incheckningen" -#: builtin/for-each-ref.c:48 +#: builtin/for-each-ref.c:47 msgid "print only refs which don't contain the commit" msgstr "visa endast referenser som inte innehåller incheckningen" @@ -11859,215 +12613,215 @@ msgstr "" "trasig länk från %7s %s\n" " till %7s %s" -#: builtin/fsck.c:253 +#: builtin/fsck.c:295 #, c-format msgid "missing %s %s" msgstr "saknat %s %s" -#: builtin/fsck.c:279 +#: builtin/fsck.c:321 #, c-format msgid "unreachable %s %s" msgstr "onåbart %s %s" -#: builtin/fsck.c:298 +#: builtin/fsck.c:340 #, c-format msgid "dangling %s %s" msgstr "hängande %s %s" -#: builtin/fsck.c:307 +#: builtin/fsck.c:349 msgid "could not create lost-found" msgstr "kunde inte skapa lost-found" -#: builtin/fsck.c:318 +#: builtin/fsck.c:360 #, c-format msgid "could not finish '%s'" msgstr "kunde inte avsluta \"%s\"" -#: builtin/fsck.c:335 +#: builtin/fsck.c:377 #, c-format msgid "Checking %s" msgstr "Kontrollerar %s" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:353 +#: builtin/fsck.c:415 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Kontrollerar konnektivitet (%d objekt)" -#: builtin/fsck.c:372 +#: builtin/fsck.c:434 #, c-format msgid "Checking %s %s" msgstr "Kontrollerar %s %s" -#: builtin/fsck.c:376 +#: builtin/fsck.c:438 msgid "broken links" msgstr "trasiga länkar" -#: builtin/fsck.c:385 +#: builtin/fsck.c:447 #, c-format msgid "root %s" msgstr "roten %s" -#: builtin/fsck.c:393 +#: builtin/fsck.c:455 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "taggad %s %s (%s) i %s" -#: builtin/fsck.c:422 +#: builtin/fsck.c:484 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: objekt trasigt eller saknas" -#: builtin/fsck.c:447 +#: builtin/fsck.c:509 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: ogiltig reflog-post %s" -#: builtin/fsck.c:461 +#: builtin/fsck.c:523 #, c-format msgid "Checking reflog %s->%s" msgstr "Kontrollerar reflog %s->%s" -#: builtin/fsck.c:495 +#: builtin/fsck.c:557 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: ogiltig sha1-pekare %s" -#: builtin/fsck.c:502 +#: builtin/fsck.c:564 #, c-format msgid "%s: not a commit" msgstr "%s: inte en incheckning!" -#: builtin/fsck.c:557 +#: builtin/fsck.c:619 msgid "notice: No default references" msgstr "obs: Inga förvalda referenser" -#: builtin/fsck.c:572 +#: builtin/fsck.c:634 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: objektet trasigt eller saknas: %s" -#: builtin/fsck.c:585 +#: builtin/fsck.c:647 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: objektet kunde inte tolkas: %s" -#: builtin/fsck.c:605 +#: builtin/fsck.c:667 #, c-format msgid "bad sha1 file: %s" msgstr "ogiltig sha1-fil: %s" -#: builtin/fsck.c:620 +#: builtin/fsck.c:682 msgid "Checking object directory" msgstr "Kontrollerar objektkatalog" -#: builtin/fsck.c:623 +#: builtin/fsck.c:685 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:638 +#: builtin/fsck.c:700 #, c-format msgid "Checking %s link" msgstr "Kontrollerar %s-länk" -#: builtin/fsck.c:643 builtin/index-pack.c:833 +#: builtin/fsck.c:705 builtin/index-pack.c:841 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/fsck.c:650 +#: builtin/fsck.c:712 #, c-format msgid "%s points to something strange (%s)" msgstr "%s pekar på något konstigt (%s)" -#: builtin/fsck.c:656 +#: builtin/fsck.c:718 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: frånkopplat HEAD pekar på ingenting" -#: builtin/fsck.c:660 +#: builtin/fsck.c:722 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "obs: %s pekar på en ofödd gren (%s)" -#: builtin/fsck.c:672 +#: builtin/fsck.c:734 msgid "Checking cache tree" msgstr "Kontrollerar cacheträd" -#: builtin/fsck.c:677 +#: builtin/fsck.c:739 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: ogiltig sha1-pekare i cacheträd" -#: builtin/fsck.c:688 +#: builtin/fsck.c:750 msgid "non-tree in cache-tree" msgstr "icke-träd i cacheträd" -#: builtin/fsck.c:719 +#: builtin/fsck.c:781 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:725 +#: builtin/fsck.c:787 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:726 +#: builtin/fsck.c:788 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:727 +#: builtin/fsck.c:789 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:728 +#: builtin/fsck.c:790 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:729 +#: builtin/fsck.c:791 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:730 +#: builtin/fsck.c:792 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:731 +#: builtin/fsck.c:793 msgid "also consider packs and alternate objects" msgstr "ta även hänsyn till paket och alternativa objekt" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:732 +#: builtin/fsck.c:794 msgid "check only connectivity" msgstr "kontrollera endast konnektivitet" -#: builtin/fsck.c:733 +#: builtin/fsck.c:795 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:735 +#: builtin/fsck.c:797 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:736 builtin/prune.c:110 +#: builtin/fsck.c:798 builtin/prune.c:132 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:737 +#: builtin/fsck.c:799 msgid "show verbose names for reachable objects" msgstr "visa ordrika namn för nåbara objekt" -#: builtin/fsck.c:797 +#: builtin/fsck.c:859 builtin/index-pack.c:224 msgid "Checking objects" msgstr "Kontrollerar objekt" -#: builtin/fsck.c:825 +#: builtin/fsck.c:887 #, c-format msgid "%s: object missing" msgstr "%s: objekt saknas" -#: builtin/fsck.c:837 +#: builtin/fsck.c:899 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "ogiltig parameter: förväntade sha1, fick \"%s\"" @@ -12081,17 +12835,22 @@ msgstr "git gc [<flaggor>]" msgid "Failed to fstat %s: %s" msgstr "Misslyckades ta status (fstat) på %s: %s" -#: builtin/gc.c:461 builtin/init-db.c:55 +#: builtin/gc.c:126 +#, c-format +msgid "failed to parse '%s' value '%s'" +msgstr "misslyckades tolka \"%s\" värde \"%s\"" + +#: builtin/gc.c:476 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/gc.c:477 +#: builtin/gc.c:492 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -12106,52 +12865,52 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:519 +#: builtin/gc.c:540 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:521 +#: builtin/gc.c:542 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:522 +#: builtin/gc.c:543 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:525 +#: builtin/gc.c:546 msgid "force running gc even if there may be another gc running" msgstr "tvinga gc-körning även om en annan gc kanske körs" -#: builtin/gc.c:528 +#: builtin/gc.c:549 msgid "repack all other packs except the largest pack" msgstr "packa om alla paket förutom det största paketet" -#: builtin/gc.c:545 +#: builtin/gc.c:566 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "kunde inte tolka värdet %s för gc.logexpiry" -#: builtin/gc.c:556 +#: builtin/gc.c:577 #, c-format msgid "failed to parse prune expiry value %s" msgstr "kunde inte tolka värdet %s för prune expiry" -#: builtin/gc.c:576 +#: builtin/gc.c:597 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n" -#: builtin/gc.c:578 +#: builtin/gc.c:599 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:579 +#: builtin/gc.c:600 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Se \"git help gc\" för manuell hushållning.\n" -#: builtin/gc.c:619 +#: builtin/gc.c:640 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -12159,7 +12918,7 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:672 +#: builtin/gc.c:693 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -12184,8 +12943,8 @@ 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:1506 builtin/index-pack.c:1697 -#: builtin/pack-objects.c:2717 +#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705 +#: builtin/pack-objects.c:2720 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" @@ -12410,11 +13169,11 @@ msgstr "kan inte slå upp revision: %s" msgid "invalid option combination, ignoring --threads" msgstr "ogiltig kombination av flaggor, ignorerar --threads" -#: builtin/grep.c:1066 builtin/pack-objects.c:3400 +#: builtin/grep.c:1066 builtin/pack-objects.c:3403 msgid "no threads support, ignoring --threads" msgstr "trådstöd saknas, ignorerar --threads" -#: builtin/grep.c:1069 builtin/index-pack.c:1503 builtin/pack-objects.c:2714 +#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" @@ -12517,30 +13276,30 @@ msgstr "visa kommandobeskrivning" msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<kommando>]" -#: builtin/help.c:73 +#: builtin/help.c:77 #, c-format msgid "unrecognized help format '%s'" msgstr "okänt hjälpformat: ”%s”" -#: builtin/help.c:100 +#: builtin/help.c:104 msgid "Failed to start emacsclient." msgstr "Misslyckades starta emacsclient." -#: builtin/help.c:113 +#: builtin/help.c:117 msgid "Failed to parse emacsclient version." msgstr "Kunde inte tolka emacsclient-version." -#: builtin/help.c:121 +#: builtin/help.c:125 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient version \"%d\" för gammal (< 22)." -#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179 +#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 #, c-format msgid "failed to exec '%s'" msgstr "exec misslyckades för \"%s\"" -#: builtin/help.c:217 +#: builtin/help.c:221 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -12549,7 +13308,7 @@ msgstr "" "\"%s\": sökväg för man-visare som ej stöds.\n" "Använd \"man.<verktyg>.cmd\" istället." -#: builtin/help.c:229 +#: builtin/help.c:233 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -12558,35 +13317,35 @@ msgstr "" "\"%s\": kommando för man-visare som stöds.\n" "Använd \"man.<verktyg>.path\" istället." -#: builtin/help.c:346 +#: builtin/help.c:350 #, c-format msgid "'%s': unknown man viewer." msgstr "\"%s\": okänd man-visare." -#: builtin/help.c:363 +#: builtin/help.c:367 msgid "no man viewer handled the request" msgstr "ingen man-visare hanterade förfrågan" -#: builtin/help.c:371 +#: builtin/help.c:375 msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:430 builtin/help.c:441 git.c:323 +#: builtin/help.c:434 builtin/help.c:445 git.c:335 #, c-format msgid "'%s' is aliased to '%s'" msgstr "\"%s\" är ett alias för \"%s\"" -#: builtin/help.c:444 git.c:347 +#: builtin/help.c:448 git.c:364 #, c-format msgid "bad alias.%s string: %s" msgstr "felaktig alias.%s-sträng: %s" -#: builtin/help.c:473 builtin/help.c:503 +#: builtin/help.c:477 builtin/help.c:507 #, c-format msgid "usage: %s%s" msgstr "användning: %s%s" -#: builtin/help.c:487 +#: builtin/help.c:491 msgid "'git help config' for more information" msgstr "\"git help config\" för mer information" @@ -12605,275 +13364,275 @@ msgstr "emottog inte det förväntade objektet %s" msgid "object %s: expected type %s, found %s" msgstr "objektet %s: förväntad typ %s, såg %s" -#: builtin/index-pack.c:249 +#: builtin/index-pack.c:257 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "kan inte fylla %d byte" msgstr[1] "kan inte fylla %d byte" -#: builtin/index-pack.c:259 +#: builtin/index-pack.c:267 msgid "early EOF" msgstr "tidigt filslut" -#: builtin/index-pack.c:260 +#: builtin/index-pack.c:268 msgid "read error on input" msgstr "indataläsfel" -#: builtin/index-pack.c:272 +#: builtin/index-pack.c:280 msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:279 builtin/pack-objects.c:599 +#: builtin/index-pack.c:287 builtin/pack-objects.c:600 msgid "pack too large for current definition of off_t" msgstr "paket för stort för nuvarande definition av off_t" -#: builtin/index-pack.c:282 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:290 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "paket är större än tillåten maximal storlek" -#: builtin/index-pack.c:297 builtin/repack.c:250 +#: 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:303 +#: builtin/index-pack.c:311 #, c-format msgid "cannot open packfile '%s'" msgstr "kan inte öppna paketfilen \"%s\"" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:325 msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" -#: builtin/index-pack.c:319 +#: builtin/index-pack.c:327 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stöds ej" -#: builtin/index-pack.c:337 +#: builtin/index-pack.c:345 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s" -#: builtin/index-pack.c:457 +#: builtin/index-pack.c:465 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:506 +#: builtin/index-pack.c:514 msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" -#: builtin/index-pack.c:514 +#: builtin/index-pack.c:522 msgid "delta base offset is out of bound" msgstr "deltabasindex utanför gränsen" -#: builtin/index-pack.c:522 +#: builtin/index-pack.c:530 #, c-format msgid "unknown object type %d" msgstr "okänd objekttyp %d" -#: builtin/index-pack.c:553 +#: builtin/index-pack.c:561 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: builtin/index-pack.c:555 +#: builtin/index-pack.c:563 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" -#: builtin/index-pack.c:581 +#: builtin/index-pack.c:589 msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755 -#: builtin/index-pack.c:794 builtin/index-pack.c:803 +#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763 +#: builtin/index-pack.c:802 builtin/index-pack.c:811 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:729 builtin/pack-objects.c:152 -#: builtin/pack-objects.c:212 builtin/pack-objects.c:306 +#: builtin/index-pack.c:737 builtin/pack-objects.c:153 +#: builtin/pack-objects.c:213 builtin/pack-objects.c:307 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:792 +#: builtin/index-pack.c:800 #, c-format msgid "cannot read existing object info %s" msgstr "kan inte läsa information om befintligt objekt %s" -#: builtin/index-pack.c:800 +#: builtin/index-pack.c:808 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:822 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:817 builtin/index-pack.c:836 +#: builtin/index-pack.c:825 builtin/index-pack.c:844 msgid "fsck error in packed object" msgstr "fsck-fel i packat objekt" -#: builtin/index-pack.c:838 +#: builtin/index-pack.c:846 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Inte alla barnobjekt för %s kan nås" -#: builtin/index-pack.c:910 builtin/index-pack.c:941 +#: builtin/index-pack.c:918 builtin/index-pack.c:949 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1109 +#: builtin/index-pack.c:1117 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1109 +#: builtin/index-pack.c:1117 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1143 +#: builtin/index-pack.c:1151 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1148 +#: builtin/index-pack.c:1156 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1151 +#: builtin/index-pack.c:1159 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1171 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1186 +#: builtin/index-pack.c:1194 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1196 builtin/pack-objects.c:2486 +#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1237 +#: builtin/index-pack.c:1245 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1243 +#: builtin/index-pack.c:1251 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "slutfördes med %d lokalt objekt" msgstr[1] "slutfördes med %d lokala objekt" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1263 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1259 +#: builtin/index-pack.c:1267 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paketet har %d oanalyserat delta" msgstr[1] "paketet har %d oanalyserade delta" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1291 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1360 +#: builtin/index-pack.c:1368 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1374 +#: builtin/index-pack.c:1382 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1399 +#: builtin/index-pack.c:1407 #, c-format msgid "cannot write %s file '%s'" msgstr "kan inte ta skriva %s-fil \"%s\"" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1415 #, c-format msgid "cannot close written %s file '%s'" msgstr "kan inte stänga skriven %s-fil \"%s\"" -#: builtin/index-pack.c:1431 +#: builtin/index-pack.c:1439 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1445 +#: builtin/index-pack.c:1453 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1453 +#: builtin/index-pack.c:1461 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1497 builtin/pack-objects.c:2725 +#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1565 +#: builtin/index-pack.c:1573 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1567 +#: builtin/index-pack.c:1575 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\"" -#: builtin/index-pack.c:1615 +#: builtin/index-pack.c:1623 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "icke-delta: %d objekt" msgstr[1] "icke-delta: %d objekt" -#: builtin/index-pack.c:1622 +#: builtin/index-pack.c:1630 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "kedjelängd = %d: %lu objekt" msgstr[1] "kedjelängd = %d: %lu objekt" -#: builtin/index-pack.c:1659 +#: builtin/index-pack.c:1667 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1708 builtin/index-pack.c:1711 -#: builtin/index-pack.c:1727 builtin/index-pack.c:1731 +#: builtin/index-pack.c:1716 builtin/index-pack.c:1719 +#: builtin/index-pack.c:1735 builtin/index-pack.c:1739 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1747 +#: builtin/index-pack.c:1755 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1749 +#: builtin/index-pack.c:1757 msgid "--stdin requires a git repository" msgstr "--stdin kräver ett git-arkiv" -#: builtin/index-pack.c:1755 +#: builtin/index-pack.c:1763 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" -#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580 msgid "fsck error in pack objects" msgstr "fsck-fel i packat objekt" @@ -12917,42 +13676,42 @@ msgstr "mallarna hittades inte i %s" msgid "not copying templates from '%s': %s" msgstr "kopierade inte mallar från \"%s\": %s" -#: builtin/init-db.c:329 +#: builtin/init-db.c:334 #, c-format msgid "unable to handle file type %d" msgstr "kan inte hantera filtyp %d" -#: builtin/init-db.c:332 +#: builtin/init-db.c:337 #, c-format msgid "unable to move %s to %s" msgstr "kan inte flytta %s till %s" -#: builtin/init-db.c:349 builtin/init-db.c:352 +#: builtin/init-db.c:354 builtin/init-db.c:357 #, c-format msgid "%s already exists" msgstr "%s finns redan" -#: builtin/init-db.c:405 +#: builtin/init-db.c:413 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Ominitierade befintligt delat Git-arkiv i %s%s\n" -#: builtin/init-db.c:406 +#: builtin/init-db.c:414 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Ominitierade befintligt Git-arkiv i %s%s\n" -#: builtin/init-db.c:410 +#: builtin/init-db.c:418 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Initierade tomt delat Git-arkiv i %s%s\n" -#: builtin/init-db.c:411 +#: builtin/init-db.c:419 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Initierade tomt Git-arkiv i %s%s\n" -#: builtin/init-db.c:460 +#: builtin/init-db.c:468 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -12960,25 +13719,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" "shared[=<behörigheter>]] [<katalog>]" -#: builtin/init-db.c:483 +#: builtin/init-db.c:491 msgid "permissions" msgstr "behörigheter" -#: builtin/init-db.c:484 +#: builtin/init-db.c:492 msgid "specify that the git repository is to be shared amongst several users" msgstr "ange att git-arkivet skall delas bland flera användare" -#: builtin/init-db.c:518 builtin/init-db.c:523 +#: builtin/init-db.c:526 builtin/init-db.c:531 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:527 +#: builtin/init-db.c:535 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:548 +#: builtin/init-db.c:556 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -12987,7 +13746,7 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:576 +#: builtin/init-db.c:584 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" @@ -13064,392 +13823,387 @@ msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" msgid "git show [<options>] <object>..." msgstr "git show [<flaggor>] <objekt>..." -#: builtin/log.c:100 +#: builtin/log.c:104 #, c-format msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:163 -msgid "suppress diff output" -msgstr "undertryck diff-utdata" - -#: builtin/log.c:164 +#: builtin/log.c:168 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:165 +#: builtin/log.c:169 msgid "Use mail map file" msgstr "Använd e-postmappningsfil" -#: builtin/log.c:167 +#: builtin/log.c:171 msgid "only decorate refs that match <pattern>" msgstr "dekorera endast referenser som motsvarar <mönster>" -#: builtin/log.c:169 +#: builtin/log.c:173 msgid "do not decorate refs that match <pattern>" msgstr "dekorera inte referenser som motsvarar <mönster>" -#: builtin/log.c:170 +#: builtin/log.c:174 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:173 +#: builtin/log.c:177 msgid "Process line range n,m in file, counting from 1" msgstr "Behandla radintervallet n,m i filen, med början på 1" -#: builtin/log.c:271 +#: builtin/log.c:275 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:525 +#: builtin/log.c:529 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:540 builtin/log.c:634 +#: builtin/log.c:544 builtin/log.c:638 #, c-format -msgid "Could not read object %s" -msgstr "Kunde inte läsa objektet %s" +msgid "could not read object %s" +msgstr "kunde inte läsa objektet %s" -#: builtin/log.c:659 +#: builtin/log.c:663 #, c-format -msgid "Unknown type: %d" -msgstr "Okänd typ: %d" +msgid "unknown type: %d" +msgstr "okänd typ: %d" -#: builtin/log.c:780 +#: builtin/log.c:784 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:881 +#: builtin/log.c:885 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:897 +#: builtin/log.c:901 #, c-format -msgid "Cannot open patch file %s" -msgstr "Kan inte öppna patchfilen %s" +msgid "cannot open patch file %s" +msgstr "kan inte öppna patchfilen %s" -#: builtin/log.c:914 -msgid "Need exactly one range." -msgstr "Behöver precis ett intervall." +#: builtin/log.c:918 +msgid "need exactly one range" +msgstr "behöver precis ett intervall" -#: builtin/log.c:924 -msgid "Not a range." -msgstr "Inte ett intervall." +#: builtin/log.c:928 +msgid "not a range" +msgstr "inte ett intervall" -#: builtin/log.c:1047 -msgid "Cover letter needs email format" -msgstr "Omslagsbrevet behöver e-postformat" +#: builtin/log.c:1051 +msgid "cover letter needs email format" +msgstr "omslagsbrevet behöver e-postformat" -#: builtin/log.c:1132 +#: builtin/log.c:1057 +msgid "failed to create cover-letter file" +msgstr "misslyckades skapa fil för omslagsbrev" + +#: builtin/log.c:1136 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1159 +#: builtin/log.c:1163 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1217 -msgid "Two output directories?" -msgstr "Två utdatakataloger?" +#: builtin/log.c:1221 +msgid "two output directories?" +msgstr "två utdatakataloger?" -#: builtin/log.c:1324 builtin/log.c:2068 builtin/log.c:2070 builtin/log.c:2082 +#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090 #, c-format -msgid "Unknown commit %s" -msgstr "Okänd incheckning %s" +msgid "unknown commit %s" +msgstr "okänd incheckning %s" -#: builtin/log.c:1334 builtin/notes.c:897 builtin/tag.c:526 +#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/replace.c:210 #, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "Kunde inte slå upp \"%s\" som en giltig referens." +msgid "failed to resolve '%s' as a valid ref" +msgstr "misslyckades slå upp \"%s\" som en giltig referens" -#: builtin/log.c:1339 -msgid "Could not find exact merge base." -msgstr "Kunde inte hitta exakt sammanslagningsbas." +#: builtin/log.c:1347 +msgid "could not find exact merge base" +msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1343 +#: builtin/log.c:1351 msgid "" -"Failed to get upstream, if you want to record base commit automatically,\n" +"failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" -"Or you could specify base commit by --base=<base-commit-id> manually." +"Or you could specify base commit by --base=<base-commit-id> manually" msgstr "" -"Kunde inte hämta uppström, om du vill lagra basincheckningen automatiskt,\n" +"kunde inte hämta uppström, om du vill lagra basincheckningen automatiskt,\n" "använd git branch --set-upstream-to för att spåra en fjärrgren.\n" -"Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> " -"manuellt." +"Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> manuellt" -#: builtin/log.c:1363 -msgid "Failed to find exact merge base" -msgstr "Kunde inte hitta exakt sammanslagningsbas" +#: builtin/log.c:1371 +msgid "failed to find exact merge base" +msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1374 +#: builtin/log.c:1382 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1378 +#: builtin/log.c:1386 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1431 +#: builtin/log.c:1439 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1483 +#: builtin/log.c:1491 msgid "failed to infer range-diff ranges" msgstr "misslyckades räkna ut intervall range-diff" -#: builtin/log.c:1528 +#: builtin/log.c:1536 msgid "use [PATCH n/m] even with a single patch" msgstr "använd [PATCH n/m] även för en ensam patch" -#: builtin/log.c:1531 +#: builtin/log.c:1539 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1535 +#: builtin/log.c:1543 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1537 +#: builtin/log.c:1545 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1539 +#: builtin/log.c:1547 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1540 +#: builtin/log.c:1548 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1541 +#: builtin/log.c:1549 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1543 +#: builtin/log.c:1551 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1545 +#: builtin/log.c:1553 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1547 +#: builtin/log.c:1555 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Använd [RFC PATCH] istället för [PATCH]" -#: builtin/log.c:1550 +#: builtin/log.c:1558 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1553 +#: builtin/log.c:1561 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1556 +#: builtin/log.c:1564 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1559 +#: builtin/log.c:1567 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1561 +#: builtin/log.c:1569 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1563 +#: builtin/log.c:1571 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1565 +#: builtin/log.c:1573 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1567 +#: builtin/log.c:1575 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1568 +#: builtin/log.c:1576 msgid "header" msgstr "huvud" -#: builtin/log.c:1569 +#: builtin/log.c:1577 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1570 builtin/log.c:1572 +#: builtin/log.c:1578 builtin/log.c:1580 msgid "email" msgstr "epost" -#: builtin/log.c:1570 +#: builtin/log.c:1578 msgid "add To: header" msgstr "lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1572 +#: builtin/log.c:1580 msgid "add Cc: header" msgstr "lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1574 +#: builtin/log.c:1582 msgid "ident" msgstr "ident" -#: builtin/log.c:1575 +#: builtin/log.c:1583 msgid "set From address to <ident> (or committer ident if absent)" msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)" -#: builtin/log.c:1577 +#: builtin/log.c:1585 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1578 +#: builtin/log.c:1586 msgid "make first mail a reply to <message-id>" msgstr "gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1579 builtin/log.c:1582 +#: builtin/log.c:1587 builtin/log.c:1590 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1580 +#: builtin/log.c:1588 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1583 +#: builtin/log.c:1591 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1587 +#: builtin/log.c:1595 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1589 +#: builtin/log.c:1597 msgid "signature" msgstr "signatur" -#: builtin/log.c:1590 +#: builtin/log.c:1598 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1591 +#: builtin/log.c:1599 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1592 +#: builtin/log.c:1600 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1594 +#: builtin/log.c:1602 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1595 +#: builtin/log.c:1603 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1597 +#: builtin/log.c:1605 msgid "show progress while generating patches" msgstr "visa förloppsindikator medan patchar skapas" -#: builtin/log.c:1598 +#: builtin/log.c:1606 msgid "rev" msgstr "rev" -#: builtin/log.c:1599 +#: builtin/log.c:1607 msgid "show changes against <rev> in cover letter or single patch" msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch" -#: builtin/log.c:1602 +#: builtin/log.c:1610 msgid "show changes against <refspec> in cover letter or single patch" msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch" -#: builtin/log.c:1604 +#: builtin/log.c:1612 msgid "percentage by which creation is weighted" msgstr "procent som skapelse vägs med" -#: builtin/log.c:1679 +#: builtin/log.c:1687 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1694 +#: builtin/log.c:1702 msgid "-n and -k are mutually exclusive" msgstr "-n och -k kan inte användas samtidigt" -#: builtin/log.c:1696 +#: builtin/log.c:1704 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt" -#: builtin/log.c:1704 +#: builtin/log.c:1712 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1706 +#: builtin/log.c:1714 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1708 +#: builtin/log.c:1716 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1740 +#: builtin/log.c:1748 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1742 -#, c-format -msgid "Could not create directory '%s'" -msgstr "Kunde inte skapa katalogen \"%s\"" - -#: builtin/log.c:1829 +#: builtin/log.c:1837 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff kräver --cover-letter eller ensam patch" -#: builtin/log.c:1833 +#: builtin/log.c:1841 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1834 +#: builtin/log.c:1842 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff mot v%d:" -#: builtin/log.c:1840 +#: builtin/log.c:1848 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor kräver --range-diff" -#: builtin/log.c:1844 +#: builtin/log.c:1852 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff kräver --cover-letter eller ensam patch" -#: builtin/log.c:1852 +#: builtin/log.c:1860 msgid "Range-diff:" msgstr "Intervall-diff:" -#: builtin/log.c:1853 +#: builtin/log.c:1861 #, c-format msgid "Range-diff against v%d:" msgstr "Intervall-diff mot v%d:" -#: builtin/log.c:1864 +#: builtin/log.c:1872 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:1900 +#: builtin/log.c:1908 msgid "Generating patches" msgstr "Skapar patchar" -#: builtin/log.c:1944 -msgid "Failed to create output files" -msgstr "Misslyckades skapa utdatafiler" +#: builtin/log.c:1952 +msgid "failed to create output files" +msgstr "misslyckades skapa utdatafiler" -#: builtin/log.c:2003 +#: builtin/log.c:2011 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:2057 +#: builtin/log.c:2065 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -13573,7 +14327,7 @@ msgstr "" msgid "do not print remote URL" msgstr "visa inte fjärr-URL" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1111 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458 msgid "exec" msgstr "exec" @@ -13597,11 +14351,11 @@ msgstr "visa inte avskalade taggar" msgid "take url.<base>.insteadOf into account" msgstr "ta hänsyn till url.<bas>.insteadOf" -#: builtin/ls-remote.c:73 +#: builtin/ls-remote.c:72 msgid "exit with exit code 2 if no matching refs are found" msgstr "avsluta med felkod 2 om motsvarande referenser inte hittas" -#: builtin/ls-remote.c:76 +#: builtin/ls-remote.c:75 msgid "show underlying ref in addition to the object pointed by it" msgstr "visa underliggande referens och objektet det pekar på" @@ -13646,266 +14400,274 @@ msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" msgid "empty mbox: '%s'" msgstr "tom mbox: ”%s”" -#: builtin/merge.c:53 +#: builtin/merge.c:54 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<flaggor>] [<incheckning>...]" -#: builtin/merge.c:54 +#: builtin/merge.c:55 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:55 +#: builtin/merge.c:56 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:112 +#: builtin/merge.c:116 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:132 +#: builtin/merge.c:139 #, c-format msgid "option `%s' requires a value" msgstr "flaggan \"%s\" behöver ett värde" -#: builtin/merge.c:178 +#: builtin/merge.c:185 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:179 +#: builtin/merge.c:186 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:184 +#: builtin/merge.c:191 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:235 builtin/pull.c:144 +#: builtin/merge.c:242 builtin/pull.c:150 msgid "do not show a diffstat at the end of the merge" msgstr "visa inte en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:238 builtin/pull.c:147 +#: builtin/merge.c:245 builtin/pull.c:153 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:239 builtin/pull.c:150 +#: builtin/merge.c:246 builtin/pull.c:156 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:241 builtin/pull.c:153 +#: builtin/merge.c:248 builtin/pull.c:159 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet" -#: builtin/merge.c:244 builtin/pull.c:159 +#: builtin/merge.c:251 builtin/pull.c:165 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:246 builtin/pull.c:162 +#: builtin/merge.c:253 builtin/pull.c:168 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:248 builtin/pull.c:165 +#: builtin/merge.c:255 builtin/pull.c:171 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:249 +#: builtin/merge.c:257 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:251 builtin/pull.c:171 +#: builtin/merge.c:259 builtin/pull.c:178 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:255 builtin/pull.c:174 +#: builtin/merge.c:263 builtin/pull.c:181 msgid "verify that the named commit has a valid GPG signature" msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur" -#: builtin/merge.c:256 builtin/notes.c:787 builtin/pull.c:178 -#: builtin/rebase.c:1124 builtin/rebase--interactive.c:188 builtin/revert.c:111 +#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185 +#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:257 builtin/pull.c:179 +#: builtin/merge.c:265 builtin/pull.c:186 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:258 builtin/pull.c:182 +#: builtin/merge.c:266 builtin/pull.c:189 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:259 builtin/pull.c:183 +#: builtin/merge.c:267 builtin/pull.c:190 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:261 +#: builtin/merge.c:269 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:268 +#: builtin/merge.c:276 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:270 +#: builtin/merge.c:278 msgid "continue the current in-progress merge" msgstr "fortsätt den pågående sammanslagningen" -#: builtin/merge.c:272 builtin/pull.c:190 +#: builtin/merge.c:280 builtin/pull.c:197 msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" -#: builtin/merge.c:278 +#: builtin/merge.c:286 msgid "verify commit-msg hook" msgstr "bekräfta commit-msg-krok" -#: builtin/merge.c:303 +#: builtin/merge.c:311 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:308 +#: builtin/merge.c:316 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:313 +#: builtin/merge.c:321 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:335 builtin/merge.c:352 +#: builtin/merge.c:343 builtin/merge.c:360 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:382 +#: builtin/merge.c:390 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:393 +#: builtin/merge.c:401 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:443 +#: builtin/merge.c:451 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:494 +#: builtin/merge.c:502 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:581 +#: builtin/merge.c:589 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:702 +#: builtin/merge.c:712 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:716 +#: builtin/merge.c:726 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:731 +#: builtin/merge.c:741 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:783 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:792 +#: builtin/merge.c:802 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra " "den.\n" -#: builtin/merge.c:798 -#, c-format +#: builtin/merge.c:808 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" -"Lines starting with '%c' will be ignored, and an empty message aborts\n" -"the commit.\n" msgstr "" "Ange ett incheckningsmeddelande för att förklara varför sammanslagningen\n" "är nödvändig, speciellt om den slår in en uppdaterad uppström i en\n" "temagren.\n" "\n" + +#: builtin/merge.c:813 +msgid "An empty message aborts the commit.\n" +msgstr "Ett tomt meddelande avbryter incheckningen.\n" + +#: builtin/merge.c:816 +#, c-format +msgid "" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:834 +#: builtin/merge.c:857 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:853 +#: builtin/merge.c:876 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:906 +#: builtin/merge.c:936 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n" -#: builtin/merge.c:945 +#: builtin/merge.c:975 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:947 +#: builtin/merge.c:977 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:949 +#: builtin/merge.c:979 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:954 +#: builtin/merge.c:984 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Ingen fjärrspårande gren för %s från %s" -#: builtin/merge.c:1011 +#: builtin/merge.c:1041 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1114 +#: builtin/merge.c:1144 #, c-format msgid "not something we can merge in %s: %s" msgstr "inte något vi kan slå ihop med %s: %s" -#: builtin/merge.c:1148 +#: builtin/merge.c:1178 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1251 +#: builtin/merge.c:1281 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1255 +#: builtin/merge.c:1285 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1267 +#: builtin/merge.c:1297 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1271 +#: builtin/merge.c:1301 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1287 +#: builtin/merge.c:1317 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -13913,7 +14675,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1294 +#: builtin/merge.c:1324 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -13921,92 +14683,92 @@ 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:1297 +#: builtin/merge.c:1327 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)." -#: builtin/merge.c:1306 +#: builtin/merge.c:1341 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1314 +#: builtin/merge.c:1349 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1331 +#: builtin/merge.c:1366 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1333 +#: builtin/merge.c:1368 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud" -#: builtin/merge.c:1338 +#: builtin/merge.c:1373 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1340 +#: builtin/merge.c:1375 msgid "Can merge only exactly one commit into empty head" msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud" -#: builtin/merge.c:1422 +#: builtin/merge.c:1454 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1431 +#: builtin/merge.c:1463 msgid "Already up to date." msgstr "Redan à jour." -#: builtin/merge.c:1441 +#: builtin/merge.c:1473 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1483 +#: builtin/merge.c:1515 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1490 +#: builtin/merge.c:1522 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1515 +#: builtin/merge.c:1547 msgid "Already up to date. Yeeah!" msgstr "Redan à jour. Toppen!" -#: builtin/merge.c:1521 +#: builtin/merge.c:1553 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1544 builtin/merge.c:1623 +#: builtin/merge.c:1576 builtin/merge.c:1655 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1548 +#: builtin/merge.c:1580 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1614 +#: builtin/merge.c:1646 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1616 +#: builtin/merge.c:1648 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1625 +#: builtin/merge.c:1657 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Använder %s för att förbereda lösning för hand.\n" -#: builtin/merge.c:1637 +#: builtin/merge.c:1669 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -14139,19 +14901,19 @@ msgstr "tillåt saknade objekt" msgid "allow creation of more than one tree" msgstr "tillåt skapa mer än ett träd" -#: builtin/multi-pack-index.c:8 +#: builtin/multi-pack-index.c:9 msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)" msgstr "git multi-pack-index [--object-dir=<kat>] (write|verify)" -#: builtin/multi-pack-index.c:21 +#: builtin/multi-pack-index.c:22 msgid "object directory containing set of packfile and pack-index pairs" msgstr "objektkatalog med uppsättning av par med paketfiler och pack-index" -#: builtin/multi-pack-index.c:39 +#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "för många argument" -#: builtin/multi-pack-index.c:48 +#: builtin/multi-pack-index.c:51 #, c-format msgid "unrecognized verb: %s" msgstr "okänt verb: %s" @@ -14244,7 +15006,7 @@ msgstr "%s, källa=%s, mål=%s" msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:513 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" @@ -14261,35 +15023,35 @@ msgstr "git name-rev [<flaggor>] --all" msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<flaggor>] --stdin" -#: builtin/name-rev.c:413 +#: builtin/name-rev.c:415 msgid "print only names (no SHA-1)" msgstr "skriv endast namn (ingen SHA-1)" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:416 msgid "only use tags to name the commits" msgstr "använd endast taggar för att namnge incheckningar" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:418 msgid "only use refs matching <pattern>" msgstr "använd endast referenser som motsvarar <mönster>" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:420 msgid "ignore refs matching <pattern>" msgstr "ignorera referenser som motsvarar <mönster>" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:422 msgid "list all commits reachable from all refs" msgstr "lista alla incheckningar som kan nås alla referenser" -#: builtin/name-rev.c:421 +#: builtin/name-rev.c:423 msgid "read from stdin" msgstr "läs från standard in" -#: builtin/name-rev.c:422 +#: builtin/name-rev.c:424 msgid "allow to print `undefined` names (default)" msgstr "tillåt att skriva \"odefinierade\" namn (standard)" -#: builtin/name-rev.c:428 +#: builtin/name-rev.c:430 msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" @@ -14436,7 +15198,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:513 +#: builtin/notes.c:242 builtin/tag.c:522 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" @@ -14670,6 +15432,11 @@ 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 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Kunde inte slå upp \"%s\" som en giltig referens." + #: builtin/notes.c:900 #, c-format msgid "Object %s has no note\n" @@ -14683,7 +15450,7 @@ msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel" msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: builtin/notes.c:954 builtin/prune.c:108 builtin/worktree.c:165 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" @@ -14699,142 +15466,142 @@ msgstr "anteckningar-ref" msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1034 +#: builtin/notes.c:1034 builtin/stash.c:1611 #, c-format msgid "unknown subcommand: %s" msgstr "okänt underkommando: %s" -#: builtin/pack-objects.c:51 +#: builtin/pack-objects.c:52 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:53 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:423 +#: builtin/pack-objects.c:424 #, c-format msgid "bad packed object CRC for %s" msgstr "felaktig CRC för packat objekt %s" -#: builtin/pack-objects.c:434 +#: builtin/pack-objects.c:435 #, c-format msgid "corrupt packed object for %s" msgstr "trasigt packat objekt för %s" -#: builtin/pack-objects.c:565 +#: builtin/pack-objects.c:566 #, c-format msgid "recursive delta detected for object %s" msgstr "rekursivt delta upptäcktes för objektet %s" -#: builtin/pack-objects.c:776 +#: builtin/pack-objects.c:777 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "ordnade %u objekt, förväntade %<PRIu32>" -#: builtin/pack-objects.c:789 +#: builtin/pack-objects.c:790 #, c-format msgid "packfile is invalid: %s" msgstr "packfil är ogiltig: %s" -#: builtin/pack-objects.c:793 +#: builtin/pack-objects.c:794 #, c-format msgid "unable to open packfile for reuse: %s" msgstr "kan inte öppna packfil för återanvändning: %s" -#: builtin/pack-objects.c:797 +#: builtin/pack-objects.c:798 msgid "unable to seek in reused packfile" msgstr "kan inte söka i återanvänd packfil" -#: builtin/pack-objects.c:808 +#: builtin/pack-objects.c:809 msgid "unable to read from reused packfile" msgstr "kan inte läsa från återanvänd packfil" -#: builtin/pack-objects.c:836 +#: builtin/pack-objects.c:837 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit" -#: builtin/pack-objects.c:849 +#: builtin/pack-objects.c:850 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:911 builtin/update-index.c:89 +#: builtin/pack-objects.c:912 builtin/update-index.c:89 #, c-format msgid "failed to stat %s" msgstr "misslyckades ta status på %s" -#: builtin/pack-objects.c:964 +#: builtin/pack-objects.c:965 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades" -#: builtin/pack-objects.c:1158 +#: builtin/pack-objects.c:1161 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas" -#: builtin/pack-objects.c:1586 +#: builtin/pack-objects.c:1589 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "deltabasoffset utanför gränsen i pack för %s" -#: builtin/pack-objects.c:1595 +#: builtin/pack-objects.c:1598 #, c-format msgid "delta base offset out of bound for %s" msgstr "deltabasoffset utanför gränsvärden för %s" -#: builtin/pack-objects.c:1864 +#: builtin/pack-objects.c:1867 msgid "Counting objects" msgstr "Räknar objekt" -#: builtin/pack-objects.c:1994 +#: builtin/pack-objects.c:1997 #, c-format msgid "unable to get size of %s" msgstr "kan inte hämta storlek på %s" -#: builtin/pack-objects.c:2009 +#: builtin/pack-objects.c:2012 #, c-format msgid "unable to parse object header of %s" msgstr "kunde inte tolka objekthuvud för %s" -#: builtin/pack-objects.c:2079 builtin/pack-objects.c:2095 -#: builtin/pack-objects.c:2105 +#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098 +#: builtin/pack-objects.c:2108 #, c-format msgid "object %s cannot be read" msgstr "objektet %s kunde inte läsas" -#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2109 +#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "objektet %s har inkonsistent objektlängd (%<PRIuMAX> mot %<PRIuMAX>)" -#: builtin/pack-objects.c:2119 +#: builtin/pack-objects.c:2122 msgid "suboptimal pack - out of memory" msgstr "icke-optimalt pack - minnet slut" -#: builtin/pack-objects.c:2445 +#: builtin/pack-objects.c:2448 #, c-format msgid "Delta compression using up to %d threads" msgstr "Deltakomprimering använder upp till %d trådar" -#: builtin/pack-objects.c:2577 +#: builtin/pack-objects.c:2580 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "kan inte packa objekt nåbara från taggen %s" -#: builtin/pack-objects.c:2664 +#: builtin/pack-objects.c:2667 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2670 +#: builtin/pack-objects.c:2673 msgid "inconsistency with delta count" msgstr "deltaräknaren är inkonsekvent" -#: builtin/pack-objects.c:2751 +#: builtin/pack-objects.c:2754 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -14843,7 +15610,7 @@ msgstr "" "förväntade kant-objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:2757 +#: builtin/pack-objects.c:2760 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -14852,239 +15619,239 @@ msgstr "" "förväntade objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:2855 +#: builtin/pack-objects.c:2858 msgid "invalid value for --missing" msgstr "ogiltigt värde för --missing" -#: builtin/pack-objects.c:2914 builtin/pack-objects.c:3022 +#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025 msgid "cannot open pack index" msgstr "kan inte öppna paketfilen" -#: builtin/pack-objects.c:2945 +#: builtin/pack-objects.c:2948 #, c-format msgid "loose object at %s could not be examined" msgstr "lösa objekt på %s kunde inte underökas" -#: builtin/pack-objects.c:3030 +#: builtin/pack-objects.c:3033 msgid "unable to force loose object" msgstr "kan inte tvinga lösa objekt" -#: builtin/pack-objects.c:3122 +#: builtin/pack-objects.c:3125 #, c-format msgid "not a rev '%s'" msgstr "inte en referens \"%s\"" -#: builtin/pack-objects.c:3125 +#: builtin/pack-objects.c:3128 #, c-format msgid "bad revision '%s'" msgstr "felaktig revision \"%s\"" -#: builtin/pack-objects.c:3150 +#: builtin/pack-objects.c:3153 msgid "unable to add recent objects" msgstr "kan inte lägga till nya objekt" -#: builtin/pack-objects.c:3203 +#: builtin/pack-objects.c:3206 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:3207 +#: builtin/pack-objects.c:3210 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:3237 +#: builtin/pack-objects.c:3240 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:3239 +#: builtin/pack-objects.c:3242 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:3241 +#: builtin/pack-objects.c:3244 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:3244 +#: builtin/pack-objects.c:3247 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" -#: builtin/pack-objects.c:3245 +#: builtin/pack-objects.c:3248 msgid "<version>[,<offset>]" msgstr "<version>[,<offset>]" -#: builtin/pack-objects.c:3246 +#: builtin/pack-objects.c:3249 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:3249 +#: builtin/pack-objects.c:3252 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:3251 +#: builtin/pack-objects.c:3254 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:3253 +#: builtin/pack-objects.c:3256 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:3255 +#: builtin/pack-objects.c:3258 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3260 msgid "limit pack window by memory in addition to object limit" msgstr "begränsa paketfönster efter minne förutom objektgräns" -#: builtin/pack-objects.c:3259 +#: builtin/pack-objects.c:3262 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "maximal längd på deltakedja tillåten i slutligt paket" -#: builtin/pack-objects.c:3261 +#: builtin/pack-objects.c:3264 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:3263 +#: builtin/pack-objects.c:3266 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:3265 +#: builtin/pack-objects.c:3268 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:3267 +#: builtin/pack-objects.c:3270 msgid "use threads when searching for best delta matches" msgstr "använd trådar vid sökning efter bästa deltaträffar" -#: builtin/pack-objects.c:3269 +#: builtin/pack-objects.c:3272 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:3271 +#: builtin/pack-objects.c:3274 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:3273 +#: builtin/pack-objects.c:3276 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:3276 +#: builtin/pack-objects.c:3279 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:3279 +#: builtin/pack-objects.c:3282 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3285 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:3285 +#: builtin/pack-objects.c:3288 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3290 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:3289 +#: builtin/pack-objects.c:3292 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:3291 +#: builtin/pack-objects.c:3294 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3296 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3299 msgid "use the sparse reachability algorithm" msgstr "använd gles-nåbarhetsalgoritmen" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3301 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:3300 +#: builtin/pack-objects.c:3303 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3305 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3307 msgid "ignore this pack" msgstr "ignorera detta paket" -#: builtin/pack-objects.c:3306 +#: builtin/pack-objects.c:3309 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:3308 +#: builtin/pack-objects.c:3311 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:3310 +#: builtin/pack-objects.c:3313 msgid "use a bitmap index if available to speed up counting objects" msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare" -#: builtin/pack-objects.c:3312 +#: builtin/pack-objects.c:3315 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3318 msgid "handling for missing objects" msgstr "hantering av saknade objekt" -#: builtin/pack-objects.c:3318 +#: builtin/pack-objects.c:3321 msgid "do not pack objects in promisor packfiles" msgstr "packa inte objekt i kontraktspackfiler" -#: builtin/pack-objects.c:3320 +#: builtin/pack-objects.c:3323 msgid "respect islands during delta compression" msgstr "respektera öar under deltakomprimering" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3348 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "deltakedjedjupet %d är för djupt, påtvingar %d" -#: builtin/pack-objects.c:3350 +#: builtin/pack-objects.c:3353 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit är för högt, påtvingar %d" -#: builtin/pack-objects.c:3404 +#: builtin/pack-objects.c:3407 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size kan inte användas för att bygga ett paket som skall överföras" -#: builtin/pack-objects.c:3406 +#: builtin/pack-objects.c:3409 msgid "minimum pack size limit is 1 MiB" msgstr "minsta packstorlek är 1 MiB" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3414 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin kan inte användas för att bygga ett indexerbart paket" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3417 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3423 msgid "cannot use --filter without --stdout" msgstr "kan inte använda --filter utan --stdout" -#: builtin/pack-objects.c:3479 +#: builtin/pack-objects.c:3484 msgid "Enumerating objects" msgstr "Räknar upp objekt" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3514 #, c-format msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "" @@ -15114,69 +15881,69 @@ msgstr "Tar bort duplicerade objekt" msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]" -#: builtin/prune.c:109 +#: builtin/prune.c:131 msgid "report pruned objects" msgstr "rapportera borttagna objekt" -#: builtin/prune.c:112 +#: builtin/prune.c:134 msgid "expire objects older than <time>" msgstr "låt tid gå ut för objekt äldre än <tid>" -#: builtin/prune.c:114 +#: builtin/prune.c:136 msgid "limit traversal to objects outside promisor packfiles" msgstr "begränsa vandring av objekt utanför kontraktspackfiler." -#: builtin/prune.c:128 +#: builtin/prune.c:150 msgid "cannot prune in a precious-objects repo" msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv" -#: builtin/pull.c:61 builtin/pull.c:63 +#: builtin/pull.c:66 builtin/pull.c:68 #, c-format msgid "Invalid value for %s: %s" msgstr "Felaktigt värde för %s: %s" -#: builtin/pull.c:83 +#: builtin/pull.c:88 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/pull.c:134 +#: builtin/pull.c:140 msgid "control for recursive fetching of submodules" msgstr "styrning för rekursiv hämtning av undermoduler" -#: builtin/pull.c:138 +#: builtin/pull.c:144 msgid "Options related to merging" msgstr "Alternativ gällande sammanslagning" -#: builtin/pull.c:141 +#: builtin/pull.c:147 msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" -#: builtin/pull.c:168 builtin/rebase--interactive.c:149 builtin/revert.c:123 +#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125 msgid "allow fast-forward" msgstr "tillåt snabbspolning" -#: builtin/pull.c:177 +#: builtin/pull.c:184 msgid "automatically stash/stash pop before and after rebase" msgstr "utför automatiskt stash/stash pop före och efter ombasering" -#: builtin/pull.c:193 +#: builtin/pull.c:200 msgid "Options related to fetching" msgstr "Alternativ gällande hämtningar" -#: builtin/pull.c:203 +#: builtin/pull.c:210 msgid "force overwrite of local branch" msgstr "tvinga överskrivning av lokal gren" -#: builtin/pull.c:211 +#: builtin/pull.c:218 msgid "number of submodules pulled in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/pull.c:306 +#: builtin/pull.c:313 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Felaktigt värde för pull.ff: %s" -#: builtin/pull.c:422 +#: builtin/pull.c:430 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -15184,14 +15951,14 @@ msgstr "" "Det finns ingen kandidat för ombasering bland referenserna du precis har " "hämtat." -#: builtin/pull.c:424 +#: builtin/pull.c:432 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Det finns ingen kandidat för sammanslagning bland referenserna du precis har " "hämtat." -#: builtin/pull.c:425 +#: builtin/pull.c:433 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -15199,7 +15966,7 @@ msgstr "" "Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n" "motsvarade något i fjärränden." -#: builtin/pull.c:428 +#: builtin/pull.c:436 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -15210,42 +15977,42 @@ msgstr "" "gren. Eftersom det inte är den fjärr som är konfigurerad som\n" "standard för aktuell gren måste du ange en gren på kommandoraden." -#: builtin/pull.c:433 builtin/rebase.c:956 git-parse-remote.sh:73 +#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Du är inte på någon gren för närvarande." -#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:79 +#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Ange vilken gren du vill ombasera mot." -#: builtin/pull.c:437 builtin/pull.c:452 git-parse-remote.sh:82 +#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Ange vilken gren du vill slå samman med." -#: builtin/pull.c:438 builtin/pull.c:453 +#: builtin/pull.c:446 builtin/pull.c:461 msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." -#: builtin/pull.c:440 builtin/pull.c:446 builtin/pull.c:455 -#: builtin/rebase.c:962 git-parse-remote.sh:64 +#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463 +#: builtin/rebase.c:1327 git-parse-remote.sh:64 msgid "<remote>" msgstr "<fjärr>" -#: builtin/pull.c:440 builtin/pull.c:455 builtin/pull.c:460 -#: git-legacy-rebase.sh:564 git-parse-remote.sh:65 +#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468 +#: git-parse-remote.sh:65 msgid "<branch>" msgstr "<gren>" -#: builtin/pull.c:448 builtin/rebase.c:954 git-parse-remote.sh:75 +#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Det finns ingen spårningsinformation för aktuell gren." -#: builtin/pull.c:457 git-parse-remote.sh:95 +#: builtin/pull.c:465 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:" -#: builtin/pull.c:462 +#: builtin/pull.c:470 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -15254,32 +16021,32 @@ msgstr "" "Dina inställningar anger sammanslagning med referensen \"%s\"\n" "från fjärren, men någon sådan referens togs inte emot." -#: builtin/pull.c:566 +#: builtin/pull.c:574 #, c-format msgid "unable to access commit %s" msgstr "kunde inte komma åt incheckningen %s" -#: builtin/pull.c:844 +#: builtin/pull.c:854 msgid "ignoring --verify-signatures for rebase" msgstr "ignorera --verify-signatures för ombasering" -#: builtin/pull.c:892 +#: builtin/pull.c:909 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash är endast giltig med --rebase." -#: builtin/pull.c:900 +#: builtin/pull.c:917 msgid "Updating an unborn branch with changes added to the index." msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet." -#: builtin/pull.c:904 +#: builtin/pull.c:921 msgid "pull with rebase" msgstr "pull med ombasering" -#: builtin/pull.c:905 +#: builtin/pull.c:922 msgid "please commit or stash them." msgstr "checka in eller använd \"stash\" på dem." -#: builtin/pull.c:930 +#: builtin/pull.c:947 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -15290,7 +16057,7 @@ msgstr "" "snabbspolar din arbetskatalog från\n" "incheckningen %s." -#: builtin/pull.c:936 +#: builtin/pull.c:953 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -15307,15 +16074,15 @@ msgstr "" "$ git reset --hard\n" "för att återgå." -#: builtin/pull.c:951 +#: builtin/pull.c:968 msgid "Cannot merge multiple branches into empty head." msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: builtin/pull.c:955 +#: builtin/pull.c:972 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpå flera grenar." -#: builtin/pull.c:962 +#: builtin/pull.c:979 msgid "cannot rebase with locally recorded submodule modifications" msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" @@ -15627,16 +16394,16 @@ msgstr "Procent som skapelse vägs med" msgid "use simple diff colors" msgstr "använd enkla diff-färger" -#: builtin/range-diff.c:61 builtin/range-diff.c:65 +#: builtin/range-diff.c:46 builtin/range-diff.c:50 #, c-format msgid "no .. in range: '%s'" msgstr ".. saknas i intervall: \"%s\"" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:60 msgid "single arg format must be symmetric range" msgstr "ensamt argument måste vara symmetriskt intervall" -#: builtin/range-diff.c:90 +#: builtin/range-diff.c:75 msgid "need two commit ranges" msgstr "behöver två incheckningsintervall" @@ -15714,7 +16481,11 @@ msgstr "hoppa över att applicera filter för gles utcheckning" msgid "debug unpack-trees" msgstr "felsök unpack-trees" -#: builtin/rebase.c:30 +#: builtin/read-tree.c:157 +msgid "suppress feedback messages" +msgstr "undertryck återkopplingsmeddelanden" + +#: builtin/rebase.c:32 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " "[<branch>]" @@ -15722,51 +16493,226 @@ msgstr "" "git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas>] [<uppström>] " "[<gren>]" -#: builtin/rebase.c:32 +#: builtin/rebase.c:34 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" "git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas>] --root [<gren>]" -#: builtin/rebase.c:34 +#: builtin/rebase.c:36 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:121 builtin/rebase.c:1437 +#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#, c-format +msgid "unusable todo list: '%s'" +msgstr "oanvändbar todo-lista: %s" + +#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 +#, c-format +msgid "could not write '%s'." +msgstr "kunde inte skriva \"%s\"." + +#: builtin/rebase.c:252 +msgid "no HEAD?" +msgstr "inget HEAD?" + +#: builtin/rebase.c:279 +#, c-format +msgid "could not create temporary %s" +msgstr "kunde inte skapa temporär %s" + +#: builtin/rebase.c:285 +msgid "could not mark as interactive" +msgstr "kunde inte markera som interaktiv" + +#: builtin/rebase.c:343 +msgid "could not generate todo list" +msgstr "Kunde inte skapa attgöra-lista" + +#: builtin/rebase.c:382 +msgid "a base commit must be provided with --upstream or --onto" +msgstr "en basincheckning måste anges med --upstream eller --onto" + +#: builtin/rebase.c:437 +msgid "git rebase--interactive [<options>]" +msgstr "git rebase--interactive [<flaggor>]" + +#: builtin/rebase.c:449 +msgid "keep empty commits" +msgstr "behåll tomma incheckningar" + +#: builtin/rebase.c:451 builtin/revert.c:127 +msgid "allow commits with empty messages" +msgstr "tillåt incheckningar med tomt meddelande" + +#: builtin/rebase.c:452 +msgid "rebase merge commits" +msgstr "ombasera sammanslagningar" + +#: builtin/rebase.c:454 +msgid "keep original branch points of cousins" +msgstr "behåll ursprungliga förgreningspunkter för kusiner" + +#: builtin/rebase.c:456 +msgid "move commits that begin with squash!/fixup!" +msgstr "flytta incheckningar som inleds med squash!/fixup!" + +#: builtin/rebase.c:457 +msgid "sign commits" +msgstr "signera incheckningar" + +#: builtin/rebase.c:459 builtin/rebase.c:1397 +msgid "display a diffstat of what changed upstream" +msgstr "vis diffstat för vad som ändrats uppströms" + +#: builtin/rebase.c:461 +msgid "continue rebase" +msgstr "fortsätt ombasering" + +#: builtin/rebase.c:463 +msgid "skip commit" +msgstr "hoppa över incheckning" + +#: builtin/rebase.c:464 +msgid "edit the todo list" +msgstr "redigera attgöra-listan" + +#: builtin/rebase.c:466 +msgid "show the current patch" +msgstr "visa nuvarande patch" + +#: builtin/rebase.c:469 +msgid "shorten commit ids in the todo list" +msgstr "förkorta inchecknings-id i todo-listan" + +#: builtin/rebase.c:471 +msgid "expand commit ids in the todo list" +msgstr "utöka inchecknings-id i todo-listan" + +#: builtin/rebase.c:473 +msgid "check the todo list" +msgstr "kontrollera todo-listan" + +#: builtin/rebase.c:475 +msgid "rearrange fixup/squash lines" +msgstr "ordna om fixup-/squash-rader" + +#: builtin/rebase.c:477 +msgid "insert exec commands in todo list" +msgstr "lägg in exec-kommandon i todo-listan" + +#: builtin/rebase.c:478 +msgid "onto" +msgstr "ovanpå" + +#: builtin/rebase.c:481 +msgid "restrict-revision" +msgstr "restrict-revision" + +#: builtin/rebase.c:481 +msgid "restrict revision" +msgstr "begränsa revision" + +#: builtin/rebase.c:483 +msgid "squash-onto" +msgstr "squash-onto" + +#: builtin/rebase.c:484 +msgid "squash onto" +msgstr "tryck ihop ovanpå" + +#: builtin/rebase.c:486 +msgid "the upstream commit" +msgstr "uppströmsincheckningen" + +#: builtin/rebase.c:488 +msgid "head-name" +msgstr "head-name" + +#: builtin/rebase.c:488 +msgid "head name" +msgstr "namn på huvud" + +#: builtin/rebase.c:493 +msgid "rebase strategy" +msgstr "sammanslagningsstrategi" + +#: builtin/rebase.c:494 +msgid "strategy-opts" +msgstr "strategy-opts" + +#: builtin/rebase.c:495 +msgid "strategy options" +msgstr "strategiflaggor" + +#: builtin/rebase.c:496 +msgid "switch-to" +msgstr "switch-to" + +#: builtin/rebase.c:497 +msgid "the branch or commit to checkout" +msgstr "gren eller inchecking att checka ut" + +#: builtin/rebase.c:498 +msgid "onto-name" +msgstr "onto-name" + +#: builtin/rebase.c:498 +msgid "onto name" +msgstr "på-namn" + +#: builtin/rebase.c:499 +msgid "cmd" +msgstr "kmd" + +#: builtin/rebase.c:499 +msgid "the command to run" +msgstr "kommando att köra" + +#: builtin/rebase.c:502 builtin/rebase.c:1480 +msgid "automatically re-schedule any `exec` that fails" +msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt" + +#: builtin/rebase.c:518 +msgid "--[no-]rebase-cousins has no effect without --rebase-merges" +msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges" + +#: builtin/rebase.c:534 builtin/rebase.c:1787 #, c-format msgid "%s requires an interactive rebase" msgstr "%s kräver en interaktiv ombasering" -#: builtin/rebase.c:173 +#: builtin/rebase.c:586 #, c-format msgid "could not get 'onto': '%s'" msgstr "kunde inte hämta \"onto\": \"%s\"" -#: builtin/rebase.c:188 +#: builtin/rebase.c:601 #, c-format msgid "invalid orig-head: '%s'" msgstr "ogiltigt orig-head: \"%s\"" -#: builtin/rebase.c:213 +#: builtin/rebase.c:626 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\"" -#: builtin/rebase.c:289 +#: builtin/rebase.c:702 #, c-format msgid "Could not read '%s'" msgstr "Kunde inte läsa \"%s\"" -#: builtin/rebase.c:307 +#: builtin/rebase.c:720 #, c-format msgid "Cannot store %s" msgstr "Kan inte spara %s" -#: builtin/rebase.c:402 +#: builtin/rebase.c:817 msgid "could not determine HEAD revision" msgstr "kunde inte bestämma HEAD-revision" -#: builtin/rebase.c:522 +#: builtin/rebase.c:940 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -15780,7 +16726,7 @@ msgstr "" "För att avbryta och återgå till där du var före ombaseringen, kör \"git " "rebase --abort\"." -#: builtin/rebase.c:603 +#: builtin/rebase.c:1021 #, c-format msgid "" "\n" @@ -15799,7 +16745,7 @@ msgstr "" "\n" "Därför kan inte git ombasera dessa." -#: builtin/rebase.c:948 +#: builtin/rebase.c:1313 #, c-format msgid "" "%s\n" @@ -15816,7 +16762,7 @@ msgstr "" " git rebase '<gren>'\n" "\n" -#: builtin/rebase.c:964 +#: builtin/rebase.c:1329 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -15829,160 +16775,158 @@ msgstr "" " git branch --set-upstream-to=%s/<gren> %s\n" "\n" -#: builtin/rebase.c:994 +#: builtin/rebase.c:1359 msgid "exec commands cannot contain newlines" msgstr "exec-kommandon kan inte innehålla nyradstecken" -#: builtin/rebase.c:998 +#: builtin/rebase.c:1363 msgid "empty exec command" msgstr "tomt exec-kommando" -#: builtin/rebase.c:1040 +#: builtin/rebase.c:1390 msgid "rebase onto given branch instead of upstream" msgstr "ombasera mot given grenen istället för uppström" -#: builtin/rebase.c:1042 +#: builtin/rebase.c:1392 msgid "allow pre-rebase hook to run" msgstr "tillåt pre-rebase-krok att köra" -#: builtin/rebase.c:1044 +#: builtin/rebase.c:1394 msgid "be quiet. implies --no-stat" msgstr "var tyst. implicerar --no-stat" -#: builtin/rebase.c:1047 -msgid "display a diffstat of what changed upstream" -msgstr "vis diffstat för vad som ändrats uppströms" - -#: builtin/rebase.c:1050 +#: builtin/rebase.c:1400 msgid "do not show diffstat of what changed upstream" msgstr "visa inte en diffstat för vad som ändrats uppströms" -#: builtin/rebase.c:1053 +#: builtin/rebase.c:1403 msgid "add a Signed-off-by: line to each commit" msgstr "lägg \"Signed-off-by:\"-rad till varje incheckning" -#: builtin/rebase.c:1055 builtin/rebase.c:1059 builtin/rebase.c:1061 +#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411 msgid "passed to 'git am'" msgstr "sänds till \"git am\"" -#: builtin/rebase.c:1063 builtin/rebase.c:1065 +#: builtin/rebase.c:1413 builtin/rebase.c:1415 msgid "passed to 'git apply'" msgstr "sänds till \"git apply\"" -#: builtin/rebase.c:1067 builtin/rebase.c:1070 +#: builtin/rebase.c:1417 builtin/rebase.c:1420 msgid "cherry-pick all commits, even if unchanged" msgstr "utför cherry-pick på alla incheckningar, även om oändrad" -#: builtin/rebase.c:1072 +#: builtin/rebase.c:1422 msgid "continue" msgstr "fortsätt" -#: builtin/rebase.c:1075 +#: builtin/rebase.c:1425 msgid "skip current patch and continue" msgstr "hoppa över nuvarande patch och fortsätt" -#: builtin/rebase.c:1077 +#: builtin/rebase.c:1427 msgid "abort and check out the original branch" msgstr "avbryt och checka ut ursprungsgrenen" -#: builtin/rebase.c:1080 +#: builtin/rebase.c:1430 msgid "abort but keep HEAD where it is" msgstr "avbryt men behåll HEAD där det är" -#: builtin/rebase.c:1081 +#: builtin/rebase.c:1431 msgid "edit the todo list during an interactive rebase" msgstr "redigera attgöra-listan under interaktiv ombasering." -#: builtin/rebase.c:1084 +#: builtin/rebase.c:1434 msgid "show the patch file being applied or merged" msgstr "visa patchen som tillämpas eller slås samman" -#: builtin/rebase.c:1087 +#: builtin/rebase.c:1437 msgid "use merging strategies to rebase" msgstr "använd sammanslagningsstrategier för sammanslagning" -#: builtin/rebase.c:1091 +#: builtin/rebase.c:1441 msgid "let the user edit the list of commits to rebase" msgstr "låt användaren redigera listan över incheckningar att ombasera" -#: builtin/rebase.c:1095 -msgid "try to recreate merges instead of ignoring them" -msgstr "försök återskapa sammanslagningar istället för att ignorera dem" - -#: builtin/rebase.c:1099 -msgid "allow rerere to update index with resolved conflict" -msgstr "tillåt rerere att uppdatera index med lösa konflikter" +#: builtin/rebase.c:1445 +msgid "(DEPRECATED) try to recreate merges instead of ignoring them" +msgstr "" +"(AVRÅDS) försök återskapa sammanslagningar istället för att ignorera dem" -#: builtin/rebase.c:1102 +#: builtin/rebase.c:1449 msgid "preserve empty commits during rebase" msgstr "behåll tomma incheckningar under ombasering" -#: builtin/rebase.c:1104 +#: builtin/rebase.c:1451 msgid "move commits that begin with squash!/fixup! under -i" msgstr "flytta incheckningar som börjar med squash!/fixup! under -i" -#: builtin/rebase.c:1110 +#: builtin/rebase.c:1457 msgid "automatically stash/stash pop before and after" msgstr "utför automatiskt stash/stash pop före och efter" -#: builtin/rebase.c:1112 +#: builtin/rebase.c:1459 msgid "add exec lines after each commit of the editable list" msgstr "lägg till exec-rader efter varje incheckning i den redigerbara listan" -#: builtin/rebase.c:1116 +#: builtin/rebase.c:1463 msgid "allow rebasing commits with empty messages" msgstr "tillåt ombasering av incheckningar med tomt meddelande" -#: builtin/rebase.c:1119 +#: builtin/rebase.c:1466 msgid "try to rebase merges instead of skipping them" msgstr "försök ombasera sammanslagningar istället för att ignorera dem" -#: builtin/rebase.c:1122 +#: builtin/rebase.c:1469 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "använd \"merge-base --fork-point\" för att förfina uppström" -#: builtin/rebase.c:1124 +#: builtin/rebase.c:1471 msgid "use the given merge strategy" msgstr "använd angiven sammanslagningsstrategi" -#: builtin/rebase.c:1126 builtin/revert.c:112 +#: builtin/rebase.c:1473 builtin/revert.c:114 msgid "option" msgstr "alternativ" -#: builtin/rebase.c:1127 +#: builtin/rebase.c:1474 msgid "pass the argument through to the merge strategy" msgstr "sänd flaggan till sammanslagningsstrategin" -#: builtin/rebase.c:1130 +#: builtin/rebase.c:1477 msgid "rebase all reachable commits up to the root(s)" msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna" -#: builtin/rebase.c:1133 builtin/rebase--interactive.c:198 -msgid "automatically re-schedule any `exec` that fails" -msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt" - -#: builtin/rebase.c:1149 -#, c-format -msgid "could not exec %s" -msgstr "kunde inte köra %s" +#: builtin/rebase.c:1498 +msgid "" +"the rebase.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"stödet för rebase.useBuiltin har tagits bort!\n" +"Se posten för det i \"git help config\" för detaljer." -#: builtin/rebase.c:1167 git-legacy-rebase.sh:220 +#: builtin/rebase.c:1504 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera." -#: builtin/rebase.c:1208 git-legacy-rebase.sh:406 +#: builtin/rebase.c:1545 +msgid "" +"git rebase --preserve-merges is deprecated. Use --rebase-merges instead." +msgstr "" +"git rebase --preserve-merges avråds från. Använd --rebase-merges istället." + +#: builtin/rebase.c:1549 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: builtin/rebase.c:1212 git-legacy-rebase.sh:417 +#: builtin/rebase.c:1553 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering." -#: builtin/rebase.c:1226 git-legacy-rebase.sh:424 +#: builtin/rebase.c:1576 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: builtin/rebase.c:1238 git-legacy-rebase.sh:427 +#: builtin/rebase.c:1588 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -15990,21 +16934,21 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: builtin/rebase.c:1257 +#: builtin/rebase.c:1607 msgid "could not discard worktree changes" msgstr "kunde inte kasta ändringar i arbetskatalogen" -#: builtin/rebase.c:1276 +#: builtin/rebase.c:1626 #, c-format msgid "could not move back to %s" msgstr "kunde inte flytta tillbaka till %s" -#: builtin/rebase.c:1287 builtin/rm.c:369 +#: builtin/rebase.c:1637 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "kunde inte ta bort \"%s\"" -#: builtin/rebase.c:1313 +#: builtin/rebase.c:1663 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -16025,336 +16969,172 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där.\n" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1684 msgid "switch `C' expects a numerical value" msgstr "flaggan \"C\" förväntar ett numeriskt värde" -#: builtin/rebase.c:1375 +#: builtin/rebase.c:1725 #, c-format msgid "Unknown mode: %s" msgstr "Okänt läge: %s" -#: builtin/rebase.c:1397 +#: builtin/rebase.c:1747 msgid "--strategy requires --merge or --interactive" msgstr "--strategy kräver --merge eller --interactive" -#: builtin/rebase.c:1446 +#: builtin/rebase.c:1796 msgid "cannot combine am options with either interactive or merge options" msgstr "" "kan inte kombinera am-flaggor med varken interaktiv- eller " "sammanslagningsflaggor" -#: builtin/rebase.c:1465 +#: builtin/rebase.c:1815 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\"" -#: builtin/rebase.c:1469 git-legacy-rebase.sh:544 +#: builtin/rebase.c:1819 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec" "\"" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1825 msgid "cannot combine '--rebase-merges' with '--strategy-option'" msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy-option\"" -#: builtin/rebase.c:1478 +#: builtin/rebase.c:1828 msgid "cannot combine '--rebase-merges' with '--strategy'" msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy\"" -#: builtin/rebase.c:1502 +#: builtin/rebase.c:1852 #, c-format msgid "invalid upstream '%s'" msgstr "felaktig uppström ”%s”" -#: builtin/rebase.c:1508 +#: builtin/rebase.c:1858 msgid "Could not create new root commit" msgstr "kunde inte skapa ny rotincheckning" -#: builtin/rebase.c:1526 +#: builtin/rebase.c:1876 #, c-format msgid "'%s': need exactly one merge base" msgstr "\"%s\": behöver precis en sammanslagningsbas" -#: builtin/rebase.c:1533 +#: builtin/rebase.c:1883 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "Pekar inte på en giltig incheckning: \"%s\"" -#: builtin/rebase.c:1558 +#: builtin/rebase.c:1908 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\"" -#: builtin/rebase.c:1566 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:1916 builtin/submodule--helper.c:38 +#: builtin/submodule--helper.c:1933 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1927 msgid "Could not resolve HEAD to a revision" msgstr "Kunde inte bestämma HEAD:s incheckning" -#: builtin/rebase.c:1619 git-legacy-rebase.sh:673 +#: builtin/rebase.c:1968 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: builtin/rebase.c:1622 +#: builtin/rebase.c:1971 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Oväntat svar från stash: \"%s\"" -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1977 #, c-format msgid "Could not create directory for '%s'" msgstr "Kunde inte skapa katalog för \"%s\"" -#: builtin/rebase.c:1631 +#: builtin/rebase.c:1980 #, c-format msgid "Created autostash: %s\n" msgstr "Skapade autostash: %s\n" -#: builtin/rebase.c:1634 +#: builtin/rebase.c:1983 msgid "could not reset --hard" msgstr "kunde inte utföra \"reset --hard\"" -#: builtin/rebase.c:1635 builtin/reset.c:114 +#: builtin/rebase.c:1984 builtin/reset.c:114 #, c-format msgid "HEAD is now at %s" msgstr "HEAD är nu på %s" -#: builtin/rebase.c:1651 git-legacy-rebase.sh:682 +#: builtin/rebase.c:2000 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: builtin/rebase.c:1678 +#: builtin/rebase.c:2027 #, c-format msgid "could not parse '%s'" msgstr "kunde inte tolka \"%s\"" -#: builtin/rebase.c:1691 +#: builtin/rebase.c:2040 #, c-format msgid "could not switch to %s" msgstr "kunde inte växla till %s" -#: builtin/rebase.c:1702 git-legacy-rebase.sh:705 -#, sh-format +#: builtin/rebase.c:2051 msgid "HEAD is up to date." msgstr "HEAD är à jour." -#: builtin/rebase.c:1704 +#: builtin/rebase.c:2053 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Aktuell gren %s är à jour.\n" -#: builtin/rebase.c:1712 git-legacy-rebase.sh:715 -#, sh-format +#: builtin/rebase.c:2061 msgid "HEAD is up to date, rebase forced." msgstr "HEAD är à jour, ombasering framtvingad." -#: builtin/rebase.c:1714 +#: builtin/rebase.c:2063 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Aktuell gren %s är à jour, ombasering framtvingad.\n" -#: builtin/rebase.c:1722 git-legacy-rebase.sh:215 +#: builtin/rebase.c:2071 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: builtin/rebase.c:1729 +#: builtin/rebase.c:2078 #, c-format msgid "Changes to %s:\n" msgstr "Ändringar till %s:\n" -#: builtin/rebase.c:1732 +#: builtin/rebase.c:2081 #, c-format msgid "Changes from %s to %s:\n" msgstr "Ändringar från %s till %s:\n" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:2106 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det...\n" -#: builtin/rebase.c:1765 +#: builtin/rebase.c:2115 msgid "Could not detach HEAD" msgstr "Kunde inte koppla från HEAD" -#: builtin/rebase.c:1774 +#: builtin/rebase.c:2124 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Snabbspolade %s till %s.\n" -#: builtin/rebase--interactive.c:25 -msgid "no HEAD?" -msgstr "inget HEAD?" - -#: builtin/rebase--interactive.c:52 -#, c-format -msgid "could not create temporary %s" -msgstr "kunde inte skapa temporär %s" - -#: builtin/rebase--interactive.c:58 -msgid "could not mark as interactive" -msgstr "kunde inte markera som interaktiv" - -#: builtin/rebase--interactive.c:102 -#, c-format -msgid "could not open %s" -msgstr "kunde inte öppna %s" - -#: builtin/rebase--interactive.c:115 -msgid "could not generate todo list" -msgstr "Kunde inte skapa attgöra-lista" - -#: builtin/rebase--interactive.c:131 -msgid "git rebase--interactive [<options>]" -msgstr "git rebase--interactive [<flaggor>]" - -#: builtin/rebase--interactive.c:150 -msgid "keep empty commits" -msgstr "behåll tomma incheckningar" - -#: builtin/rebase--interactive.c:152 builtin/revert.c:125 -msgid "allow commits with empty messages" -msgstr "tillåt incheckningar med tomt meddelande" - -#: builtin/rebase--interactive.c:153 -msgid "rebase merge commits" -msgstr "ombasera sammanslagningar" - -#: builtin/rebase--interactive.c:155 -msgid "keep original branch points of cousins" -msgstr "behåll ursprungliga förgreningspunkter för kusiner" - -#: builtin/rebase--interactive.c:157 -msgid "move commits that begin with squash!/fixup!" -msgstr "flytta incheckningar som inleds med squash!/fixup!" - -#: builtin/rebase--interactive.c:158 -msgid "sign commits" -msgstr "signera incheckningar" - -#: builtin/rebase--interactive.c:160 -msgid "continue rebase" -msgstr "fortsätt ombasering" - -#: builtin/rebase--interactive.c:162 -msgid "skip commit" -msgstr "hoppa över incheckning" - -#: builtin/rebase--interactive.c:163 -msgid "edit the todo list" -msgstr "redigera attgöra-listan" - -#: builtin/rebase--interactive.c:165 -msgid "show the current patch" -msgstr "visa nuvarande patch" - -#: builtin/rebase--interactive.c:168 -msgid "shorten commit ids in the todo list" -msgstr "förkorta inchecknings-id i todo-listan" - -#: builtin/rebase--interactive.c:170 -msgid "expand commit ids in the todo list" -msgstr "utöka inchecknings-id i todo-listan" - -#: builtin/rebase--interactive.c:172 -msgid "check the todo list" -msgstr "kontrollera todo-listan" - -#: builtin/rebase--interactive.c:174 -msgid "rearrange fixup/squash lines" -msgstr "ordna om fixup-/squash-rader" - -#: builtin/rebase--interactive.c:176 -msgid "insert exec commands in todo list" -msgstr "lägg in exec-kommandon i todo-listan" - -#: builtin/rebase--interactive.c:177 -msgid "onto" -msgstr "ovanpå" - -#: builtin/rebase--interactive.c:179 -msgid "restrict-revision" -msgstr "restrict-revision" - -#: builtin/rebase--interactive.c:179 -msgid "restrict revision" -msgstr "begränsa revision" - -#: builtin/rebase--interactive.c:180 -msgid "squash-onto" -msgstr "squash-onto" - -#: builtin/rebase--interactive.c:181 -msgid "squash onto" -msgstr "tryck ihop ovanpå" - -#: builtin/rebase--interactive.c:183 -msgid "the upstream commit" -msgstr "uppströmsincheckningen" - -#: builtin/rebase--interactive.c:184 -msgid "head-name" -msgstr "head-name" - -#: builtin/rebase--interactive.c:184 -msgid "head name" -msgstr "namn på huvud" - -#: builtin/rebase--interactive.c:189 -msgid "rebase strategy" -msgstr "sammanslagningsstrategi" - -#: builtin/rebase--interactive.c:190 -msgid "strategy-opts" -msgstr "strategy-opts" - -#: builtin/rebase--interactive.c:191 -msgid "strategy options" -msgstr "strategiflaggor" - -#: builtin/rebase--interactive.c:192 -msgid "switch-to" -msgstr "switch-to" - -#: builtin/rebase--interactive.c:193 -msgid "the branch or commit to checkout" -msgstr "gren eller inchecking att checka ut" - -#: builtin/rebase--interactive.c:194 -msgid "onto-name" -msgstr "onto-name" - -#: builtin/rebase--interactive.c:194 -msgid "onto name" -msgstr "på-namn" - -#: builtin/rebase--interactive.c:195 -msgid "cmd" -msgstr "kmd" - -#: builtin/rebase--interactive.c:195 -msgid "the command to run" -msgstr "kommando att köra" - -#: builtin/rebase--interactive.c:224 -msgid "--[no-]rebase-cousins has no effect without --rebase-merges" -msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges" - -#: builtin/rebase--interactive.c:230 -msgid "a base commit must be provided with --upstream or --onto" -msgstr "en basincheckning måste anges med --upstream eller --onto" - #: builtin/receive-pack.c:33 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-katalog>" -#: builtin/receive-pack.c:830 +#: builtin/receive-pack.c:833 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -16384,7 +17164,7 @@ msgstr "" "För att undvika detta meddelande och fortfarande behålla det\n" "normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"." -#: builtin/receive-pack.c:850 +#: builtin/receive-pack.c:853 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -16405,11 +17185,11 @@ msgstr "" "\n" "För att undvika detta meddelande kan du sätta det till \"refuse\"." -#: builtin/receive-pack.c:1929 +#: builtin/receive-pack.c:1940 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:1943 +#: builtin/receive-pack.c:1954 msgid "You must specify a directory." msgstr "Du måste ange en katalog." @@ -16996,7 +17776,7 @@ msgstr "" msgid "could not start pack-objects to repack promisor objects" msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt" -#: builtin/repack.c:239 builtin/repack.c:411 +#: builtin/repack.c:239 builtin/repack.c:414 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Förväntar kompletta hex-objekt-ID-rader endast från pack-objects." @@ -17093,11 +17873,11 @@ msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable och -A kan inte användas samtidigt" -#: builtin/repack.c:420 +#: builtin/repack.c:423 msgid "Nothing new to pack." msgstr "Inget nytt att packa." -#: builtin/repack.c:481 +#: builtin/repack.c:484 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -17116,7 +17896,7 @@ msgstr "" "VARNING: namnet misslyckades också.\n" "VARNING: Byt namn på dem i %s manuellt:\n" -#: builtin/repack.c:529 +#: builtin/repack.c:532 #, c-format msgid "failed to remove '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -17145,12 +17925,7 @@ msgstr "git replace -d <objekt>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<format>] [-l [<mönster>]]" -#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206 -#, c-format -msgid "failed to resolve '%s' as a valid ref" -msgstr "misslyckades slå upp \"%s\" som en giltig referens" - -#: builtin/replace.c:86 +#: builtin/replace.c:90 #, c-format msgid "" "invalid replace format '%s'\n" @@ -17159,27 +17934,27 @@ msgstr "" "ogiltigt ersättningsformat \"%s\"\n" "giltiga format är \"short\", \"medium\" och \"long\"" -#: builtin/replace.c:121 +#: builtin/replace.c:125 #, c-format msgid "replace ref '%s' not found" msgstr "ersättningsreferensen \"%s\" hittades inte" -#: builtin/replace.c:137 +#: builtin/replace.c:141 #, c-format msgid "Deleted replace ref '%s'" msgstr "Tog bort ersättningsreferensen \"%s\"" -#: builtin/replace.c:149 +#: builtin/replace.c:153 #, c-format msgid "'%s' is not a valid ref name" msgstr "\"%s\" är inte ett giltigt referensnamn" -#: builtin/replace.c:154 +#: builtin/replace.c:158 #, c-format msgid "replace ref '%s' already exists" msgstr "ersättningsreferensen \"%s\" finns redan" -#: builtin/replace.c:174 +#: builtin/replace.c:178 #, c-format msgid "" "Objects must be of the same type.\n" @@ -17190,76 +17965,81 @@ msgstr "" "\"%s\" pekar på ett ersatt objekt med typen \"%s\"\n" "medan \"%s\" pekar på ett ersättningsobjekt av typen \"%s\"." -#: builtin/replace.c:225 +#: builtin/replace.c:229 #, c-format msgid "unable to open %s for writing" msgstr "kan inte öppna %s för skrivning" -#: builtin/replace.c:238 +#: builtin/replace.c:242 msgid "cat-file reported failure" msgstr "cat-file rapporterade misslyckande" -#: builtin/replace.c:254 +#: builtin/replace.c:258 #, c-format msgid "unable to open %s for reading" msgstr "kan inte öppna %s för läsning" -#: builtin/replace.c:268 +#: builtin/replace.c:272 msgid "unable to spawn mktree" msgstr "kan inte starta mktree" -#: builtin/replace.c:272 +#: builtin/replace.c:276 msgid "unable to read from mktree" msgstr "kan inte läsa från mktree" -#: builtin/replace.c:281 +#: builtin/replace.c:285 msgid "mktree reported failure" msgstr "mktree rapporterade misslyckande" -#: builtin/replace.c:285 +#: builtin/replace.c:289 msgid "mktree did not return an object name" msgstr "mktree returnerade inte ett objektnamn" -#: builtin/replace.c:294 +#: builtin/replace.c:298 #, c-format msgid "unable to fstat %s" msgstr "kan inte utföra \"fstat\" på %s" -#: builtin/replace.c:299 +#: builtin/replace.c:303 msgid "unable to write object to database" msgstr "kan inte skriva objektet till databasen" -#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415 -#: builtin/replace.c:445 +#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 +#: builtin/replace.c:452 #, c-format msgid "not a valid object name: '%s'" msgstr "objektnamnet är inte giltigt: \"%s\"" -#: builtin/replace.c:322 +#: builtin/replace.c:326 #, c-format msgid "unable to get object type for %s" msgstr "kan inte läsa objekttyp för %s" -#: builtin/replace.c:338 +#: builtin/replace.c:342 msgid "editing object file failed" msgstr "misslyckades redigera objektfilen" -#: builtin/replace.c:347 +#: builtin/replace.c:351 #, c-format msgid "new object is the same as the old one: '%s'" msgstr "nytt objekt är samma som det gamla: \"%s\"" -#: builtin/replace.c:407 +#: builtin/replace.c:383 +#, c-format +msgid "could not parse %s as a commit" +msgstr "kunde inte tolka %s som incheckning" + +#: builtin/replace.c:414 #, c-format msgid "bad mergetag in commit '%s'" msgstr "felaktig sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:409 +#: builtin/replace.c:416 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "felformad sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:421 +#: builtin/replace.c:428 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -17268,31 +18048,31 @@ msgstr "" "den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s" "\" som har förkastats; använd --edit istället för --graft" -#: builtin/replace.c:460 +#: builtin/replace.c:467 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur" -#: builtin/replace.c:461 +#: builtin/replace.c:468 msgid "the signature will be removed in the replacement commit!" msgstr "signaturen kommer att tas bort i ersättningsincheckningen!" -#: builtin/replace.c:471 +#: builtin/replace.c:478 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "kunde inte skriva ersättningsincheckning för: \"%s\"" -#: builtin/replace.c:479 +#: builtin/replace.c:486 #, c-format msgid "graft for '%s' unnecessary" msgstr "ympning för \"%s\" behövs inte" -#: builtin/replace.c:482 +#: builtin/replace.c:490 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "ny incheckning är samma som den gamla: \"%s\"" -#: builtin/replace.c:515 +#: builtin/replace.c:525 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -17301,71 +18081,71 @@ msgstr "" "kunde inte konvertera följande ympning(ar):\n" "%s" -#: builtin/replace.c:536 +#: builtin/replace.c:546 msgid "list replace refs" msgstr "visa ersättningsreferenser" -#: builtin/replace.c:537 +#: builtin/replace.c:547 msgid "delete replace refs" msgstr "ta bort ersättningsreferenser" -#: builtin/replace.c:538 +#: builtin/replace.c:548 msgid "edit existing object" msgstr "redigera befintligt objekt" -#: builtin/replace.c:539 +#: builtin/replace.c:549 msgid "change a commit's parents" msgstr "ändra en inchecknings föräldrar" -#: builtin/replace.c:540 +#: builtin/replace.c:550 msgid "convert existing graft file" msgstr "konvertera befintlig ympningsfil" -#: builtin/replace.c:541 +#: builtin/replace.c:551 msgid "replace the ref if it exists" msgstr "ersätt referensen om den finns" -#: builtin/replace.c:543 +#: builtin/replace.c:553 msgid "do not pretty-print contents for --edit" msgstr "använd inte snygg visning av innehåll för --edit" -#: builtin/replace.c:544 +#: builtin/replace.c:554 msgid "use this format" msgstr "använd detta format" -#: builtin/replace.c:557 +#: builtin/replace.c:567 msgid "--format cannot be used when not listing" msgstr "--format kan inte användas utanför listning" -#: builtin/replace.c:565 +#: builtin/replace.c:575 msgid "-f only makes sense when writing a replacement" msgstr "-f kan endast användas vid skrivning av ersättning" -#: builtin/replace.c:569 +#: builtin/replace.c:579 msgid "--raw only makes sense with --edit" msgstr "--raw kan bara användas med --edit" -#: builtin/replace.c:575 +#: builtin/replace.c:585 msgid "-d needs at least one argument" msgstr "-d behöver minst ett argument" -#: builtin/replace.c:581 +#: builtin/replace.c:591 msgid "bad number of arguments" msgstr "fel antal argument" -#: builtin/replace.c:587 +#: builtin/replace.c:597 msgid "-e needs exactly one argument" msgstr "-e tar exakt ett argument" -#: builtin/replace.c:593 +#: builtin/replace.c:603 msgid "-g needs at least one argument" msgstr "-g tar minst ett argument" -#: builtin/replace.c:599 +#: builtin/replace.c:609 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file tar inga argument" -#: builtin/replace.c:605 +#: builtin/replace.c:615 msgid "only one pattern can be given with -l" msgstr "endast ett mönster kan anges med -l" @@ -17438,7 +18218,8 @@ msgstr "Kunde inte hitta trädet för %s." msgid "Cannot do a %s reset in the middle of a merge." msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." -#: builtin/reset.c:293 +#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 +#: builtin/stash.c:613 msgid "be quiet, only report errors" msgstr "var tyst, rapportera endast fel" @@ -17476,30 +18257,30 @@ msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd." msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch är inkompatibel med --{hard,mixed,soft}" -#: builtin/reset.c:352 +#: builtin/reset.c:353 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"." -#: builtin/reset.c:354 +#: builtin/reset.c:355 #, c-format msgid "Cannot do %s reset with paths." msgstr "Kan inte göra %s återställning med sökvägar." -#: builtin/reset.c:364 +#: builtin/reset.c:370 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s återställning tillåts inte i ett naket arkiv" -#: builtin/reset.c:368 +#: builtin/reset.c:374 msgid "-N can only be used with --mixed" msgstr "-N kan endast användas med --mixed" -#: builtin/reset.c:388 +#: builtin/reset.c:395 msgid "Unstaged changes after reset:" msgstr "Oköade ändringar efter återställning:" -#: builtin/reset.c:391 +#: builtin/reset.c:398 #, c-format msgid "" "\n" @@ -17513,33 +18294,33 @@ msgstr "" "konfigurationsvariabeln\n" "reset.quiet till true för att göra detta till förval.\n" -#: builtin/reset.c:401 +#: builtin/reset.c:408 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." -#: builtin/reset.c:405 +#: builtin/reset.c:412 msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-list.c:406 +#: builtin/rev-list.c:405 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "kan inte kombinera --exclude-promisor-objects och --missing" -#: builtin/rev-list.c:464 +#: builtin/rev-list.c:466 msgid "object filtering requires --objects" msgstr "objektfiltrering kräver --objects" -#: builtin/rev-list.c:467 +#: builtin/rev-list.c:469 #, c-format msgid "invalid sparse value '%s'" msgstr "ogiltigt värde för sparse: \"%s\"" -#: builtin/rev-list.c:508 +#: builtin/rev-list.c:510 msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" -#: builtin/rev-list.c:511 +#: builtin/rev-list.c:513 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering" @@ -17600,59 +18381,59 @@ msgstr "flaggan \"%s\" antar ett numeriskt värde större än noll" msgid "%s: %s cannot be used with %s" msgstr "%s: %s kan inte användas med %s" -#: builtin/revert.c:101 +#: builtin/revert.c:102 msgid "end revert or cherry-pick sequence" msgstr "avsluta revert- eller cherry-pick-sekvens" -#: builtin/revert.c:102 +#: builtin/revert.c:103 msgid "resume revert or cherry-pick sequence" msgstr "återuppta revert- eller cherry-pick-sekvens" -#: builtin/revert.c:103 +#: builtin/revert.c:104 msgid "cancel revert or cherry-pick sequence" msgstr "avbryt revert- eller cherry-pick-sekvens" -#: builtin/revert.c:104 +#: builtin/revert.c:106 msgid "don't automatically commit" msgstr "checka inte in automatiskt" -#: builtin/revert.c:105 +#: builtin/revert.c:107 msgid "edit the commit message" msgstr "redigera incheckningsmeddelandet" -#: builtin/revert.c:108 +#: builtin/revert.c:110 msgid "parent-number" msgstr "nummer-på-förälder" -#: builtin/revert.c:109 +#: builtin/revert.c:111 msgid "select mainline parent" msgstr "välj förälder för huvudlinje" -#: builtin/revert.c:111 +#: builtin/revert.c:113 msgid "merge strategy" msgstr "sammanslagningsstrategi" -#: builtin/revert.c:113 +#: builtin/revert.c:115 msgid "option for merge strategy" msgstr "alternativ för sammanslagningsstrategi" -#: builtin/revert.c:122 +#: builtin/revert.c:124 msgid "append commit name" msgstr "lägg till incheckningsnamn" -#: builtin/revert.c:124 +#: builtin/revert.c:126 msgid "preserve initially empty commits" msgstr "behåll incheckningar som börjar som tomma" -#: builtin/revert.c:126 +#: builtin/revert.c:128 msgid "keep redundant, empty commits" msgstr "behåll redundanta, tomma incheckningar" -#: builtin/revert.c:220 +#: builtin/revert.c:227 msgid "revert failed" msgstr "\"revert\" misslyckades" -#: builtin/revert.c:233 +#: builtin/revert.c:240 msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" @@ -17763,18 +18544,6 @@ msgstr "läs referenser från standard in" msgid "print status from remote helper" msgstr "visa status från fjärrhjälpare" -#: builtin/serve.c:7 -msgid "git serve [<options>]" -msgstr "git serve [<flaggor>]" - -#: builtin/serve.c:17 builtin/upload-pack.c:23 -msgid "quit after a single request/response exchange" -msgstr "avsluta omedelbart efter första anrop/svar-utväxling" - -#: builtin/serve.c:19 -msgid "exit immediately after advertising capabilities" -msgstr "avsluta omedelbart efter kungörelse av kapabiliteter" - #: builtin/shortlog.c:14 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" @@ -17930,19 +18699,19 @@ msgstr[1] "maximalt %d poster kan visas samtidigt." msgid "no such ref %s" msgstr "ingen sådan referens %s" -#: builtin/show-branch.c:830 +#: builtin/show-branch.c:832 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "kan inte hantera mer än %d revision." msgstr[1] "kan inte hantera mer än %d revisioner." -#: builtin/show-branch.c:834 +#: builtin/show-branch.c:836 #, c-format msgid "'%s' is not a valid ref." msgstr "\"%s\" är inte en giltig referens." -#: builtin/show-branch.c:837 +#: builtin/show-branch.c:839 #, c-format msgid "cannot find commit %s (%s)" msgstr "hittar inte incheckning %s (%s)" @@ -17991,6 +18760,232 @@ msgstr "visa inte resultat på standard ut (användbart med --verify)" msgid "show refs from stdin that aren't in local repository" msgstr "visa referenser från standard in som inte finns i lokalt arkiv" +#: builtin/stash.c:22 builtin/stash.c:37 +msgid "git stash list [<options>]" +msgstr "git stash list [<flaggor>]" + +#: builtin/stash.c:23 builtin/stash.c:42 +msgid "git stash show [<options>] [<stash>]" +msgstr "git stash show [<flaggor>] [<stash>]" + +#: builtin/stash.c:24 builtin/stash.c:47 +msgid "git stash drop [-q|--quiet] [<stash>]" +msgstr "git stash drop [-q|--quiet] [<stash>]" + +#: builtin/stash.c:25 +msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" +msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" + +#: builtin/stash.c:26 builtin/stash.c:62 +msgid "git stash branch <branchname> [<stash>]" +msgstr "git stash branch <grennamn> [<stash>]" + +#: builtin/stash.c:27 builtin/stash.c:67 +msgid "git stash clear" +msgstr "git stash clear" + +#: builtin/stash.c:28 builtin/stash.c:77 +msgid "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +" [--] [<pathspec>...]]" +msgstr "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n" +" [--] [<sökväg>...]]" + +#: builtin/stash.c:31 builtin/stash.c:84 +msgid "" +"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [<message>]" +msgstr "" +"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [<meddelande>]" + +#: builtin/stash.c:52 +msgid "git stash pop [--index] [-q|--quiet] [<stash>]" +msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" + +#: builtin/stash.c:57 +msgid "git stash apply [--index] [-q|--quiet] [<stash>]" +msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" + +#: builtin/stash.c:72 +msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" +msgstr "git stash store [-m|--message <meddelande>] [-q|--quiet] <incheckning>" + +#: builtin/stash.c:127 +#, c-format +msgid "'%s' is not a stash-like commit" +msgstr "\"%s\" är inte en \"stash\"-liknande incheckning" + +#: builtin/stash.c:147 +#, c-format +msgid "Too many revisions specified:%s" +msgstr "För många revisioner angivna:%s" + +#: builtin/stash.c:161 git-legacy-stash.sh:548 +msgid "No stash entries found." +msgstr "Inga ”stash”-poster hittades." + +#: builtin/stash.c:175 +#, c-format +msgid "%s is not a valid reference" +msgstr "%s är inte en giltigt referens" + +#: builtin/stash.c:224 git-legacy-stash.sh:75 +msgid "git stash clear with parameters is unimplemented" +msgstr "\"git stash clear\" med parametrar har inte implementerats" + +#: builtin/stash.c:403 +msgid "cannot apply a stash in the middle of a merge" +msgstr "kan inte tillämpa en \"stash\" mitt i en sammanslagning" + +#: builtin/stash.c:414 +#, c-format +msgid "could not generate diff %s^!." +msgstr "kunde inte skapa diff %s^!." + +#: builtin/stash.c:421 +msgid "conflicts in index.Try without --index." +msgstr "konflikter i indexet. Testa utan --index." + +#: builtin/stash.c:427 +msgid "could not save index tree" +msgstr "kunde inte spara indexträd" + +#: builtin/stash.c:434 +msgid "could not restore untracked files from stash" +msgstr "kunde inte återställa ospårade filer från stash-post" + +#: builtin/stash.c:448 +#, c-format +msgid "Merging %s with %s" +msgstr "Slår ihop %s med %s" + +#: builtin/stash.c:458 git-legacy-stash.sh:680 +msgid "Index was not unstashed." +msgstr "Indexet har inte tagits upp ur \"stash\":en" + +#: builtin/stash.c:516 builtin/stash.c:615 +msgid "attempt to recreate the index" +msgstr "försök återskapa indexet" + +#: builtin/stash.c:549 +#, c-format +msgid "Dropped %s (%s)" +msgstr "Kastade %s (%s)" + +#: builtin/stash.c:552 +#, c-format +msgid "%s: Could not drop stash entry" +msgstr "%s: Kunde inte kasta \"stash\"-post" + +#: builtin/stash.c:577 +#, c-format +msgid "'%s' is not a stash reference" +msgstr "\"%s\" är inte en \"stash\"-referens" + +#: builtin/stash.c:627 git-legacy-stash.sh:694 +msgid "The stash entry is kept in case you need it again." +msgstr "Stash-posten behålls ifall du behöver den igen." + +#: builtin/stash.c:650 git-legacy-stash.sh:712 +msgid "No branch name specified" +msgstr "Inget grennamn angavs" + +#: builtin/stash.c:789 builtin/stash.c:826 +#, c-format +msgid "Cannot update %s with %s" +msgstr "Kan inte uppdatera %s med %s" + +#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510 +msgid "stash message" +msgstr "\"stash\"-meddelande" + +#: builtin/stash.c:817 +msgid "\"git stash store\" requires one <commit> argument" +msgstr "\"git stash store\" kräver ett <incheckning>-argument" + +#: builtin/stash.c:1039 git-legacy-stash.sh:217 +msgid "No changes selected" +msgstr "Inga ändringar valda" + +#: builtin/stash.c:1135 git-legacy-stash.sh:150 +msgid "You do not have the initial commit yet" +msgstr "Du har inte den första incheckningen ännu" + +#: builtin/stash.c:1162 git-legacy-stash.sh:165 +msgid "Cannot save the current index state" +msgstr "Kan inte spara aktuellt tillstånd för indexet" + +#: builtin/stash.c:1171 git-legacy-stash.sh:180 +msgid "Cannot save the untracked files" +msgstr "Kan inte spara ospårade filer" + +#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200 +#: git-legacy-stash.sh:213 +msgid "Cannot save the current worktree state" +msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" + +#: builtin/stash.c:1219 git-legacy-stash.sh:233 +msgid "Cannot record working tree state" +msgstr "Kan inte registrera tillstånd för arbetskatalog" + +#: builtin/stash.c:1268 git-legacy-stash.sh:337 +msgid "Can't use --patch and --include-untracked or --all at the same time" +msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt" + +#: builtin/stash.c:1284 +msgid "Did you forget to 'git add'?" +msgstr "Glömde du använda \"git add\"?" + +#: builtin/stash.c:1299 git-legacy-stash.sh:345 +msgid "No local changes to save" +msgstr "Inga lokala ändringar att spara" + +#: builtin/stash.c:1306 git-legacy-stash.sh:350 +msgid "Cannot initialize stash" +msgstr "Kan inte initiera \"stash\"" + +#: builtin/stash.c:1321 git-legacy-stash.sh:354 +msgid "Cannot save the current status" +msgstr "Kan inte spara aktuell status" + +#: builtin/stash.c:1326 +#, c-format +msgid "Saved working directory and index state %s" +msgstr "Sparade arbetskatalogen och indexstatus %s" + +#: builtin/stash.c:1430 git-legacy-stash.sh:384 +msgid "Cannot remove worktree changes" +msgstr "Kan inte ta bort ändringar i arbetskatalogen" + +#: builtin/stash.c:1465 builtin/stash.c:1501 +msgid "keep index" +msgstr "behåll indexet" + +#: builtin/stash.c:1467 builtin/stash.c:1503 +msgid "stash in patch mode" +msgstr "\"stash\" i \"patch\"-läge" + +#: builtin/stash.c:1468 builtin/stash.c:1504 +msgid "quiet mode" +msgstr "tyst läge" + +#: builtin/stash.c:1470 builtin/stash.c:1506 +msgid "include untracked files in stash" +msgstr "ta med ospårade filer i \"stash\"" + +#: builtin/stash.c:1472 builtin/stash.c:1508 +msgid "include ignore files" +msgstr "ta med ignorerade filer" + +#: builtin/stash.c:1568 +#, c-format +msgid "could not exec %s" +msgstr "kunde inte köra %s" + #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" msgstr "git stripspace [-s | --strip-comments]" @@ -18007,7 +19002,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:1943 +#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" @@ -18069,8 +19064,8 @@ msgid "Recurse into nested submodules" msgstr "Rekursera in i nästlade undermoduler" #: builtin/submodule--helper.c:569 -msgid "git submodule--helper foreach [--quiet] [--recursive] <command>" -msgstr "git submodule--helper sync [--quiet] [--recursive] [<kommando>]" +msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" +msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]" #: builtin/submodule--helper.c:596 #, c-format @@ -18106,8 +19101,8 @@ msgid "Suppress output for initializing a submodule" msgstr "Dölj utdata från initiering av undermodul" #: builtin/submodule--helper.c:712 -msgid "git submodule--helper init [<path>]" -msgstr "git submodule--helper init [<sökväg>]" +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 #, c-format @@ -18264,7 +19259,7 @@ msgstr "URL att klona undermodulen från" msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871 msgid "force cloning progress" msgstr "tvinga kloningsförlopp" @@ -18326,43 +19321,43 @@ msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" msgid "Failed to clone '%s' a second time, aborting" msgstr "Misslyckades klona \"%s\" för andra gången, avbryter" -#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:1853 msgid "path into the working tree, across nested submodule boundaries" msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser" -#: builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:1857 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1863 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Skapa en grund klon trunkerad till angivet antal revisioner" -#: builtin/submodule--helper.c:1867 +#: builtin/submodule--helper.c:1866 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:1868 msgid "whether the initial clone should follow the shallow recommendation" msgstr "om den första klonen skall följa rekommendation för grund kloning" -#: builtin/submodule--helper.c:1870 +#: builtin/submodule--helper.c:1869 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:1877 +#: builtin/submodule--helper.c:1876 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:1889 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:1937 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -18371,42 +19366,50 @@ msgstr "" "Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men " "huvudprojektet är inte på någon gren" -#: builtin/submodule--helper.c:2061 +#: builtin/submodule--helper.c:2060 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "kunde inte få tag i arkivhandtag för undermodulen \"%s\"" -#: builtin/submodule--helper.c:2094 +#: builtin/submodule--helper.c:2093 msgid "recurse into submodules" msgstr "rekursera ner i undermoduler" -#: builtin/submodule--helper.c:2100 -msgid "git submodule--helper embed-git-dir [<path>...]" -msgstr "git submodule--helper embed-git-dir [<sökväg>...]" +#: builtin/submodule--helper.c:2099 +msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" +msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]" #: builtin/submodule--helper.c:2156 msgid "check if it is safe to write to the .gitmodules file" msgstr "se om det är säkert att skriva till .gitmodules-filen" -#: builtin/submodule--helper.c:2161 -msgid "git submodule--helper config name [value]" -msgstr "git submodule--helper config name <värde>" +#: builtin/submodule--helper.c:2159 +msgid "unset the config in the .gitmodules file" +msgstr "ta bort konfigurationen från .gitmodules-filen" + +#: builtin/submodule--helper.c:2164 +msgid "git submodule--helper config <name> [<value>]" +msgstr "git submodule--helper config <namn> [<värde>]" + +#: builtin/submodule--helper.c:2165 +msgid "git submodule--helper config --unset <name>" +msgstr "git submodule--helper config --unset <namn>" -#: builtin/submodule--helper.c:2162 +#: builtin/submodule--helper.c:2166 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2179 git-submodule.sh:169 +#: builtin/submodule--helper.c:2185 git-submodule.sh:171 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "se till att .gitmodules finns i arbetskatalogen" -#: builtin/submodule--helper.c:2229 git.c:413 git.c:658 +#: builtin/submodule--helper.c:2235 git.c:433 git.c:685 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" -#: builtin/submodule--helper.c:2235 +#: builtin/submodule--helper.c:2241 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -18442,17 +19445,17 @@ msgstr "skäl till uppdateringen" #: builtin/tag.c:25 msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " -"[<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" +"\t\t<tagname> [<head>]" msgstr "" -"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>] <taggnamn> " -"[<huvud>]" +"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>]\n" +"\t\t<taggnamn> [<huvud>]" -#: builtin/tag.c:26 +#: builtin/tag.c:27 msgid "git tag -d <tagname>..." msgstr "git tag -d <taggnamn>..." -#: builtin/tag.c:27 +#: builtin/tag.c:28 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" @@ -18462,21 +19465,21 @@ msgstr "" "<incheckning>] [--points-at <objekt>]\n" "\t\t[--format=<format>] [--[no-]merged [<incheckning>]] [<mönster>...]" -#: builtin/tag.c:29 +#: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<format>] <taggnamn>..." -#: builtin/tag.c:87 +#: builtin/tag.c:88 #, c-format msgid "tag '%s' not found." msgstr "taggen \"%s\" hittades inte." -#: builtin/tag.c:103 +#: builtin/tag.c:104 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tog bort tagg \"%s\" (var %s)\n" -#: builtin/tag.c:133 +#: builtin/tag.c:134 #, c-format msgid "" "\n" @@ -18489,7 +19492,7 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/tag.c:137 +#: builtin/tag.c:138 #, c-format msgid "" "\n" @@ -18504,146 +19507,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:191 +#: builtin/tag.c:192 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:193 +#: builtin/tag.c:194 msgid "unable to write tag file" msgstr "kunde inte skriva tagg-filen" -#: builtin/tag.c:218 +#: builtin/tag.c:210 +#, c-format +msgid "" +"You have created a nested tag. The object referred to by your new is\n" +"already a tag. If you meant to tag the object that it points to, use:\n" +"\n" +"\tgit tag -f %s %s^{}" +msgstr "" +"Du har skapat en nästlad tagg. Objektet som refereras av din nya är\n" +"redan en tagg. Om du skulle tagga objektet den pekar på, använd:\n" +"\n" +"\tgit tag -f %s %s^{}" + +#: builtin/tag.c:226 msgid "bad object type." msgstr "felaktig objekttyp." -#: builtin/tag.c:267 +#: builtin/tag.c:278 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:274 +#: builtin/tag.c:285 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:385 +#: builtin/tag.c:396 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:387 +#: builtin/tag.c:398 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:389 +#: builtin/tag.c:400 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:390 +#: builtin/tag.c:401 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:392 +#: builtin/tag.c:403 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:394 +#: builtin/tag.c:405 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:396 +#: builtin/tag.c:407 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:398 +#: builtin/tag.c:409 msgid "force edit of tag message" msgstr "tvinga redigering av incheckningsmeddelande" -#: builtin/tag.c:399 +#: builtin/tag.c:410 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:403 +#: builtin/tag.c:413 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:404 +#: builtin/tag.c:414 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:405 builtin/update-ref.c:369 +#: builtin/tag.c:415 builtin/update-ref.c:369 msgid "create a reflog" msgstr "skapa en reflog" -#: builtin/tag.c:407 +#: builtin/tag.c:417 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:408 +#: builtin/tag.c:418 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:409 builtin/tag.c:411 +#: builtin/tag.c:419 builtin/tag.c:421 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:410 builtin/tag.c:412 +#: builtin/tag.c:420 builtin/tag.c:422 msgid "print only tags that don't contain the commit" msgstr "visa endast taggar som inte innehåller incheckningen" -#: builtin/tag.c:413 +#: builtin/tag.c:423 msgid "print only tags that are merged" msgstr "visa endast taggar som slagits samman" -#: builtin/tag.c:414 +#: builtin/tag.c:424 msgid "print only tags that are not merged" msgstr "visa endast taggar som ej slagits samman" -#: builtin/tag.c:419 +#: builtin/tag.c:428 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:463 +#: builtin/tag.c:472 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" -#: builtin/tag.c:485 +#: builtin/tag.c:494 msgid "-n option is only allowed in list mode" msgstr "Flaggan -n är endast tillåten i listläge" -#: builtin/tag.c:487 +#: builtin/tag.c:496 msgid "--contains option is only allowed in list mode" msgstr "Flaggan --contains är endast tillåten i listläge" -#: builtin/tag.c:489 +#: builtin/tag.c:498 msgid "--no-contains option is only allowed in list mode" msgstr "Flaggan --no-contains är endast tillåten i listläge" -#: builtin/tag.c:491 +#: builtin/tag.c:500 msgid "--points-at option is only allowed in list mode" msgstr "Flaggan --points-at är endast tillåten i listläge" -#: builtin/tag.c:493 +#: builtin/tag.c:502 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "Flaggorna --merged och --no-merged är endast tillåtna i listläge" -#: builtin/tag.c:504 +#: builtin/tag.c:513 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:523 +#: builtin/tag.c:532 msgid "too many params" msgstr "för många parametrar" -#: builtin/tag.c:529 +#: builtin/tag.c:538 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:534 +#: builtin/tag.c:543 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:565 +#: builtin/tag.c:574 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" @@ -18712,139 +19728,139 @@ msgstr " OK" msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<flaggor>] [--] [<fil>...]" -#: builtin/update-index.c:962 +#: builtin/update-index.c:971 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är àjour" -#: builtin/update-index.c:965 +#: builtin/update-index.c:974 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:968 +#: builtin/update-index.c:977 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:970 +#: builtin/update-index.c:979 msgid "let files replace directories and vice-versa" msgstr "låt filer ersätta kataloger och omvänt" -#: builtin/update-index.c:972 +#: builtin/update-index.c:981 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:974 +#: builtin/update-index.c:983 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" -#: builtin/update-index.c:977 +#: builtin/update-index.c:986 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:981 +#: builtin/update-index.c:990 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:985 +#: builtin/update-index.c:994 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:986 +#: builtin/update-index.c:995 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:995 +#: builtin/update-index.c:1005 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1008 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:1001 +#: builtin/update-index.c:1011 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1014 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:1007 +#: builtin/update-index.c:1017 msgid "add to index only; do not add content to object database" msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen" -#: builtin/update-index.c:1009 +#: builtin/update-index.c:1019 msgid "remove named paths even if present in worktree" msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1021 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:1013 +#: builtin/update-index.c:1023 msgid "read list of paths to be updated from standard input" msgstr "läs lista över sökvägar att uppdatera från standard in" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1027 msgid "add entries from standard input to the index" msgstr "lägg poster från standard in till indexet" -#: builtin/update-index.c:1021 +#: builtin/update-index.c:1031 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "återfyll etapp 2 och 3 från angivna sökvägar" -#: builtin/update-index.c:1025 +#: builtin/update-index.c:1035 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: builtin/update-index.c:1029 +#: builtin/update-index.c:1039 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1042 msgid "report actions to standard output" msgstr "rapportera åtgärder på standard ut" -#: builtin/update-index.c:1034 +#: builtin/update-index.c:1044 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:1038 +#: builtin/update-index.c:1048 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1050 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1052 msgid "enable/disable untracked cache" msgstr "aktivera/inaktivera ospårad cache" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1054 msgid "test if the filesystem supports untracked cache" msgstr "testa om filsystemet stöder ospårad cache" -#: builtin/update-index.c:1046 +#: builtin/update-index.c:1056 msgid "enable untracked cache without testing the filesystem" msgstr "aktivera ospårad cache utan att testa filsystemet" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1058 msgid "write out the index even if is not flagged as changed" msgstr "skriv ut indexet även om det inte angivits som ändrat" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1060 msgid "enable or disable file system monitor" msgstr "aktivera eller inaktivera filsystemsövervakning" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1062 msgid "mark files as fsmonitor valid" msgstr "markera filer som \"fsmonitor valid\"" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1065 msgid "clear fsmonitor valid bit" msgstr "töm \"fsmonitor valid\"-bit" -#: builtin/update-index.c:1156 +#: builtin/update-index.c:1168 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -18852,7 +19868,7 @@ msgstr "" "core.splitIndex är satt till false; ta bort eller ändra det om du verkligen " "vill aktivera delat index" -#: builtin/update-index.c:1165 +#: builtin/update-index.c:1177 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -18860,7 +19876,7 @@ msgstr "" "core.splitIndex är satt till true; ta bort eller ändra det om du verkligen " "vill inaktivera delat index" -#: builtin/update-index.c:1176 +#: builtin/update-index.c:1188 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -18868,11 +19884,11 @@ msgstr "" "core.untrackedCache är satt till true; ta bort eller ändra det om du " "verkligen vill inaktivera den ospårade cachen" -#: builtin/update-index.c:1180 +#: builtin/update-index.c:1192 msgid "Untracked cache disabled" msgstr "Ospårad cache är inaktiverad" -#: builtin/update-index.c:1188 +#: builtin/update-index.c:1200 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -18880,26 +19896,26 @@ msgstr "" "core.untrackedCache är satt till false; ta bort eller ändra det om du " "verkligen vill aktivera den ospårade cachen" -#: builtin/update-index.c:1192 +#: builtin/update-index.c:1204 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Ospårad cache är aktiverad för \"%s\"" -#: builtin/update-index.c:1200 +#: builtin/update-index.c:1212 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "core.fsmonitor inte satt; sätt om du verkligen vill aktivera fsmonitor" -#: builtin/update-index.c:1204 +#: builtin/update-index.c:1216 msgid "fsmonitor enabled" msgstr "fsmonitor aktiverat" -#: builtin/update-index.c:1207 +#: builtin/update-index.c:1219 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor är satt; ta bort om du verkligen vill inaktivera fsmonitor" -#: builtin/update-index.c:1211 +#: builtin/update-index.c:1223 msgid "fsmonitor disabled" msgstr "fsmonitor inaktiverat" @@ -18943,6 +19959,10 @@ msgstr "uppdatera informationsfilerna från grunden" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<flaggor>] <katalog>" +#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17 +msgid "quit after a single request/response exchange" +msgstr "avsluta omedelbart efter första anrop/svar-utväxling" + #: builtin/upload-pack.c:25 msgid "exit immediately after initial ref advertisement" msgstr "avsluta omedelbart efter inledande kungörelse av referenser" @@ -19015,7 +20035,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:888 +#: builtin/worktree.c:61 builtin/worktree.c:891 #, c-format msgid "failed to delete '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -19092,121 +20112,121 @@ msgstr "" "använd \"add -f\" för att överstyra, eller \"prune\" eller \"remove\" för " "att rensa" -#: builtin/worktree.c:310 +#: builtin/worktree.c:302 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:429 builtin/worktree.c:435 +#: builtin/worktree.c:432 builtin/worktree.c:438 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Förbereder arbetskatalog (ny gren \"%s\")" -#: builtin/worktree.c:431 +#: builtin/worktree.c:434 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Förbereder arbetskatalog (återställer gren \"%s\"; var på %s)" -#: builtin/worktree.c:440 +#: builtin/worktree.c:443 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Förbereder arbetskatalog (checkar ut \"%s\")" -#: builtin/worktree.c:446 +#: builtin/worktree.c:449 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)" -#: builtin/worktree.c:487 +#: builtin/worktree.c:490 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog" -#: builtin/worktree.c:490 +#: builtin/worktree.c:493 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:492 +#: builtin/worktree.c:495 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:494 +#: builtin/worktree.c:497 msgid "populate the new working tree" msgstr "befolka den nya arbetskatalogen" -#: builtin/worktree.c:495 +#: builtin/worktree.c:498 msgid "keep the new working tree locked" msgstr "låt arbetskatalogen förbli låst" -#: builtin/worktree.c:498 +#: builtin/worktree.c:501 msgid "set up tracking mode (see git-branch(1))" msgstr "ställ in spårningsläge (se git-branch(1))" -#: builtin/worktree.c:501 +#: builtin/worktree.c:504 msgid "try to match the new branch name with a remote-tracking branch" msgstr "försök matcha namn på ny gren mot en fjärrspårande gren" -#: builtin/worktree.c:509 +#: builtin/worktree.c:512 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" -#: builtin/worktree.c:570 +#: builtin/worktree.c:573 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track kan endast användas när ny gran skapas" -#: builtin/worktree.c:670 +#: builtin/worktree.c:673 msgid "reason for locking" msgstr "orsak till lås" -#: builtin/worktree.c:682 builtin/worktree.c:715 builtin/worktree.c:789 -#: builtin/worktree.c:916 +#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 +#: builtin/worktree.c:919 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:684 builtin/worktree.c:717 +#: builtin/worktree.c:687 builtin/worktree.c:720 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:689 +#: builtin/worktree.c:692 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:691 +#: builtin/worktree.c:694 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:719 +#: builtin/worktree.c:722 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" -#: builtin/worktree.c:760 +#: builtin/worktree.c:763 msgid "working trees containing submodules cannot be moved or removed" msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort" -#: builtin/worktree.c:768 +#: builtin/worktree.c:771 msgid "force move even if worktree is dirty or locked" msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst" -#: builtin/worktree.c:791 builtin/worktree.c:918 +#: builtin/worktree.c:794 builtin/worktree.c:921 #, c-format msgid "'%s' is a main working tree" msgstr "\"%s\" är inte en huvudarbetskatalog" -#: builtin/worktree.c:796 +#: builtin/worktree.c:799 #, c-format msgid "could not figure out destination name from '%s'" msgstr "kunde inte lista ut målnamn från \"%s\"" -#: builtin/worktree.c:802 +#: builtin/worktree.c:805 #, c-format msgid "target '%s' already exists" msgstr "målet \"%s\" finns redan" -#: builtin/worktree.c:810 +#: builtin/worktree.c:813 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -19215,7 +20235,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:812 +#: builtin/worktree.c:815 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -19223,36 +20243,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:815 +#: builtin/worktree.c:818 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s" -#: builtin/worktree.c:820 +#: builtin/worktree.c:823 #, c-format msgid "failed to move '%s' to '%s'" msgstr "misslyckades flytta \"%s\" till \"%s\"" -#: builtin/worktree.c:868 +#: builtin/worktree.c:871 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "misslyckades köra \"git status\" på \"%s\"" -#: builtin/worktree.c:872 +#: builtin/worktree.c:875 #, c-format msgid "'%s' is dirty, use --force to delete it" msgstr "\"%s\" är smutsigt, använd --force för att ta bort det" -#: builtin/worktree.c:877 +#: builtin/worktree.c:880 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "misslyckades köra \"git status\" på \"%s\", kod %d" -#: builtin/worktree.c:900 +#: builtin/worktree.c:903 msgid "force removal even if worktree is dirty or locked" msgstr "tvinga ta bort även om arbetskatalogen är smutsig eller låst" -#: builtin/worktree.c:923 +#: builtin/worktree.c:926 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -19261,7 +20281,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:925 +#: builtin/worktree.c:928 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -19269,7 +20289,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:928 +#: builtin/worktree.c:931 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s" @@ -19316,6 +20336,14 @@ msgstr "incheckning %s är inte märkt nåbar" msgid "too many commits marked reachable" msgstr "för många incheckningar markerade nåbara" +#: t/helper/test-serve-v2.c:7 +msgid "test-tool serve-v2 [<options>]" +msgstr "test-tool serve-v2 [<flaggor>]" + +#: t/helper/test-serve-v2.c:19 +msgid "exit immediately after advertising capabilities" +msgstr "avsluta omedelbart efter kungörelse av kapabiliteter" + #: git.c:27 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" @@ -19343,47 +20371,47 @@ msgstr "" "några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n" "<koncept>\" för att läsa mer om specifika underkommandon och koncept." -#: git.c:174 +#: git.c:185 #, c-format msgid "no directory given for --git-dir\n" msgstr "ingen katalog angavs för --git-dir\n" -#: git.c:188 +#: git.c:199 #, c-format msgid "no namespace given for --namespace\n" msgstr "ingen namnrymd angavs för --namespace\n" -#: git.c:202 +#: git.c:213 #, c-format msgid "no directory given for --work-tree\n" msgstr "ingen katalog angavs för --work-tree\n" -#: git.c:216 +#: git.c:227 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "inget prefix angavs för --super-prefix\n" -#: git.c:238 +#: git.c:249 #, c-format msgid "-c expects a configuration string\n" msgstr "-c förväntar en konfigurationssträng\n" -#: git.c:276 +#: git.c:287 #, c-format msgid "no directory given for -C\n" msgstr "ingen katalog angavs för -C\n" -#: git.c:301 +#: git.c:313 #, c-format msgid "unknown option: %s\n" msgstr "okänd flagga: %s\n" -#: git.c:342 +#: git.c:359 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "vid expandering av aliaset \"%s\": \"%s\"" -#: git.c:351 +#: git.c:368 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -19392,39 +20420,39 @@ msgstr "" "aliaset \"%s\" ändrar miljövariabler.\n" "Du kan använda \"!git\" i aliaset för att göra det" -#: git.c:359 +#: git.c:376 #, c-format msgid "empty alias for %s" msgstr "tomt alias för %s" -#: git.c:362 +#: git.c:379 #, c-format msgid "recursive alias: %s" msgstr "rekursivt alias: %s" -#: git.c:437 +#: git.c:459 msgid "write failure on standard output" msgstr "skrivfel på standard ut" -#: git.c:439 +#: git.c:461 msgid "unknown write failure on standard output" msgstr "okänt skrivfel på standard ut" -#: git.c:441 +#: git.c:463 msgid "close failed on standard output" msgstr "stäng misslyckades på standard ut" -#: git.c:720 +#: git.c:797 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "alias-slinga detekterades: expansionen av \"%s\" avslutas aldrig:%s" -#: git.c:770 +#: git.c:847 #, c-format msgid "cannot handle %s as a builtin" msgstr "kan inte hantera %s som inbyggd" -#: git.c:783 +#: git.c:860 #, c-format msgid "" "usage: %s\n" @@ -19433,13 +20461,13 @@ msgstr "" "användning: %s\n" "\n" -#: git.c:803 +#: git.c:880 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" "expandering av alias \"%s\" misslyckades; \"%s\" är inte ett git-kommando\n" -#: git.c:815 +#: git.c:892 #, c-format msgid "failed to run command '%s': %s\n" msgstr "misslyckades köra kommandot \"%s\": %s\n" @@ -19480,7 +20508,7 @@ msgstr "Kan inte sätta SSL-bakända till \"%s\": cURL byggdes utan SSL-bakändo msgid "Could not set SSL backend to '%s': already set" msgstr "Kunde inte sätta SSL-bakända till \"%s\": redan valt" -#: http.c:1959 +#: http.c:1965 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -19491,31 +20519,159 @@ msgstr "" " bad om: %s\n" " omdirigering: %s" -#: remote-curl.c:455 +#: remote-curl.c:157 +#, c-format +msgid "invalid quoting in push-option value: '%s'" +msgstr "felaktig citering på värde för push-option: \"%s\"" + +#: remote-curl.c:254 +#, c-format +msgid "%sinfo/refs not valid: is this a git repository?" +msgstr "%sinfo/refs inte giltig: är detta ett git-arkiv?" + +#: remote-curl.c:355 +msgid "invalid server response; expected service, got flush packet" +msgstr "ogiltigt svar från servern; förväntade tjänst, fick flush-paket" + +#: remote-curl.c:386 +#, c-format +msgid "invalid server response; got '%s'" +msgstr "ogiltigt svar från servern; fick \"%s\"" + +#: remote-curl.c:446 +#, c-format +msgid "repository '%s' not found" +msgstr "arkivet \"%s\" hittades inte" + +#: remote-curl.c:450 +#, c-format +msgid "Authentication failed for '%s'" +msgstr "Autentisering misslyckades \"%s\"" + +#: remote-curl.c:454 +#, c-format +msgid "unable to access '%s': %s" +msgstr "kan inte komma åt \"%s\": %s" + +#: remote-curl.c:460 #, c-format msgid "redirecting to %s" msgstr "omdirigerar till %s" -#: parse-options.h:154 +#: remote-curl.c:584 +msgid "shouldn't have EOF when not gentle on EOF" +msgstr "borde inte ha EOF när inte försiktig på EOF" + +#: remote-curl.c:664 +msgid "unable to rewind rpc post data - try increasing http.postBuffer" +msgstr "kunde inte spola tillbaka rpc-postdata - försök öka http.postBuffer" + +#: remote-curl.c:724 +#, c-format +msgid "RPC failed; %s" +msgstr "RPC misslyckades; %s" + +#: remote-curl.c:764 +msgid "cannot handle pushes this big" +msgstr "kan inte hantera så stora sändningar" + +#: remote-curl.c:879 +#, c-format +msgid "cannot deflate request; zlib deflate error %d" +msgstr "kan inte packa upp anrop; zlib-deflate-fel %d" + +#: remote-curl.c:883 +#, c-format +msgid "cannot deflate request; zlib end error %d" +msgstr "kan inte packa upp anrop; zlib-slutfel %d" + +#: remote-curl.c:1014 +msgid "dumb http transport does not support shallow capabilities" +msgstr "dum http-transport stöder inte grunda arkiv" + +#: remote-curl.c:1028 +msgid "fetch failed." +msgstr "mottagning misslyckades." + +#: remote-curl.c:1076 +msgid "cannot fetch by sha1 over smart http" +msgstr "kan inte hämta med sha1 över smart http" + +#: remote-curl.c:1120 remote-curl.c:1126 +#, c-format +msgid "protocol error: expected sha/ref, got %s'" +msgstr "protokollfel: förväntade sha/ref, fick \"%s\"" + +#: remote-curl.c:1138 remote-curl.c:1252 +#, c-format +msgid "http transport does not support %s" +msgstr "http-transporten stöder inte %s" + +#: remote-curl.c:1174 +msgid "git-http-push failed" +msgstr "git-http-push misslyckades" + +#: remote-curl.c:1360 +msgid "remote-curl: usage: git remote-curl <remote> [<url>]" +msgstr "remote-curl: användning: git remote-curl <fjärr> [<url>]" + +#: remote-curl.c:1392 +msgid "remote-curl: error reading command stream from git" +msgstr "remote-curl: fel vid läsning av kommandoström från git" + +#: remote-curl.c:1399 +msgid "remote-curl: fetch attempted without a local repo" +msgstr "remote-curl: försökte ta emot utan lokalt arkiv" + +#: remote-curl.c:1439 +#, c-format +msgid "remote-curl: unknown command '%s' from git" +msgstr "remote-curl: okänt kommando \"%s\" från git" + +#: list-objects-filter-options.h:63 +msgid "args" +msgstr "argument" + +#: list-objects-filter-options.h:64 +msgid "object filtering" +msgstr "objektfiltrering" + +#: parse-options.h:169 msgid "expiry-date" msgstr "giltig-till" -#: parse-options.h:169 +#: parse-options.h:183 msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakåtkompatibilitet)" -#: parse-options.h:259 +#: parse-options.h:296 msgid "be more verbose" msgstr "var mer pratsam" -#: parse-options.h:261 +#: parse-options.h:298 msgid "be more quiet" msgstr "var mer tyst" -#: parse-options.h:267 +#: parse-options.h:304 msgid "use <n> digits to display SHA-1s" msgstr "använd <n> siffror för att visa SHA-1:or" +#: parse-options.h:323 +msgid "how to strip spaces and #comments from message" +msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" + +#: ref-filter.h:101 +msgid "key" +msgstr "nyckel" + +#: ref-filter.h:101 +msgid "field name to sort on" +msgstr "fältnamn att sortera på" + +#: rerere.h:44 +msgid "update the index with reused conflict resolution if possible" +msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt" + #: command-list.h:50 msgid "Add file contents to the index" msgstr "Lägg filinnehåll till indexet" @@ -19770,9 +20926,9 @@ msgid "Instantly browse your working repository in gitweb" msgstr "Omedelbart bläddra i din arbetskatalog med gitweb" #: command-list.h:113 -msgid "add or parse structured information in commit messages" +msgid "Add or parse structured information in commit messages" msgstr "" -"lägg till eller tolka strukturerad information i incheckningsmeddelanden" +"Lägg till eller tolka strukturerad information i incheckningsmeddelanden" #: command-list.h:114 msgid "The Git repository browser" @@ -20155,18 +21311,6 @@ msgstr "Introduktion till Git" msgid "An overview of recommended workflows with Git" msgstr "Översikt över rekommenderade arbetsflöden med Git" -#: list-objects-filter-options.h:63 -msgid "args" -msgstr "argument" - -#: list-objects-filter-options.h:64 -msgid "object filtering" -msgstr "objektfiltrering" - -#: rerere.h:44 -msgid "update the index with reused conflict resolution if possible" -msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt" - #: git-bisect.sh:54 msgid "You need to start by \"git bisect start\"" msgstr "Du måste starta med \"git bisect start\"" @@ -20290,283 +21434,113 @@ msgstr "Försök enkel sammanslagning med $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning." -#: git-legacy-rebase.sh:445 -#, sh-format -msgid "Could not move back to $head_name" -msgstr "Kunde inte flytta tillbaka till $head_name" - -#: git-legacy-rebase.sh:471 -#, sh-format -msgid "" -"It seems that there is already a $state_dir_base directory, and\n" -"I wonder if you are in the middle of another rebase. If that is the\n" -"case, please try\n" -"\t$cmd_live_rebase\n" -"If that is not the case, please\n" -"\t$cmd_clear_stale_rebase\n" -"and run me again. I am stopping in case you still have something\n" -"valuable there." -msgstr "" -"Det verkar som katalogen $state_dir_base redan existerar, och\n" -"jag undrar om du redan är mitt i en annan ombasering. Om så är\n" -"fallet, försök\n" -"\t$cmd_live_rebase\n" -"Om så inte är fallet, kör\n" -"\t$cmd_clear_stale_rebase\n" -"och kör programmet igen. Jag avslutar ifall du fortfarande har\n" -"något av värde där." - -#: git-legacy-rebase.sh:523 -msgid "" -"fatal: cannot combine am options with either interactive or merge options" -msgstr "" -"ödesdigert: kan inte kombinera am-flaggor med antingen interaktiv- eller " -"sammanslagningsflaggor" - -#: git-legacy-rebase.sh:530 -msgid "fatal: cannot combine '--signoff' with '--preserve-merges'" -msgstr "ödesdigert: kan inte kombinera \"--signoff\" med \"--preserve-merges\"" - -#: git-legacy-rebase.sh:541 -msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'" -msgstr "" -"ödesdigert: kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\"" - -#: git-legacy-rebase.sh:550 -msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'" -msgstr "" -"ödesdigert: kan inte kombinera \"--rebase-merges\" med \"--strategy-option\"" - -#: git-legacy-rebase.sh:552 -msgid "fatal: cannot combine '--rebase-merges' with '--strategy'" -msgstr "ödesdigert: kan inte kombinera \"--rebase-merges\" med \"--strategy\"" - -#: git-legacy-rebase.sh:578 -#, sh-format -msgid "invalid upstream '$upstream_name'" -msgstr "ogiltig uppström \"$upstream_name\"" - -#: git-legacy-rebase.sh:602 -#, sh-format -msgid "$onto_name: there are more than one merge bases" -msgstr "$onto_name: mer än en sammanslagningsbas finns" - -#: git-legacy-rebase.sh:605 git-legacy-rebase.sh:609 -#, sh-format -msgid "$onto_name: there is no merge base" -msgstr "$onto_name: ingen sammanslagningsbas finns" - -#: git-legacy-rebase.sh:614 -#, sh-format -msgid "Does not point to a valid commit: $onto_name" -msgstr "Peka på en giltig incheckning: $onto_name" - -#: git-legacy-rebase.sh:640 -#, sh-format -msgid "fatal: no such branch/commit '$branch_name'" -msgstr "ödesdigert: ingen sådan gren/incheckning: $branch_name" - -#: git-legacy-rebase.sh:678 -#, sh-format -msgid "Created autostash: $stash_abbrev" -msgstr "Skapade autostash: $stash_abbrev" - -#: git-legacy-rebase.sh:707 -#, sh-format -msgid "Current branch $branch_name is up to date." -msgstr "Aktuell gren $branch_name är à jour." - -#: git-legacy-rebase.sh:717 -#, sh-format -msgid "Current branch $branch_name is up to date, rebase forced." -msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad." - -#: git-legacy-rebase.sh:731 -#, sh-format -msgid "Changes to $onto:" -msgstr "Ändringar till $onto:" - -#: git-legacy-rebase.sh:733 -#, sh-format -msgid "Changes from $mb to $onto:" -msgstr "Ändringar från $mb till $onto:" - -#: git-legacy-rebase.sh:743 -#, sh-format -msgid "Fast-forwarded $branch_name to $onto_name." -msgstr "Snabbspolade $branch_name till $onto_name." - -#: git-legacy-rebase.sh:757 -msgid "First, rewinding head to replay your work on top of it..." -msgstr "" -"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..." - -#: git-stash.sh:75 -msgid "git stash clear with parameters is unimplemented" -msgstr "\"git stash clear\" med parametrar har inte implementerats" - -#: git-stash.sh:125 -msgid "You do not have the initial commit yet" -msgstr "Du har inte den första incheckningen ännu" - -#: git-stash.sh:140 -msgid "Cannot save the current index state" -msgstr "Kan inte spara aktuellt tillstånd för indexet" - -#: git-stash.sh:155 -msgid "Cannot save the untracked files" -msgstr "Kan inte spara ospårade filer" - -#: git-stash.sh:175 git-stash.sh:188 -msgid "Cannot save the current worktree state" -msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" - -#: git-stash.sh:192 -msgid "No changes selected" -msgstr "Inga ändringar valda" - -#: git-stash.sh:195 +#: git-legacy-stash.sh:220 msgid "Cannot remove temporary index (can't happen)" msgstr "Kan inte ta bort temporärt index (kan inte inträffa)" -#: git-stash.sh:208 -msgid "Cannot record working tree state" -msgstr "Kan inte registrera tillstånd för arbetskatalog" - -#: git-stash.sh:246 +#: git-legacy-stash.sh:271 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Kan inte uppdatera $ref_stash med $w_commit" -#: git-stash.sh:298 +#: git-legacy-stash.sh:323 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "fel: okänd flagga för \"stash push\": $option" -#: git-stash.sh:312 -msgid "Can't use --patch and --include-untracked or --all at the same time" -msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt" - -#: git-stash.sh:320 -msgid "No local changes to save" -msgstr "Inga lokala ändringar att spara" - -#: git-stash.sh:325 -msgid "Cannot initialize stash" -msgstr "Kan inte initiera \"stash\"" - -#: git-stash.sh:329 -msgid "Cannot save the current status" -msgstr "Kan inte spara aktuell status" - -#: git-stash.sh:330 +#: git-legacy-stash.sh:355 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Sparade arbetskatalogen och indexstatus $stash_msg" -#: git-stash.sh:359 -msgid "Cannot remove worktree changes" -msgstr "Kan inte ta bort ändringar i arbetskatalogen" - -#: git-stash.sh:507 +#: git-legacy-stash.sh:535 #, sh-format msgid "unknown option: $opt" msgstr "okänd flagga: $opt" -#: git-stash.sh:520 -msgid "No stash entries found." -msgstr "Inga ”stash”-poster hittades." - -#: git-stash.sh:527 +#: git-legacy-stash.sh:555 #, sh-format msgid "Too many revisions specified: $REV" msgstr "För många revisioner angivna: $REV" -#: git-stash.sh:542 +#: git-legacy-stash.sh:570 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference är inte en giltig referens" -#: git-stash.sh:570 +#: git-legacy-stash.sh:598 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "\"$args\" är inte en \"stash\"-liknande incheckning" -#: git-stash.sh:581 +#: git-legacy-stash.sh:609 #, sh-format msgid "'$args' is not a stash reference" msgstr "\"$args\" är inte en \"stash\"-referens" -#: git-stash.sh:589 +#: git-legacy-stash.sh:617 msgid "unable to refresh index" msgstr "kan inte uppdatera indexet" -#: git-stash.sh:593 +#: git-legacy-stash.sh:621 msgid "Cannot apply a stash in the middle of a merge" msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning" -#: git-stash.sh:601 +#: git-legacy-stash.sh:629 msgid "Conflicts in index. Try without --index." msgstr "Konflikter i indexet. Testa utan --index." -#: git-stash.sh:603 +#: git-legacy-stash.sh:631 msgid "Could not save index tree" msgstr "Kunde inte spara indexträd" -#: git-stash.sh:612 +#: git-legacy-stash.sh:640 msgid "Could not restore untracked files from stash entry" msgstr "Kunde inte återställa ospårade filer från stash-post" -#: git-stash.sh:637 +#: git-legacy-stash.sh:665 msgid "Cannot unstage modified files" msgstr "Kan inte ta bort ändrade filer ur kön" -#: git-stash.sh:652 -msgid "Index was not unstashed." -msgstr "Indexet har inte tagits ur kön." - -#: git-stash.sh:666 -msgid "The stash entry is kept in case you need it again." -msgstr "Stash-posten behålls ifall du behöver den igen." - -#: git-stash.sh:675 +#: git-legacy-stash.sh:703 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Kastade ${REV} ($s)" -#: git-stash.sh:676 +#: git-legacy-stash.sh:704 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-stash.sh:684 -msgid "No branch name specified" -msgstr "Inget grennamn angavs" - -#: git-stash.sh:763 +#: git-legacy-stash.sh:791 msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" -#: git-submodule.sh:198 +#: git-submodule.sh:200 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå" -#: git-submodule.sh:208 +#: git-submodule.sh:210 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../" -#: git-submodule.sh:227 +#: git-submodule.sh:229 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:230 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "\"$sm_path\" finns redan i indexet och är inte en undermodul" -#: git-submodule.sh:236 +#: git-submodule.sh:239 +#, sh-format +msgid "'$sm_path' does not have a commit checked out" +msgstr "\"$sm_path\" har inte någon utcheckad incheckning" + +#: git-submodule.sh:245 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -20577,22 +21551,22 @@ msgstr "" "$sm_path\n" "Använd -f om du verkligen vill lägga till den." -#: git-submodule.sh:259 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet" -#: git-submodule.sh:261 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv" -#: git-submodule.sh:269 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):" -#: git-submodule.sh:271 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -20610,37 +21584,37 @@ msgstr "" "arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n" "flaggan \"--name\"." -#: git-submodule.sh:277 +#: git-submodule.sh:286 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt." -#: git-submodule.sh:289 +#: git-submodule.sh:298 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:294 +#: git-submodule.sh:303 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:303 +#: git-submodule.sh:312 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:563 +#: git-submodule.sh:573 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:573 +#: git-submodule.sh:583 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\"" -#: git-submodule.sh:578 +#: git-submodule.sh:588 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -20649,12 +21623,16 @@ msgstr "" "Kan inte hitta aktuell revision för ${remote_name}/${branch} i " "undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:596 +#: git-submodule.sh:606 #, sh-format -msgid "Unable to fetch in submodule path '$displaypath'" -msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\"" +msgid "" +"Unable to fetch in submodule path '$displaypath'; trying to directly fetch " +"$sha1:" +msgstr "" +"Kan inte hämta i undermodulsökväg \"$displaypath\"; försökte hämta $sha1 " +"direkt:" -#: git-submodule.sh:602 +#: git-submodule.sh:612 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -20663,72 +21641,72 @@ msgstr "" "Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. " "Direkt hämtning av incheckningen misslyckades." -#: git-submodule.sh:609 +#: git-submodule.sh:619 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:610 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:614 +#: git-submodule.sh:624 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:615 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:620 +#: git-submodule.sh:630 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:621 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:626 +#: git-submodule.sh:636 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:627 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" -#: git-submodule.sh:658 +#: git-submodule.sh:668 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:754 +#: git-submodule.sh:830 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" -#: git-submodule.sh:806 +#: git-submodule.sh:882 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:826 +#: git-submodule.sh:902 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src" -#: git-submodule.sh:829 +#: git-submodule.sh:905 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst" -#: git-submodule.sh:832 +#: git-submodule.sh:908 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -21048,58 +22026,58 @@ msgstr "Kunde inte initiera omskrivna incheckningar" msgid "usage: $dashless $USAGE" msgstr "använd: $dashless $USAGE" -#: git-sh-setup.sh:190 +#: git-sh-setup.sh:191 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" msgstr "Kunde inte byta katalog till $cdup, toppnivån på arbetskatalogen" -#: git-sh-setup.sh:199 git-sh-setup.sh:206 +#: git-sh-setup.sh:200 git-sh-setup.sh:207 #, sh-format msgid "fatal: $program_name cannot be used without a working tree." msgstr "ödesdigetrt: $program_name kan inte användas utan arbetskatalog." -#: git-sh-setup.sh:220 +#: git-sh-setup.sh:221 msgid "Cannot rebase: You have unstaged changes." msgstr "Kan inte ombasera: Du har oköade ändringar." -#: git-sh-setup.sh:223 +#: git-sh-setup.sh:224 msgid "Cannot rewrite branches: You have unstaged changes." msgstr "Kan inte skriva om grenar: Du har oköade ändringar." -#: git-sh-setup.sh:226 +#: git-sh-setup.sh:227 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "Kan inte hämta med ombasering: Du har oköade ändringar." -#: git-sh-setup.sh:229 +#: git-sh-setup.sh:230 #, sh-format msgid "Cannot $action: You have unstaged changes." msgstr "Kan inte $action: Du har oköade ändringar." -#: git-sh-setup.sh:242 +#: git-sh-setup.sh:243 msgid "Cannot rebase: Your index contains uncommitted changes." msgstr "" "Kan inte ombasera: Ditt index innehåller ändringar som inte checkats in." -#: git-sh-setup.sh:245 +#: git-sh-setup.sh:246 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" "Kan inte hämta med ombasering: Ditt index innehåller oincheckade ändringar." -#: git-sh-setup.sh:248 +#: git-sh-setup.sh:249 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "" "Kan inte $action: Ditt index innehåller ändringar som inte checkats in." -#: git-sh-setup.sh:252 +#: git-sh-setup.sh:253 msgid "Additionally, your index contains uncommitted changes." msgstr "Dessutom innehåller dit index ändringar som inte har checkats in." -#: git-sh-setup.sh:372 +#: git-sh-setup.sh:373 msgid "You need to run this command from the toplevel of the working tree." msgstr "Du måste köra kommandot från arbetskatalogens toppnivå." -#: git-sh-setup.sh:377 +#: git-sh-setup.sh:378 msgid "Unable to determine absolute path of git directory" msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" @@ -21654,7 +22632,7 @@ msgstr "\"%s.final\" innehåller det skrivna brevet.\n" 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:650 +#: git-send-email.perl:395 git-send-email.perl:656 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Kan inte köra git format-patch från utanför arkivet\n" @@ -21666,37 +22644,37 @@ msgstr "" "\"batch-size\" och \"relogin\" måste anges tillsammans (via kommandorad " "eller konfigurationsflagga)\n" -#: git-send-email.perl:468 +#: git-send-email.perl:470 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Okänt fält i --suppress-cc: \"%s\"\n" -#: git-send-email.perl:497 +#: git-send-email.perl:501 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Okänd inställning i --confirm: \"%s\"\n" -#: git-send-email.perl:525 +#: git-send-email.perl:529 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "varning: sendmail-alias med citationstecken stöds inte. %s\n" -#: git-send-email.perl:527 +#: git-send-email.perl:531 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "varning: \":include:\" stöds inte: %s\n" -#: git-send-email.perl:529 +#: git-send-email.perl:533 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "varning: omdirigering til \"/fil\" eller \"|rör\" stöds inte: %s\n" -#: git-send-email.perl:534 +#: git-send-email.perl:538 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "varning: sendmail-raden känns inte igen: %s\n" -#: git-send-email.perl:616 +#: git-send-email.perl:622 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -21711,12 +22689,12 @@ msgstr "" " * Säga \"./%s\" om du menar en fil; eller\n" " * Ange flaggan --format-patch om du menar ett intervall.\n" -#: git-send-email.perl:637 +#: git-send-email.perl:643 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Misslyckades utföra opendir %s: %s" -#: git-send-email.perl:661 +#: git-send-email.perl:667 #, perl-format msgid "" "fatal: %s: %s\n" @@ -21725,7 +22703,7 @@ msgstr "" "ödesdigert: %s: %s\n" "varning: inga patchar har sänts\n" -#: git-send-email.perl:672 +#: git-send-email.perl:678 msgid "" "\n" "No patch files specified!\n" @@ -21735,17 +22713,17 @@ msgstr "" "Inga patchfiler angavs!\n" "\n" -#: git-send-email.perl:685 +#: git-send-email.perl:691 #, perl-format msgid "No subject line in %s?" msgstr "Ingen ärenderad i %s?" -#: git-send-email.perl:695 +#: git-send-email.perl:701 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Kunde inte öppna för skrivning %s: %s" -#: git-send-email.perl:706 +#: git-send-email.perl:712 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -21759,38 +22737,38 @@ msgstr "" "\n" "Rensa brevkroppen om du inte vill sända någon sammanfattning.\n" -#: git-send-email.perl:730 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open %s: %s" msgstr "Misslyckades öppna %s: %s" -#: git-send-email.perl:747 +#: git-send-email.perl:753 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Misslyckades öppna %s.final: %s" -#: git-send-email.perl:790 +#: git-send-email.perl:796 msgid "Summary email is empty, skipping it\n" msgstr "Sammanfattande brev tomt, hoppar över\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:825 +#: git-send-email.perl:831 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Är du säker på att du vill använda <%s> [Y=ja, N=nej]? " -#: git-send-email.perl:880 +#: git-send-email.perl:886 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" "Följande filer är åttabitars, men anger inte en Content-Transfer-Encoding.\n" -#: git-send-email.perl:885 +#: git-send-email.perl:891 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Vilken åttabitarsteckenkodning skall jag ange [UTF-8]? " -#: git-send-email.perl:893 +#: git-send-email.perl:899 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -21803,21 +22781,21 @@ msgstr "" "har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen " "vill sända.\n" -#: git-send-email.perl:912 +#: git-send-email.perl:918 msgid "To whom should the emails be sent (if anyone)?" msgstr "Till vem skall breven sändas (om någon)?" -#: git-send-email.perl:930 +#: git-send-email.perl:936 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n" -#: git-send-email.perl:942 +#: git-send-email.perl:948 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Message-ID att använda som In-Reply-To för det första brevet (om något)? " -#: git-send-email.perl:1000 git-send-email.perl:1008 +#: git-send-email.perl:1006 git-send-email.perl:1014 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "fel: kunde inte få fram en giltig adress från: %s\n" @@ -21825,16 +22803,16 @@ msgstr "fel: kunde inte få fram en giltig adress från: %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1012 +#: git-send-email.perl:1018 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Vad vill du göra med adressen? (q=avsluta, d=kasta, e=redigera): " -#: git-send-email.perl:1329 +#: git-send-email.perl:1335 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA-sökvägen \"%s\" finns inte" -#: git-send-email.perl:1412 +#: git-send-email.perl:1418 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -21861,124 +22839,124 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1427 +#: git-send-email.perl:1433 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "Sända brevet? (y=ja, n=nej, e=redigera, q=avsluta, a=alla): " -#: git-send-email.perl:1430 +#: git-send-email.perl:1436 msgid "Send this email reply required" msgstr "Svar krävs på frågan \"Sända brevet?\"" -#: git-send-email.perl:1458 +#: git-send-email.perl:1464 msgid "The required SMTP server is not properly defined." msgstr "Nödvändig SMTP-server har inte angivits korrekt." -#: git-send-email.perl:1505 +#: git-send-email.perl:1511 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Servern stöder inte SMARTTLS! %s" -#: git-send-email.perl:1510 git-send-email.perl:1514 +#: git-send-email.perl:1516 git-send-email.perl:1520 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS misslyckades! %s" -#: git-send-email.perl:1523 +#: git-send-email.perl:1529 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Kan inte initiera SMTP korrekt. Kontrollera inställningarna och använd --" "smtp-debug." -#: git-send-email.perl:1541 +#: git-send-email.perl:1547 #, perl-format msgid "Failed to send %s\n" msgstr "Misslyckades sända %s\n" -#: git-send-email.perl:1544 +#: git-send-email.perl:1550 #, perl-format msgid "Dry-Sent %s\n" msgstr "Test-Sände %s\n" -#: git-send-email.perl:1544 +#: git-send-email.perl:1550 #, perl-format msgid "Sent %s\n" msgstr "Sände %s\n" -#: git-send-email.perl:1546 +#: git-send-email.perl:1552 msgid "Dry-OK. Log says:\n" msgstr "Test-OK. Loggen säger:\n" -#: git-send-email.perl:1546 +#: git-send-email.perl:1552 msgid "OK. Log says:\n" msgstr "OK. Loggen säger:\n" -#: git-send-email.perl:1558 +#: git-send-email.perl:1564 msgid "Result: " msgstr "Resultat: " -#: git-send-email.perl:1561 +#: git-send-email.perl:1567 msgid "Result: OK\n" msgstr "Resultat: OK\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1585 #, perl-format msgid "can't open file %s" msgstr "kan inte öppna filen %s" -#: git-send-email.perl:1626 git-send-email.perl:1646 +#: git-send-email.perl:1632 git-send-email.perl:1652 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Lägger till cc: %s från raden \"%s\"\n" -#: git-send-email.perl:1632 +#: git-send-email.perl:1638 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Lägger till to: %s från raden \"%s\"\n" -#: git-send-email.perl:1685 +#: git-send-email.perl:1691 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(icke-mbox) Lägger till cc: %s från raden \"%s\"\n" -#: git-send-email.perl:1720 +#: git-send-email.perl:1726 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(kropp) Lägger till cc: %s från raden \"%s\"\n" -#: git-send-email.perl:1831 +#: git-send-email.perl:1837 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Kunde inte köra \"%s\"" -#: git-send-email.perl:1838 +#: git-send-email.perl:1844 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Lägger till %s: %s från: \"%s\"\n" -#: git-send-email.perl:1842 +#: git-send-email.perl:1848 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) misslyckades stänga röret till \"%s\"" -#: git-send-email.perl:1872 +#: git-send-email.perl:1878 msgid "cannot send message as 7bit" msgstr "kan inte sända brev som sjubitars" -#: git-send-email.perl:1880 +#: git-send-email.perl:1886 msgid "invalid transfer encoding" msgstr "ogiltig överföringskondning" -#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983 +#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989 #, perl-format msgid "unable to open %s: %s\n" msgstr "kunde inte öppna %s: %s\n" -#: git-send-email.perl:1924 +#: git-send-email.perl:1930 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: patchen innehåller en rad längre än 998 tecken" -#: git-send-email.perl:1941 +#: git-send-email.perl:1947 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" @@ -21986,11 +22964,115 @@ msgstr "" "säkerhetskopior.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1945 +#: git-send-email.perl:1951 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "hash version %X does not match version %X" +#~ msgstr "hash-versionen %X stämmer inte med versionen %X" + +#~ msgid "option '%s' requires a value" +#~ msgstr "flaggan \"%s\" behöver ett värde" + +#~ msgid "could not transform the todo list" +#~ msgstr "kunde inte transformera att göra-listan" + +#~ msgid "default" +#~ msgstr "standard" + +#~ msgid "Could not create directory '%s'" +#~ msgstr "Kunde inte skapa katalogen \"%s\"" + +#~ msgid "allow rerere to update index with resolved conflict" +#~ msgstr "tillåt rerere att uppdatera index med lösa konflikter" + +#~ msgid "could not open %s" +#~ msgstr "kunde inte öppna %s" + +#~ msgid "Could not move back to $head_name" +#~ msgstr "Kunde inte flytta tillbaka till $head_name" + +#~ msgid "" +#~ "It seems that there is already a $state_dir_base directory, and\n" +#~ "I wonder if you are in the middle of another rebase. If that is the\n" +#~ "case, please try\n" +#~ "\t$cmd_live_rebase\n" +#~ "If that is not the case, please\n" +#~ "\t$cmd_clear_stale_rebase\n" +#~ "and run me again. I am stopping in case you still have something\n" +#~ "valuable there." +#~ msgstr "" +#~ "Det verkar som katalogen $state_dir_base redan existerar, och\n" +#~ "jag undrar om du redan är mitt i en annan ombasering. Om så är\n" +#~ "fallet, försök\n" +#~ "\t$cmd_live_rebase\n" +#~ "Om så inte är fallet, kör\n" +#~ "\t$cmd_clear_stale_rebase\n" +#~ "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" +#~ "något av värde där." + +#~ msgid "" +#~ "fatal: cannot combine am options with either interactive or merge options" +#~ msgstr "" +#~ "ödesdigert: kan inte kombinera am-flaggor med antingen interaktiv- eller " +#~ "sammanslagningsflaggor" + +#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'" +#~ msgstr "" +#~ "ödesdigert: kan inte kombinera \"--signoff\" med \"--preserve-merges\"" + +#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'" +#~ msgstr "" +#~ "ödesdigert: kan inte kombinera \"--preserve-merges\" med \"--rebase-merges" +#~ "\"" + +#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'" +#~ msgstr "" +#~ "ödesdigert: kan inte kombinera \"--rebase-merges\" med \"--strategy-option" +#~ "\"" + +#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'" +#~ msgstr "" +#~ "ödesdigert: kan inte kombinera \"--rebase-merges\" med \"--strategy\"" + +#~ msgid "invalid upstream '$upstream_name'" +#~ msgstr "ogiltig uppström \"$upstream_name\"" + +#~ msgid "$onto_name: there are more than one merge bases" +#~ msgstr "$onto_name: mer än en sammanslagningsbas finns" + +#~ msgid "$onto_name: there is no merge base" +#~ msgstr "$onto_name: ingen sammanslagningsbas finns" + +#~ msgid "Does not point to a valid commit: $onto_name" +#~ msgstr "Peka på en giltig incheckning: $onto_name" + +#~ msgid "fatal: no such branch/commit '$branch_name'" +#~ msgstr "ödesdigert: ingen sådan gren/incheckning: $branch_name" + +#~ msgid "Created autostash: $stash_abbrev" +#~ msgstr "Skapade autostash: $stash_abbrev" + +#~ msgid "Current branch $branch_name is up to date." +#~ msgstr "Aktuell gren $branch_name är à jour." + +#~ msgid "Current branch $branch_name is up to date, rebase forced." +#~ msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad." + +#~ msgid "Changes to $onto:" +#~ msgstr "Ändringar till $onto:" + +#~ msgid "Changes from $mb to $onto:" +#~ msgstr "Ändringar från $mb till $onto:" + +#~ msgid "Fast-forwarded $branch_name to $onto_name." +#~ msgstr "Snabbspolade $branch_name till $onto_name." + +#~ msgid "First, rewinding head to replay your work on top of it..." +#~ msgstr "" +#~ "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..." + #~ msgid "--reschedule-failed-exec requires an interactive rebase" #~ msgstr "--reschedule-failed-exec kräver en interaktiv ombasering" @@ -22015,9 +23097,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "unable to write sha1 filename %s" #~ msgstr "kan inte skriva sha1-filnamn %s" -#~ msgid "unable to write sha1 file" -#~ msgstr "kan inte skriva sha1-filen" - #~ msgid "cannot read sha1_file for %s" #~ msgstr "kan inte läsa sha1_file för %s" @@ -22046,9 +23125,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "could not parse '%s' (looking for '%s')" #~ msgstr "kunde inte tolka \"%s\" (letar efter \"%s\")" -#~ msgid "bad quoting on %s value in '%s'" -#~ msgstr "felaktig citering på %s-värde i \"%s\"" - #~ msgid "deprecated synonym for --create-reflog" #~ msgstr "avrådd synonym för --create-reflog" @@ -22181,9 +23257,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "Don't know how to clone %s" #~ msgstr "Vet inte hur man klonar %s" -#~ msgid "show ignored files" -#~ msgstr "visa ignorerade filer" - #~ msgid "Don't know how to fetch from %s" #~ msgstr "Vet inte hur man hämtar från %s" @@ -22237,9 +23310,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "basename" #~ msgstr "basnamn" -#~ msgid "prepend parent project's basename to output" -#~ msgstr "lägg till föräldraprojektets basnamn i utdata" - #~ msgid "" #~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" #~ " - $line" @@ -22644,9 +23714,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "'%s': %s" #~ msgstr "\"%s\": %s" -#~ msgid "unable to access '%s': %s" -#~ msgstr "kan inte komma åt \"%s\": %s" - #~ msgid " git branch -d %s\n" #~ msgstr " git branch -d %s\n" |