diff options
Diffstat (limited to 'po/sv.po')
| -rw-r--r-- | po/sv.po | 9648 |
1 files changed, 6263 insertions, 3385 deletions
@@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.16.0\n" +"Project-Id-Version: git 2.19.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2018-03-16 07:29+0800\n" -"PO-Revision-Date: 2018-03-18 20:55+0100\n" +"POT-Creation-Date: 2018-09-04 08:50+0800\n" +"PO-Revision-Date: 2018-09-04 22:32+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:62 +#: advice.c:97 #, c-format -msgid "hint: %.*s\n" -msgstr "tips: %.*s\n" +msgid "%shint: %.*s%s\n" +msgstr "%stips: %.*s%s\n" -#: advice.c:90 +#: advice.c:150 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:92 +#: advice.c:152 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:94 +#: advice.c:154 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:96 +#: advice.c:156 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:98 +#: advice.c:158 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:100 +#: advice.c:160 #, 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:108 +#: advice.c:168 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:116 +#: advice.c:176 msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:121 builtin/merge.c:1251 +#: advice.c:181 builtin/merge.c:1286 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: advice.c:123 +#: advice.c:183 msgid "Please, commit your changes before merging." msgstr "Checka in dina ändringar innan du utför sammanslagningen." -#: advice.c:124 +#: advice.c:184 msgid "Exiting because of unfinished merge." msgstr "Avslutar på grund av ofullbordad sammanslagning." -#: advice.c:130 +#: advice.c:190 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -111,92 +111,92 @@ msgstr "" " git checkout -b <namn-på-ny-gren>\n" "\n" -#: apply.c:58 +#: apply.c:59 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "okänt alternativ för whitespace: \"%s\"" -#: apply.c:74 +#: apply.c:75 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: apply.c:122 +#: apply.c:125 msgid "--reject and --3way cannot be used together." msgstr "--reject och --3way kan inte användas samtidigt." -#: apply.c:124 +#: apply.c:127 msgid "--cached and --3way cannot be used together." msgstr "--cached och --3way kan inte användas samtidigt." -#: apply.c:127 +#: apply.c:130 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: apply.c:138 +#: apply.c:141 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: apply.c:141 +#: apply.c:144 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: apply.c:821 +#: apply.c:826 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: apply.c:830 +#: apply.c:835 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: apply.c:904 +#: apply.c:909 #, c-format msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen på rad %d" -#: apply.c:942 +#: apply.c:947 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d" -#: apply.c:948 +#: apply.c:953 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d" -#: apply.c:949 +#: apply.c:954 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d" -#: apply.c:954 +#: apply.c:959 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d" -#: apply.c:983 +#: apply.c:988 #, c-format msgid "invalid mode on line %d: %s" msgstr "ogiltigt läge på rad %d: %s" -#: apply.c:1301 +#: apply.c:1306 #, c-format msgid "inconsistent header lines %d and %d" msgstr "huvudet är inkonsekvent mellan rad %d och %d" -#: apply.c:1473 +#: apply.c:1478 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: apply.c:1542 +#: apply.c:1547 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: apply.c:1562 +#: apply.c:1567 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -212,82 +212,82 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: apply.c:1575 +#: apply.c:1580 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)" -#: apply.c:1763 +#: apply.c:1768 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: apply.c:1765 +#: apply.c:1770 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: apply.c:1799 +#: apply.c:1804 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: apply.c:1836 +#: apply.c:1841 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: apply.c:1838 +#: apply.c:1843 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: apply.c:1841 +#: apply.c:1846 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** varning: filen %s blir tom men har inte tagits bort" -#: apply.c:1988 +#: apply.c:1993 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: apply.c:2025 +#: apply.c:2030 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: apply.c:2185 +#: apply.c:2190 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: apply.c:2271 +#: apply.c:2276 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: apply.c:2275 +#: apply.c:2280 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: apply.c:2934 +#: apply.c:2939 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: apply.c:3055 +#: apply.c:3060 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Stycke %d lyckades på %d (offset %d rad)." msgstr[1] "Stycke %d lyckades på %d (offset %d rader)." -#: apply.c:3067 +#: apply.c:3072 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d" -#: apply.c:3073 +#: apply.c:3078 #, c-format msgid "" "while searching for:\n" @@ -296,25 +296,25 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: apply.c:3095 +#: apply.c:3100 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: apply.c:3103 +#: apply.c:3108 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s" "\"" -#: apply.c:3149 +#: apply.c:3154 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden" -#: apply.c:3159 +#: apply.c:3164 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -322,539 +322,593 @@ msgstr "" "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande " "innehållet." -#: apply.c:3167 +#: apply.c:3172 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "patchen appliceras på en tom \"%s\", men den är inte tom" -#: apply.c:3185 +#: apply.c:3190 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas" -#: apply.c:3198 +#: apply.c:3203 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: apply.c:3204 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)" -#: apply.c:3225 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: apply.c:3347 +#: apply.c:3352 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277 +#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" -#: apply.c:3404 +#: apply.c:3412 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk" -#: apply.c:3433 apply.c:3673 +#: apply.c:3441 apply.c:3681 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: apply.c:3516 apply.c:3687 +#: apply.c:3524 apply.c:3696 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: apply.c:3525 apply.c:3695 +#: apply.c:3533 apply.c:3704 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: apply.c:3560 +#: apply.c:3568 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: apply.c:3563 +#: apply.c:3571 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Faller tillbaka på trevägssammanslagning...\n" -#: apply.c:3579 apply.c:3583 +#: apply.c:3587 apply.c:3591 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kunde inte läsa aktuellt innehåll i \"%s\"" -#: apply.c:3595 +#: apply.c:3603 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n" -#: apply.c:3609 +#: apply.c:3617 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Applicerade patchen på \"%s\" med konflikter.\n" -#: apply.c:3614 +#: apply.c:3622 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Tillämpade patchen på \"%s\" rent.\n" -#: apply.c:3640 +#: apply.c:3648 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: apply.c:3712 +#: apply.c:3721 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: apply.c:3714 +#: apply.c:3723 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: apply.c:3864 apply.c:3866 +#: apply.c:3874 apply.c:3876 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg ”%s”" -#: apply.c:3922 +#: apply.c:3932 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: apply.c:3925 +#: apply.c:3935 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: apply.c:3945 +#: apply.c:3955 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)" -#: apply.c:3950 +#: apply.c:3960 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s" -#: apply.c:3970 +#: apply.c:3980 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk" -#: apply.c:3974 +#: apply.c:3984 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: apply.c:3989 +#: apply.c:3999 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: apply.c:4080 +#: apply.c:4091 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s" -#: apply.c:4087 +#: apply.c:4098 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "nytt läge för %s, som inte finns i nuvarande HEAD" -#: apply.c:4090 +#: apply.c:4101 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller är oanvändbar (%s)." -#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140 +#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: apply.c:4099 +#: apply.c:4110 #, c-format msgid "could not add %s to temporary index" msgstr "kunde inte lägga till %s till temporärt index" -#: apply.c:4109 +#: apply.c:4120 #, c-format msgid "could not write temporary index to %s" msgstr "kunde inte skriva temporärt index till %s" -#: apply.c:4247 +#: apply.c:4258 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: apply.c:4282 +#: apply.c:4292 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: apply.c:4288 +#: apply.c:4298 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: apply.c:4296 +#: apply.c:4306 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s" -#: apply.c:4302 apply.c:4446 +#: apply.c:4312 apply.c:4457 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: apply.c:4343 +#: apply.c:4355 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" -#: apply.c:4347 +#: apply.c:4359 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: apply.c:4417 +#: apply.c:4429 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: apply.c:4515 +#: apply.c:4527 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: apply.c:4523 +#: apply.c:4535 msgid "internal error" msgstr "internt fel" -#: apply.c:4526 +#: apply.c:4538 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Tillämpade patchen %%s med %d refuserad..." msgstr[1] "Tillämpade patchen %%s med %d refuserade..." -#: apply.c:4537 +#: apply.c:4549 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025 +#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" -#: apply.c:4559 +#: apply.c:4571 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: apply.c:4563 +#: apply.c:4575 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4673 +#: apply.c:4685 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4681 +#: apply.c:4693 msgid "unrecognized input" msgstr "indata känns inte igen" -#: apply.c:4700 +#: apply.c:4712 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4837 +#: apply.c:4849 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4864 +#: apply.c:4876 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "undertryckte %d fel i blanksteg" msgstr[1] "undertryckte %d fel i blanksteg" -#: apply.c:4870 apply.c:4885 +#: apply.c:4882 apply.c:4897 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d rad lägger till fel i blanksteg." msgstr[1] "%d rader lägger till fel i blanksteg." -#: apply.c:4878 +#: apply.c:4890 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg." msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg." -#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390 +#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257 -#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193 -#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197 -#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567 -#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787 -#: git-add--interactive.perl:197 +#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257 +#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260 +#: builtin/pull.c:198 builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 +#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197 msgid "path" msgstr "sökväg" -#: apply.c:4922 +#: apply.c:4934 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:4925 +#: apply.c:4937 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:4927 builtin/am.c:2263 +#: apply.c:4939 builtin/am.c:2263 msgid "num" msgstr "antal" -#: apply.c:4928 +#: apply.c:4940 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:4931 +#: apply.c:4943 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:4933 +#: apply.c:4945 msgid "instead of applying the patch, output diffstat for the input" msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata" -#: apply.c:4937 +#: apply.c:4949 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:4939 +#: apply.c:4951 msgid "instead of applying the patch, output a summary for the input" msgstr "istället för att tillämpa patchen, skriv ut en summering av indata" -#: apply.c:4941 +#: apply.c:4953 msgid "instead of applying the patch, see if the patch is applicable" msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas" -#: apply.c:4943 +#: apply.c:4955 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:4945 +#: apply.c:4957 +msgid "mark new files with `git add --intent-to-add`" +msgstr "markera nya filer med \"git add --intent-to-add\"" + +#: apply.c:4959 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:4947 +#: apply.c:4961 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:4950 +#: apply.c:4964 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:4952 +#: apply.c:4966 msgid "attempt three-way merge if a patch does not apply" msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" -#: apply.c:4954 +#: apply.c:4968 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515 +#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: apply.c:4959 +#: apply.c:4973 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95 +#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 -#: builtin/pack-objects.c:3035 +#: builtin/pack-objects.c:3202 msgid "action" msgstr "åtgärd" -#: apply.c:4961 +#: apply.c:4975 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:4964 apply.c:4967 +#: apply.c:4978 apply.c:4981 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:4970 +#: apply.c:4984 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:4972 +#: apply.c:4986 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:4974 +#: apply.c:4988 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:4976 +#: apply.c:4990 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21 -#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665 -#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125 +#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21 +#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671 +#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124 msgid "be verbose" msgstr "var pratsam" -#: apply.c:4979 +#: apply.c:4993 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:4982 +#: apply.c:4996 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:4984 builtin/am.c:2251 +#: apply.c:4998 builtin/am.c:2251 msgid "root" msgstr "rot" -#: apply.c:4985 +#: apply.c:4999 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" -#: archive.c:13 +#: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]" -#: archive.c:14 +#: archive.c:15 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:15 +#: archive.c:16 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" "git archive --remote <arkiv> [--exec <kmd>] [<flaggor>] <träd-igt> " "[<sökväg>...]" -#: archive.c:16 +#: archive.c:17 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299 +#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" -#: archive.c:436 +#: archive.c:446 msgid "fmt" msgstr "fmt" -#: archive.c:436 +#: archive.c:446 msgid "archive format" msgstr "arkivformat" -#: archive.c:437 builtin/log.c:1462 +#: archive.c:447 builtin/log.c:1473 msgid "prefix" msgstr "prefix" -#: archive.c:438 +#: archive.c:448 msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869 -#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554 -#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 +#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126 +#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873 +#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555 +#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119 #: parse-options.h:165 msgid "file" msgstr "fil" -#: archive.c:440 builtin/archive.c:89 +#: archive.c:450 builtin/archive.c:89 msgid "write the archive to this file" msgstr "skriv arkivet till filen" -#: archive.c:442 +#: archive.c:452 msgid "read .gitattributes in working directory" msgstr "läs .gitattributes i arbetskatalogen" -#: archive.c:443 +#: archive.c:453 msgid "report archived files on stderr" msgstr "rapportera arkiverade filer på standard fel" -#: archive.c:444 +#: archive.c:454 msgid "store only" msgstr "endast spara" -#: archive.c:445 +#: archive.c:455 msgid "compress faster" msgstr "komprimera snabbare" -#: archive.c:453 +#: archive.c:463 msgid "compress better" msgstr "komprimera bättre" -#: archive.c:456 +#: archive.c:466 msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111 -#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576 +#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738 msgid "repo" msgstr "arkiv" -#: archive.c:459 builtin/archive.c:91 +#: archive.c:469 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 +#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714 +#: builtin/notes.c:491 msgid "command" msgstr "kommando" -#: archive.c:461 builtin/archive.c:93 +#: archive.c:471 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "sökväg till kommandot git-upload-archive på fjärren" -#: archive.c:468 +#: archive.c:478 msgid "Unexpected option --remote" msgstr "Oväntad flagga --remote" -#: archive.c:470 +#: archive.c:480 msgid "Option --exec can only be used together with --remote" msgstr "Flaggan --exec kan endast användas tillsammans med --remote" -#: archive.c:472 +#: archive.c:482 msgid "Unexpected option --output" msgstr "Oväntad flagga --output" -#: archive.c:494 +#: archive.c:504 #, c-format msgid "Unknown archive format '%s'" msgstr "Okänt arkivformat \"%s\"" -#: archive.c:501 +#: archive.c:511 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumentet stöd inte för formatet \"%s\": -%d" +#: archive-tar.c:125 archive-zip.c:344 +#, c-format +msgid "cannot stream blob %s" +msgstr "kan inte strömma blob:en %s" + +#: archive-tar.c:260 archive-zip.c:361 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "filens läge stöds ej: 0%o (SHA1: %s)" + +#: archive-tar.c:287 archive-zip.c:352 +#, c-format +msgid "cannot read %s" +msgstr "kan inte läsa %s" + +#: archive-tar.c:458 +#, c-format +msgid "unable to start '%s' filter" +msgstr "kunde inte starta filtret \"%s\"" + +#: archive-tar.c:461 +msgid "unable to redirect descriptor" +msgstr "kan inte omdirigera handtag" + +#: archive-tar.c:468 +#, c-format +msgid "'%s' filter reported error" +msgstr "filtret \"%s\" rapporterade fel" + +#: archive-zip.c:313 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "sökvägen är inte giltig UTF-8: %s" + +#: archive-zip.c:317 +#, c-format +msgid "path too long (%d chars, SHA1: %s): %s" +msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s" + +#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219 +#, c-format +msgid "deflate error (%d)" +msgstr "fel i deflate (%d)" + +#: archive-zip.c:605 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>" + #: attr.c:218 #, c-format msgid "%.*s is not a valid attribute name" @@ -868,22 +922,22 @@ msgstr "" "Negativa mönster ignoreras i git-attribut\n" "Använd '\\!' för att inleda med ett utropstecken." -#: bisect.c:460 +#: bisect.c:467 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Felaktigt citerat innehåll i filen \"%s\": %s" -#: bisect.c:668 +#: bisect.c:675 #, c-format msgid "We cannot bisect more!\n" msgstr "Det finns inte mer att göra \"bisect\" på!\n" -#: bisect.c:722 +#: bisect.c:729 #, c-format msgid "Not a valid commit name %s" msgstr "Namnet på incheckningen är inte giltigt: %s" -#: bisect.c:746 +#: bisect.c:753 #, c-format msgid "" "The merge base %s is bad.\n" @@ -892,7 +946,7 @@ msgstr "" "Sammanslagningsbasen %s är trasig.\n" "Det betyder att felet har rättats mellan %s och [%s].\n" -#: bisect.c:751 +#: bisect.c:758 #, c-format msgid "" "The merge base %s is new.\n" @@ -901,7 +955,7 @@ msgstr "" "Sammanslagningsbasen %s är ny.\n" "Egenskapen har ändrats mellan %s och [%s].\n" -#: bisect.c:756 +#: bisect.c:763 #, c-format msgid "" "The merge base %s is %s.\n" @@ -910,7 +964,7 @@ msgstr "" "Sammanslagningsbasen %s är %s.\n" "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n" -#: bisect.c:764 +#: bisect.c:771 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -921,7 +975,7 @@ msgstr "" "git bisect kan inte fungera korrekt i detta fall.\n" "Kanske du skrev fel %s- och %s-revisioner?\n" -#: bisect.c:777 +#: bisect.c:784 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -933,36 +987,36 @@ msgstr "" "%s.\n" "Vi fortsätter ändå." -#: bisect.c:810 +#: bisect.c:817 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisect: en sammanslagningsbas måste testas\n" -#: bisect.c:850 +#: bisect.c:857 #, c-format msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235 +#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: bisect.c:920 +#: bisect.c:927 builtin/merge.c:137 #, c-format msgid "could not read file '%s'" msgstr "kunde inte läsa filen \"%s\"" -#: bisect.c:950 +#: bisect.c:957 msgid "reading bisect refs failed" msgstr "misslyckades läsa bisect-referenser" -#: bisect.c:969 +#: bisect.c:976 #, c-format msgid "%s was both %s and %s\n" msgstr "%s var både %s och %s\n" -#: bisect.c:977 +#: bisect.c:984 #, c-format msgid "" "No testable commit found.\n" @@ -971,7 +1025,7 @@ msgstr "" "Ingen testbar incheckning hittades.\n" "Kanske du startade med felaktiga sökvägsparametrar?\n" -#: bisect.c:996 +#: bisect.c:1003 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -981,52 +1035,53 @@ msgstr[1] "(ungefär %d steg)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1002 +#: bisect.c:1009 #, 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:1758 +#: blame.c:1784 msgid "--contents and --reverse do not blend well." msgstr "--contents och --reverse fungerar inte så bra tillsammans." -#: blame.c:1769 +#: blame.c:1798 msgid "cannot use --contents with final commit object name" msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt" -#: blame.c:1789 +#: blame.c:1819 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:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699 -#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920 -#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370 -#: builtin/shortlog.c:191 +#: blame.c:1828 bundle.c:162 ref-filter.c:2154 sequencer.c:1874 +#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926 +#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404 +#: builtin/pack-objects.c:3029 builtin/pack-objects.c:3044 +#: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" -#: blame.c:1816 +#: blame.c:1846 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:1827 +#: blame.c:1857 #, c-format msgid "no such path %s in %s" msgstr "sökvägen %s i %s finns inte" -#: blame.c:1838 +#: blame.c:1868 #, 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:53 +#: branch.c:52 #, c-format msgid "" "\n" @@ -1039,92 +1094,92 @@ msgstr "" "fjärrspårningsinformationen genom att utföra\n" "\"git branch --set-upstream-to=%s%s%s\"." -#: branch.c:67 +#: branch.c:66 #, 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:93 +#: branch.c:92 #, 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:94 +#: branch.c:93 #, 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:98 +#: branch.c:97 #, 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:99 +#: branch.c:98 #, 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:104 +#: branch.c:103 #, 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:105 +#: branch.c:104 #, 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:109 +#: branch.c:108 #, 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:110 +#: branch.c:109 #, 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:119 +#: branch.c:118 msgid "Unable to write upstream branch configuration" msgstr "Kan inte skriva inställningar för uppströmsgren" -#: branch.c:156 +#: branch.c:155 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "Spårar inte: tvetydig information för referensen %s" -#: branch.c:189 +#: branch.c:188 #, c-format msgid "'%s' is not a valid branch name." msgstr "\"%s\" är inte ett giltigt grennamn." -#: branch.c:208 +#: branch.c:207 #, c-format msgid "A branch named '%s' already exists." msgstr "Det finns redan en gren som heter ”%s”." -#: branch.c:213 +#: branch.c:212 msgid "Cannot force update the current branch." msgstr "Kan inte tvinga uppdatering av aktuell gren." -#: branch.c:233 +#: branch.c:232 #, 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:235 +#: branch.c:234 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte" -#: branch.c:237 +#: branch.c:236 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1144,100 +1199,100 @@ 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:279 #, c-format msgid "Not a valid object name: '%s'." msgstr "Objektnamnet är inte giltigt: \"%s\"." -#: branch.c:300 +#: branch.c:299 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Objektnamnet är tvetydigt: \"%s\"." -#: branch.c:305 +#: branch.c:304 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Avgreningspunkten är inte giltig: ”%s”." -#: branch.c:359 +#: branch.c:358 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "\"%s\" är redan utcheckad på \"%s\"" -#: branch.c:382 +#: branch.c:381 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD i arbetskatalogen %s har inte uppdaterats" -#: bundle.c:34 +#: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' ser inte ut som en v2-bundle-fil" -#: bundle.c:62 +#: bundle.c:64 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750 +#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" -#: bundle.c:139 +#: bundle.c:141 msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:190 +#: bundle.c:192 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Paketet (bundlen) innehåller denna referens:" msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:" -#: bundle.c:197 +#: bundle.c:199 msgid "The bundle records a complete history." msgstr "Paketet (bundlen) beskriver en komplett historik." -#: bundle.c:199 +#: bundle.c:201 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Paketet (bundlen) kräver denna referens:" msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:" -#: bundle.c:258 +#: bundle.c:260 msgid "Could not spawn pack-objects" msgstr "Kunde inte starta pack-objects" -#: bundle.c:269 +#: bundle.c:271 msgid "pack-objects died" msgstr "pack-objects misslyckades" -#: bundle.c:311 +#: bundle.c:313 msgid "rev-list died" msgstr "rev-list dog" -#: bundle.c:360 +#: bundle.c:362 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296 +#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" -#: bundle.c:458 +#: bundle.c:461 msgid "Refusing to create empty bundle." msgstr "Vägrar skapa ett tomt paket (bundle)." -#: bundle.c:470 +#: bundle.c:473 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:498 +#: bundle.c:501 msgid "index-pack died" msgstr "index-pack dog" @@ -1246,18 +1301,39 @@ msgstr "index-pack dog" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465 -#: builtin/am.c:1436 builtin/am.c:2072 +#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466 +#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376 +#: builtin/replace.c:448 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" -#: commit.c:43 +#: commit.c:50 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s är inte en incheckning!" -#: commit.c:1506 +#: commit.c:191 +msgid "" +"Support for <GIT_DIR>/info/grafts is deprecated\n" +"and will be removed in a future Git version.\n" +"\n" +"Please use \"git replace --convert-graft-file\"\n" +"to convert the grafts into replace refs.\n" +"\n" +"Turn this message off by running\n" +"\"git config advice.graftFileDeprecated false\"" +msgstr "" +"Stöd för <GIT_DIR>/info/grafts avråds från och\n" +"kommer tas bort i en framtida version av Git.\n" +"\n" +"Använd \"git replace --convert-graft-file\"\n" +"för att omvandla grafts till ersättningsreferenser.\n" +"\n" +"Slå av detta meddelande genom att skriva\n" +"\"git config advice.graftFileDeprecated false\"" + +#: commit.c:1629 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" @@ -1267,178 +1343,399 @@ 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:83 +#, c-format +msgid "graph file %s is too small" +msgstr "graffilen %s är för liten" + +#: commit-graph.c:90 +#, c-format +msgid "graph signature %X does not match signature %X" +msgstr "grafsignaturen %X stämmer inte med signaturen %X" + +#: commit-graph.c:97 +#, c-format +msgid "graph version %X does not match version %X" +msgstr "grafversionen %X stämmer inte med versionen %X" + +#: commit-graph.c:104 +#, c-format +msgid "hash version %X does not match version %X" +msgstr "hash-versionen %X stämmer inte med versionen %X" + +#: commit-graph.c:128 +#, c-format +msgid "improper chunk offset %08x%08x" +msgstr "felaktigt offset för stycke %08x%08x" + +#: commit-graph.c:164 +#, c-format +msgid "chunk id %08x appears multiple times" +msgstr "stycke-id %08x förekommer flera gånger" + +#: commit-graph.c:261 +#, c-format +msgid "could not find commit %s" +msgstr "kunde inte hitta incheckningen %s" + +#: commit-graph.c:565 builtin/pack-objects.c:2568 +#, c-format +msgid "unable to get type of object %s" +msgstr "kunde inte hämta typ för objektet %s" + +#: commit-graph.c:730 +#, c-format +msgid "error adding pack %s" +msgstr "fel vid tillägg av paketet %s" + +#: commit-graph.c:732 +#, c-format +msgid "error opening index for %s" +msgstr "fel vid öppning av indexet för %s" + +#: commit-graph.c:773 +#, c-format +msgid "the commit graph format cannot write %d commits" +msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar" + +#: commit-graph.c:800 +msgid "too many commits to write graph" +msgstr "för många incheckningar för att skriva graf" + +#: commit-graph.c:806 +#, c-format +msgid "unable to create leading directories of %s" +msgstr "kunde inte skapa inledande kataloger för %s" + +#: commit-graph.c:904 +msgid "the commit-graph file has incorrect checksum and is likely corrupt" +msgstr "" +"filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig" + #: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "minnet slut" -#: config.c:186 +#: config.c:123 +#, c-format +msgid "" +"exceeded maximum include depth (%d) while including\n" +"\t%s\n" +"from\n" +"\t%s\n" +"This might be due to circular includes." +msgstr "" +"överskred maximalt inkluderingsdjup (%d) när\n" +"\t%s\n" +"inkluderades från\n" +"\t%s\n" +"Det kan bero på cirkulära inkluderingar." + +#: config.c:139 +#, c-format +msgid "could not expand include path '%s'" +msgstr "kunde inte expandera inkluderingssökväg \"%s\"" + +#: config.c:150 +msgid "relative config includes must come from files" +msgstr "relativa konfigureringsinkluderingar måste komma från filer" + +#: config.c:190 msgid "relative config include conditionals must come from files" msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer" -#: config.c:720 +#: config.c:348 +#, c-format +msgid "key does not contain a section: %s" +msgstr "nyckeln innehåller inte ett stycke: %s" + +#: config.c:354 +#, c-format +msgid "key does not contain variable name: %s" +msgstr "nyckeln innehåller inte variabelnamn: %s" + +#: config.c:378 sequencer.c:2206 +#, c-format +msgid "invalid key: %s" +msgstr "felaktig nyckel: %s" + +#: config.c:384 +#, c-format +msgid "invalid key (newline): %s" +msgstr "ogiltig nyckel (nyradstecken): %s" + +#: config.c:420 config.c:432 +#, c-format +msgid "bogus config parameter: %s" +msgstr "falsk konfigureringsparameter: %s" + +#: config.c:467 +#, c-format +msgid "bogus format in %s" +msgstr "felaktigt format i %s" + +#: config.c:793 #, c-format msgid "bad config line %d in blob %s" msgstr "felaktig konfigurationsfil rad %d i blob:en %s" -#: config.c:724 +#: config.c:797 #, c-format msgid "bad config line %d in file %s" msgstr "felaktig konfigurationsfil rad %d i filen %s" -#: config.c:728 +#: config.c:801 #, c-format msgid "bad config line %d in standard input" msgstr "felaktig konfigurationsfil rad %d i standard in" -#: config.c:732 +#: config.c:805 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s" -#: config.c:736 +#: config.c:809 #, c-format msgid "bad config line %d in command line %s" msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s" -#: config.c:740 +#: config.c:813 #, c-format msgid "bad config line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:868 +#: config.c:952 msgid "out of range" msgstr "utanför intervallet" -#: config.c:868 +#: config.c:952 msgid "invalid unit" msgstr "ogiltig enhet" -#: config.c:874 +#: config.c:958 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:879 +#: config.c:963 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s" -#: config.c:882 +#: config.c:966 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s" -#: config.c:885 +#: config.c:969 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s" -#: config.c:888 +#: config.c:972 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:" "en %s: %s" -#: config.c:891 +#: config.c:975 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden " "%s: %s" -#: config.c:894 +#: config.c:978 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s" -#: config.c:989 +#: config.c:1073 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:998 +#: config.c:1082 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" -#: config.c:1094 config.c:1105 +#: config.c:1173 +#, c-format +msgid "abbrev length out of range: %d" +msgstr "förkortningslängd utanför intervallet: %d" + +#: config.c:1187 config.c:1198 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:1225 +#: config.c:1290 +msgid "core.commentChar should only be one character" +msgstr "core.commentChar kan bara vara ett tecken" + +#: config.c:1323 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1386 +#: config.c:1403 +#, c-format +msgid "malformed value for %s" +msgstr "felformat värde för %s" + +#: config.c:1429 +#, c-format +msgid "malformed value for %s: %s" +msgstr "felformat värde för %s: %s" + +#: config.c:1430 +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:1489 builtin/pack-objects.c:3279 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1582 +#: config.c:1610 +#, c-format +msgid "unable to load config blob object '%s'" +msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\"" + +#: config.c:1613 +#, c-format +msgid "reference '%s' does not point to a blob" +msgstr "referensen \"%s\" pekar inte på en blob" + +#: config.c:1630 +#, c-format +msgid "unable to resolve config blob '%s'" +msgstr "kan inte slå upp konfigurerings-bloben \"%s\"" + +#: config.c:1660 +#, c-format +msgid "failed to parse %s" +msgstr "kunde inte tolka %s" + +#: config.c:1700 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:1914 +#: config.c:2032 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2101 +#: config.c:2202 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:2144 +#: config.c:2245 #, 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:2170 +#: config.c:2271 #, 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:2195 +#: config.c:2296 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2197 +#: config.c:2298 #, 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:2256 +#: config.c:2379 +#, c-format +msgid "invalid section name '%s'" +msgstr "felaktigt sektionsnamn \"%s\"" + +#: config.c:2411 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2599 config.c:2816 +#: config.c:2440 +#, c-format +msgid "failed to write new configuration file %s" +msgstr "kan inte skriva nya konfigurationsfilen \"%s\"" + +#: config.c:2691 config.c:3015 +#, c-format +msgid "could not lock config file %s" +msgstr "kunde inte låsa konfigurationsfilen %s" + +#: config.c:2702 +#, c-format +msgid "opening %s" +msgstr "öppnar %s" + +#: config.c:2737 builtin/config.c:324 +#, c-format +msgid "invalid pattern: %s" +msgstr "ogiltigt mönster: %s" + +#: config.c:2762 +#, c-format +msgid "invalid config file %s" +msgstr "ogiltig konfigurationsfil: \"%s\"" + +#: config.c:2775 config.c:3028 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:2706 +#: config.c:2786 +#, c-format +msgid "unable to mmap '%s'" +msgstr "kunde inte utföra mmap på \"%s\"" + +#: config.c:2795 config.c:3033 +#, c-format +msgid "chmod on %s failed" +msgstr "chmod misslyckades på %s" + +#: config.c:2880 config.c:3130 +#, c-format +msgid "could not write config file %s" +msgstr "kunde inte skriva konfigurationsfilen %s" + +#: config.c:2914 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:2708 builtin/remote.c:776 +#: config.c:2916 builtin/remote.c:781 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" -#: connect.c:52 -msgid "The remote end hung up upon initial contact" -msgstr "Fjärren lade på vid inledande kontakt" +#: config.c:3006 +#, c-format +msgid "invalid section name: %s" +msgstr "felaktigt namn på stycke: %s" + +#: config.c:3173 +#, c-format +msgid "missing value for '%s'" +msgstr "värde saknas för \"%s\"" + +#: connect.c:61 +msgid "the remote end hung up upon initial contact" +msgstr "fjärren lade på vid inledande kontakt" -#: connect.c:54 +#: connect.c:63 msgid "" "Could not read from remote repository.\n" "\n" @@ -1450,51 +1747,299 @@ msgstr "" "Se till att du har korrekt åtkomstbehörighet\n" "och att arkivet existerar." +#: connect.c:81 +#, c-format +msgid "server doesn't support '%s'" +msgstr "Servern stöder inte \"%s\"" + +#: connect.c:103 +#, c-format +msgid "server doesn't support feature '%s'" +msgstr "servern stöder inte funktionen \"%s\"" + +#: connect.c:114 +msgid "expected flush after capabilities" +msgstr "förväntade \"flush\" efter förmågor" + +#: connect.c:233 +#, c-format +msgid "ignoring capabilities after first line '%s'" +msgstr "ignorerar förmågor efter första raden \"%s\"" + +#: connect.c:252 +msgid "protocol error: unexpected capabilities^{}" +msgstr "protokollfel: förväntade inte capabilities^{}" + +#: connect.c:273 +#, c-format +msgid "protocol error: expected shallow sha-1, got '%s'" +msgstr "protokollfel: förväntade \"shallow sha-1\" fick \"%s\"" + +#: connect.c:275 +msgid "repository on the other end cannot be shallow" +msgstr "arkivet på andra sidan kan inte vara grunt" + +#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63 +#, c-format +msgid "remote error: %s" +msgstr "fjärrfel: %s" + +#: connect.c:316 +msgid "invalid packet" +msgstr "ogiltigt paket" + +#: connect.c:336 +#, c-format +msgid "protocol error: unexpected '%s'" +msgstr "protokollfel: förväntade inte \"%s\"" + +#: connect.c:444 +#, c-format +msgid "invalid ls-refs response: %s" +msgstr "ogiltigt svar på ls-refs: %s" + +#: connect.c:448 +msgid "expected flush after ref listing" +msgstr "oväntad \"flush\" efter ref-listan" + +#: connect.c:547 +#, c-format +msgid "protocol '%s' is not supported" +msgstr "protokollet \"%s\" stöds inte" + +#: connect.c:598 +msgid "unable to set SO_KEEPALIVE on socket" +msgstr "kunde inte sätta SO_KEEPALIVE på uttaget" + +#: connect.c:638 connect.c:701 +#, c-format +msgid "Looking up %s ... " +msgstr "Slår upp %s..." + +#: connect.c:642 +#, c-format +msgid "unable to look up %s (port %s) (%s)" +msgstr "kan inte slå upp %s (port %s) (%s)" + +#. TRANSLATORS: this is the end of "Looking up %s ... " +#: connect.c:646 connect.c:717 +#, c-format +msgid "" +"done.\n" +"Connecting to %s (port %s) ... " +msgstr "" +"klart.\n" +"Ansluter till %s (port %s)..." + +#: connect.c:668 connect.c:745 +#, c-format +msgid "" +"unable to connect to %s:\n" +"%s" +msgstr "" +"kunde inte ansluta till %s:\n" +"%s" + +#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " +#: connect.c:674 connect.c:751 +msgid "done." +msgstr "klart." + +#: connect.c:705 +#, c-format +msgid "unable to look up %s (%s)" +msgstr "kunde inte slå upp %s (%s)" + +#: connect.c:711 +#, c-format +msgid "unknown port %s" +msgstr "okänd port %s" + +#: connect.c:848 connect.c:1174 +#, c-format +msgid "strange hostname '%s' blocked" +msgstr "konstigt värdnamn \"%s\" blockerat" + +#: connect.c:850 +#, c-format +msgid "strange port '%s' blocked" +msgstr "konstig port \"%s\" blockerad" + +#: connect.c:860 +#, c-format +msgid "cannot start proxy %s" +msgstr "kan inte starta mellanserver (proxy) %s" + +#: connect.c:927 +msgid "no path specified; see 'git help pull' for valid url syntax" +msgstr "ingen sökväg angavs; se \"git help pull\" för giltig URL-syntax" + +#: connect.c:1122 +msgid "ssh variant 'simple' does not support -4" +msgstr "ssh-varianten \"simple\" stöder inte -4" + +#: connect.c:1134 +msgid "ssh variant 'simple' does not support -6" +msgstr "ssh-varianten \"simple\" stöder inte -6" + +#: connect.c:1151 +msgid "ssh variant 'simple' does not support setting port" +msgstr "ssh-varianten \"simple\" stöder inte val av port" + +#: connect.c:1262 +#, c-format +msgid "strange pathname '%s' blocked" +msgstr "konstigt sökvägsnamn \"%s\" blockerat" + +#: connect.c:1307 +msgid "unable to fork" +msgstr "kunde inte grena (fork)" + # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144 +#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" -#: connected.c:78 +#: connected.c:80 msgid "Could not run 'git rev-list'" msgstr "Kunde inte köra \"git rev-list\"" -#: connected.c:98 +#: connected.c:100 msgid "failed write to rev-list" msgstr "kunde inte skriva till rev-list" -#: connected.c:105 +#: connected.c:107 msgid "failed to close rev-list's stdin" msgstr "kunde inte stänga rev-list:s standard in" -#: convert.c:205 +#: convert.c:194 #, c-format -msgid "CRLF would be replaced by LF in %s." -msgstr "CRLF skulle ersättas av LF i %s." +msgid "illegal crlf_action %d" +msgstr "felaktig crlf_action %d" #: convert.c:207 #, c-format +msgid "CRLF would be replaced by LF in %s" +msgstr "CRLF skulle ersättas av LF i %s" + +#: convert.c:209 +#, c-format msgid "" "CRLF will be replaced by LF in %s.\n" -"The file will have its original line endings in your working directory." +"The file will have its original line endings in your working directory" msgstr "" "CRLF kommer att ersättas av LF i %s.\n" -"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog." +"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog" -#: convert.c:215 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF skulle ersättas av CRLF i %s" -#: convert.c:217 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" -"The file will have its original line endings in your working directory." +"The file will have its original line endings in your working directory" msgstr "" "LF kommer att ersättas av CRLF i %s.\n" -"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog." +"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog" + +#: convert.c:280 +#, c-format +msgid "BOM is prohibited in '%s' if encoded as %s" +msgstr "BOM är förbjudet i \"%s\" om kodat som %s" + +#: convert.c:287 +#, c-format +msgid "" +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" +"tree-encoding." +msgstr "" +"Filen \"%s\" innehåller byte order mark (BOM). Använd UTF-%s som " +"teckenkodning i arbetskatalogen." + +#: convert.c:305 +#, c-format +msgid "BOM is required in '%s' if encoded as %s" +msgstr "BOM krävs om \"%s\" kodas som %s" + +#: convert.c:307 +#, c-format +msgid "" +"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" +"%sLE (depending on the byte order) as working-tree-encoding." +msgstr "" +"Filen \"%s\" saknar byte order mark (BOM). Använd UTF-%sBE eller UTF-%sLE " +"(beroende på byteordning) som teckenkodning i arbetskatalogen." + +#: convert.c:425 convert.c:496 +#, c-format +msgid "failed to encode '%s' from %s to %s" +msgstr "misslyckades omkoda \"%s\" från %s till %s" + +#: convert.c:468 +#, c-format +msgid "encoding '%s' from %s to %s and back is not the same" +msgstr "" +"omkodning av \"%s\" från %s till %s och tillbaka ger inte samma resultat" + +#: convert.c:674 +#, c-format +msgid "cannot fork to run external filter '%s'" +msgstr "kan inte grena (fork) för att köra externt filter \"%s\"" + +#: convert.c:694 +#, c-format +msgid "cannot feed the input to external filter '%s'" +msgstr "kunde inte skicka indata till externt filter \"%s\"" + +#: convert.c:701 +#, c-format +msgid "external filter '%s' failed %d" +msgstr "externt filter \"%s\" misslyckades %d" + +#: convert.c:736 convert.c:739 +#, c-format +msgid "read from external filter '%s' failed" +msgstr "läsning från externt filter \"%s\" misslyckades" + +#: convert.c:742 convert.c:796 +#, c-format +msgid "external filter '%s' failed" +msgstr "externt filter \"%s\" misslyckades" + +#: convert.c:844 +msgid "unexpected filter type" +msgstr "oväntad filtertyp" + +#: convert.c:855 +msgid "path name too long for external filter" +msgstr "sökvägen för lång för externt filter" + +#: convert.c:929 +#, c-format +msgid "" +"external filter '%s' is not available anymore although not all paths have " +"been filtered" +msgstr "" +"externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar " +"inte har filtrerats" + +#: convert.c:1228 +msgid "true/false are no valid working-tree-encodings" +msgstr "true/false är inte giltig teckenkodning för arbetskatalogen" + +#: convert.c:1402 convert.c:1436 +#, c-format +msgid "%s: clean filter '%s' failed" +msgstr "%s: \"clean\"-filtret \"%s\" misslyckades" + +#: convert.c:1480 +#, c-format +msgid "%s: smudge filter %s failed" +msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades" #: date.c:116 msgid "in the future" @@ -1569,39 +2114,52 @@ msgstr[1] "%<PRIuMAX> år sedan" msgid "failed to read orderfile '%s'" msgstr "kunde inte läsa orderfilen \"%s\"" -#: diffcore-rename.c:535 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" -#: diff.c:74 +#: diff.c:108 #, c-format msgid "option '%s' requires a value" msgstr "flaggan \"%s\" behöver ett värde" -#: diff.c:152 +#: diff.c:158 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n" -#: diff.c:157 +#: diff.c:163 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Okänd dirstat-parameter \"%s\"\n" -#: diff.c:281 +#: diff.c:291 msgid "" -"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " -"'plain'" +"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " +"'dimmed-zebra', 'plain'" msgstr "" "färginställningen för flyttade block måste vara en av \"no\", \"default\", " -"\"zebra\", \"dimmed_zebra\", \"plain\"" +"\"blocks\", \"zebra\", \"dimmed_zebra\", \"plain\"" -#: diff.c:341 +#: diff.c:316 +#, c-format +msgid "ignoring unknown color-moved-ws mode '%s'" +msgstr "ignorerar okänt läge för color-mode-ws \"%s\"" + +#: diff.c:323 +msgid "" +"color-moved-ws: allow-indentation-change cannot be combined with other white " +"space modes" +msgstr "" +"color-moved-ws: allow-indentation-change kan inte kombineras med andra " +"blankstegslägen" + +#: diff.c:394 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:401 +#: diff.c:454 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1610,24 +2168,24 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:3822 +#: diff.c:4096 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:4146 +#: diff.c:4427 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" -#: diff.c:4149 +#: diff.c:4430 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S och --find-object är ömsesidigt uteslutande" -#: diff.c:4237 +#: diff.c:4508 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:4403 +#: diff.c:4674 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1636,46 +2194,61 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:4417 +#: diff.c:4688 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:5493 +#: diff.c:5766 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:5496 +#: diff.c:5769 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:5499 +#: diff.c:5772 #, 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:1866 +#: dir.c:569 +#, 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:958 +#, c-format +msgid "cannot use %s as an exclude file" +msgstr "kan inte använda %s som exkluderingsfil" + +#: dir.c:1873 #, c-format msgid "could not open directory '%s'" msgstr "kunde inte öppna katalogen \"%s\"" -#: dir.c:2108 +#: dir.c:2115 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:2232 -msgid "Untracked cache is disabled on this system or location." -msgstr "Ospårad cache är inaktiverad på systemet eller platsen." +#: dir.c:2239 +msgid "untracked cache is disabled on this system or location" +msgstr "ospårad cache är inaktiverad på systemet eller platsen" + +#: dir.c:3037 +#, c-format +msgid "index file corrupt in repo %s" +msgstr "indexfilen trasig i arkivet %s" -#: dir.c:3024 dir.c:3029 +#: dir.c:3082 dir.c:3087 #, c-format msgid "could not create directories for %s" msgstr "kunde inte skapa kataloger för %s" -#: dir.c:3054 +#: dir.c:3116 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" @@ -1685,214 +2258,272 @@ msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" msgid "hint: Waiting for your editor to close the file...%c" msgstr "tips: Väntar på att textredigeringsprogrammet skall stänga filen...%c" -#: entry.c:177 +#: entry.c:178 msgid "Filtering content" msgstr "Filtrerar innehåll" -#: entry.c:435 +#: entry.c:437 #, c-format msgid "could not stat file '%s'" msgstr "kunde inte ta status på filen \"%s\"" +#: environment.c:150 +#, c-format +msgid "bad git namespace path \"%s\"" +msgstr "felaktig git-namnrymdssökväg \"%s\"" + +#: environment.c:332 +#, c-format +msgid "could not set GIT_DIR to '%s'" +msgstr "kunde inte ställa in GIT_DIR till \"%s\"" + +#: exec-cmd.c:361 +#, c-format +msgid "too many args to run %s" +msgstr "för många flaggor för att köra %s" + #: fetch-object.c:17 msgid "Remote with no URL" msgstr "Fjärr utan URL" -#: fetch-pack.c:253 +#: fetch-pack.c:152 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: förväntade grund lista" -#: fetch-pack.c:265 +#: fetch-pack.c:164 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket" -#: fetch-pack.c:284 builtin/archive.c:63 -#, c-format -msgid "remote error: %s" -msgstr "fjärrfel: %s" - -#: fetch-pack.c:285 +#: fetch-pack.c:184 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\"" -#: fetch-pack.c:337 +#: fetch-pack.c:254 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc kräver ”multi_ack_detailed”" -#: fetch-pack.c:428 +#: fetch-pack.c:342 fetch-pack.c:1257 #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" -#: fetch-pack.c:434 +#: fetch-pack.c:348 fetch-pack.c:1263 #, c-format msgid "invalid unshallow line: %s" msgstr "ogiltig \"unshallow\"-rad: %s" -#: fetch-pack.c:436 +#: fetch-pack.c:350 fetch-pack.c:1265 #, c-format msgid "object not found: %s" msgstr "objektet hittades inte: %s" -#: fetch-pack.c:439 +#: fetch-pack.c:353 fetch-pack.c:1268 #, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" -#: fetch-pack.c:441 +#: fetch-pack.c:355 fetch-pack.c:1270 #, c-format msgid "no shallow found: %s" msgstr "ingen \"shallow\" hittades: %s" -#: fetch-pack.c:444 +#: fetch-pack.c:358 fetch-pack.c:1273 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "förväntade shallow/unshallow, fick %s" -#: fetch-pack.c:485 +#: fetch-pack.c:399 #, c-format msgid "got %s %d %s" msgstr "fick %s %d %s" -#: fetch-pack.c:499 +#: fetch-pack.c:416 #, c-format msgid "invalid commit %s" msgstr "ogiltig incheckning %s" -#: fetch-pack.c:532 +#: fetch-pack.c:447 msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:542 progress.c:229 +#: fetch-pack.c:459 progress.c:229 msgid "done" msgstr "klart" -#: fetch-pack.c:554 +#: fetch-pack.c:471 #, c-format msgid "got %s (%d) %s" msgstr "fick %s (%d) %s" -#: fetch-pack.c:600 +#: fetch-pack.c:517 #, c-format msgid "Marking %s as complete" msgstr "Markerar %s som komplett" -#: fetch-pack.c:788 +#: fetch-pack.c:764 #, c-format msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:829 +#: fetch-pack.c:803 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:837 +#: fetch-pack.c:811 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:895 +#: fetch-pack.c:879 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-patch: kunde inte grena av %s" -#: fetch-pack.c:911 +#: fetch-pack.c:895 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:913 +#: fetch-pack.c:897 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:940 +#: fetch-pack.c:926 msgid "Server does not support shallow clients" msgstr "Servern stöder inte klienter med grunda arkiv" -#: fetch-pack.c:944 +#: fetch-pack.c:930 msgid "Server supports multi_ack_detailed" msgstr "Servern stöder \"multi_ack_detailed\"" -#: fetch-pack.c:947 +#: fetch-pack.c:933 msgid "Server supports no-done" msgstr "Servern stöder \"no-done\"" -#: fetch-pack.c:953 +#: fetch-pack.c:939 msgid "Server supports multi_ack" msgstr "Servern stöder \"multi_ack\"" -#: fetch-pack.c:957 +#: fetch-pack.c:943 msgid "Server supports side-band-64k" msgstr "Servern stöder \"side-band-64k\"" -#: fetch-pack.c:961 +#: fetch-pack.c:947 msgid "Server supports side-band" msgstr "Servern stöder \"side-band\"" -#: fetch-pack.c:965 +#: fetch-pack.c:951 msgid "Server supports allow-tip-sha1-in-want" msgstr "Servern stöder \"allow-tip-sha1-in-want\"" -#: fetch-pack.c:969 +#: fetch-pack.c:955 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Servern stöder \"allow-reachable-sha1-in-want\"" -#: fetch-pack.c:979 +#: fetch-pack.c:965 msgid "Server supports ofs-delta" msgstr "Servern stöder \"ofs-delta\"" -#: fetch-pack.c:985 +#: fetch-pack.c:971 fetch-pack.c:1150 msgid "Server supports filter" msgstr "Servern stöder filter" -#: fetch-pack.c:993 +#: fetch-pack.c:979 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:999 +#: fetch-pack.c:985 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:1003 +#: fetch-pack.c:989 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:1005 +#: fetch-pack.c:991 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:1016 +#: fetch-pack.c:1004 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:1028 +#: fetch-pack.c:1016 fetch-pack.c:1393 msgid "git fetch-pack: fetch failed." msgstr "git fetch-patch: hämtning misslyckades." -#: fetch-pack.c:1190 +#: fetch-pack.c:1145 +msgid "Server does not support shallow requests" +msgstr "Servern stöder inte grunda förfrågningar" + +#: fetch-pack.c:1191 +#, c-format +msgid "error reading section header '%s'" +msgstr "fel vid läsning av styckehuvudet \"%s\"" + +#: fetch-pack.c:1197 +#, c-format +msgid "expected '%s', received '%s'" +msgstr "förväntade \"%s\", tog emot \"%s\"" + +#: fetch-pack.c:1236 +#, c-format +msgid "unexpected acknowledgment line: '%s'" +msgstr "förväntade bekräftelserad: \"%s\"" + +#: fetch-pack.c:1241 +#, c-format +msgid "error processing acks: %d" +msgstr "fel vid hantering av bekräftelser: %d" + +#: fetch-pack.c:1278 +#, c-format +msgid "error processing shallow info: %d" +msgstr "fel vid hantering av grund (\"shallow\") info: %d" + +#: fetch-pack.c:1294 +#, c-format +msgid "expected wanted-ref, got '%s'" +msgstr "förväntade wanted-ref, fick %s" + +#: fetch-pack.c:1304 +#, c-format +msgid "unexpected wanted-ref: '%s'" +msgstr "oväntad wanted-ref: \"%s\"" + +#: fetch-pack.c:1308 +#, c-format +msgid "error processing wanted refs: %d" +msgstr "fel vid hantering av önskade referenser: %d" + +#: fetch-pack.c:1603 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1212 +#: fetch-pack.c:1621 builtin/clone.c:664 +msgid "remote did not send all necessary objects" +msgstr "fjärren sände inte alla nödvändiga objekt" + +#: fetch-pack.c:1647 #, c-format msgid "no such remote ref %s" msgstr "ingen sådan fjärreferens: %s" -#: fetch-pack.c:1215 +#: fetch-pack.c:1650 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s" -#: gpg-interface.c:181 +#: gpg-interface.c:253 msgid "gpg failed to sign the data" msgstr "gpg misslyckades signera data" -#: gpg-interface.c:211 +#: gpg-interface.c:279 msgid "could not create temporary file" msgstr "kunde inte skapa temporära fil" -#: gpg-interface.c:214 +#: gpg-interface.c:282 #, c-format msgid "failed writing detached signature to '%s'" msgstr "misslyckades skriva fristående signatur till \"%s\"" @@ -1902,36 +2533,97 @@ msgstr "misslyckades skriva fristående signatur till \"%s\"" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors" -#: grep.c:2022 +#: grep.c:2115 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81 +#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81 #: builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:2050 +#: grep.c:2143 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" -#: help.c:179 +#: help.c:23 +msgid "start a working area (see also: git help tutorial)" +msgstr "starta arbetskatalog (se också: git help tutorial)" + +#: help.c:24 +msgid "work on the current change (see also: git help everyday)" +msgstr "jobba med aktuell förändring (se också: git help everyday)" + +#: help.c:25 +msgid "examine the history and state (see also: git help revisions)" +msgstr "utforska historiken och tillståndet (se också: git help revisions)" + +#: help.c:26 +msgid "grow, mark and tweak your common history" +msgstr "utöka, markera och justera din gemensamma historik" + +#: help.c:27 +msgid "collaborate (see also: git help workflows)" +msgstr "samarbeta (se också: git help workflows)" + +#: help.c:31 +msgid "Main Porcelain Commands" +msgstr "Huvudsakliga porslinskommandon" + +#: help.c:32 +msgid "Ancillary Commands / Manipulators" +msgstr "Tilläggskommandon / manipulerare" + +#: help.c:33 +msgid "Ancillary Commands / Interrogators" +msgstr "Tilläggskommandon / frågare" + +#: help.c:34 +msgid "Interacting with Others" +msgstr "Interaktion med andra" + +#: help.c:35 +msgid "Low-level Commands / Manipulators" +msgstr "Lågnivåkommandon / maniupulerare" + +#: help.c:36 +msgid "Low-level Commands / Interrogators" +msgstr "Lågnivåkommandon / frågare" + +#: help.c:37 +msgid "Low-level Commands / Synching Repositories" +msgstr "Lågnivåkommandon / synka arkiv" + +#: help.c:38 +msgid "Low-level Commands / Internal Helpers" +msgstr "Lågnivåkommandon / interna hjälpare" + +#: help.c:293 #, c-format msgid "available git commands in '%s'" msgstr "git-kommandon tillgängliga i \"%s\"" -#: help.c:186 +#: help.c:300 msgid "git commands available from elsewhere on your $PATH" msgstr "git-kommandon från andra platser i din $PATH" -#: help.c:217 +#: help.c:309 msgid "These are common Git commands used in various situations:" msgstr "Dessa vanliga Git-kommandon används i olika situationer:" -#: help.c:281 +#: help.c:358 git.c:90 +#, c-format +msgid "unsupported command listing type '%s'" +msgstr "okänd kommandolisttyp \"%s\"" + +#: help.c:405 +msgid "The common Git guides are:" +msgstr "De vanliga Git-vägledningarna är:" + +#: help.c:552 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -1940,32 +2632,32 @@ msgstr "" "\"%s\" verkar vara ett git-kommando, men vi kan inte\n" "köra det. Kanske git-%s är trasigt?" -#: help.c:336 +#: help.c:611 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls." -#: help.c:358 +#: help.c:633 #, 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:363 +#: help.c:638 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Fortsätter under förutsättningen att du menade ”%s”." -#: help.c:368 +#: help.c:643 #, 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:376 +#: help.c:651 #, 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:380 +#: help.c:655 msgid "" "\n" "The most similar command is" @@ -1979,16 +2671,16 @@ msgstr[1] "" "\n" "Mest lika kommandon är" -#: help.c:395 +#: help.c:670 msgid "git version [<options>]" msgstr "git version [<flaggor>]" -#: help.c:462 +#: help.c:738 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:466 +#: help.c:742 msgid "" "\n" "Did you mean this?" @@ -2056,7 +2748,7 @@ msgstr "tomt ident-namn (för <%s>) ej tillåtet" msgid "name consists only of disallowed characters: %s" msgstr "namnet består enbart av ej tillåtna tecken: %s" -#: ident.c:416 builtin/commit.c:582 +#: ident.c:416 builtin/commit.c:600 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" @@ -2094,82 +2786,166 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "Kunde inte skapa \"%s.lock\": %s" -#: merge.c:74 +#: merge.c:40 msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378 -#: builtin/checkout.c:599 builtin/clone.c:759 +#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380 +#: builtin/checkout.c:608 builtin/clone.c:763 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: merge-recursive.c:235 +#: merge-recursive.c:303 msgid "(bad commit)\n" msgstr "(felaktig incheckning)\n" -#: merge-recursive.c:257 merge-recursive.c:265 +#: merge-recursive.c:325 +#, 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:333 #, c-format -msgid "addinfo_cache failed for path '%s'" -msgstr "addinfo_cache misslyckades för sökvägen \"%s\"" +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:329 +#: merge-recursive.c:415 msgid "error building trees" msgstr "fel vid byggande av träd" -#: merge-recursive.c:771 +#: merge-recursive.c:886 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:782 +#: merge-recursive.c:897 #, 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:796 merge-recursive.c:815 +#: merge-recursive.c:911 merge-recursive.c:930 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:805 +#: merge-recursive.c:920 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:847 builtin/cat-file.c:37 +#: merge-recursive.c:962 builtin/cat-file.c:39 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:849 +#: merge-recursive.c:964 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:873 +#: merge-recursive.c:988 #, c-format msgid "failed to open '%s': %s" msgstr "misslyckades öppna \"%s\": %s" -#: merge-recursive.c:884 +#: merge-recursive.c:999 #, c-format msgid "failed to symlink '%s': %s" msgstr "misslyckades skapa symboliska länken \"%s\": %s" -#: merge-recursive.c:889 +#: merge-recursive.c:1004 #, 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:1029 +#: merge-recursive.c:1191 +#, c-format +msgid "Failed to merge submodule %s (not checked out)" +msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)" + +#: merge-recursive.c:1198 +#, c-format +msgid "Failed to merge submodule %s (commits not present)" +msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)" + +#: merge-recursive.c:1205 +#, 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:1213 merge-recursive.c:1225 +#, c-format +msgid "Fast-forwarding submodule %s to the following commit:" +msgstr "Snabbspolar undermodulen %s till följande incheckning:" + +#: merge-recursive.c:1216 merge-recursive.c:1228 +#, c-format +msgid "Fast-forwarding submodule %s" +msgstr "Snabbspolar undermodulen %s" + +#: merge-recursive.c:1250 +#, 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:1254 +#, c-format +msgid "Failed to merge submodule %s (not fast-forward)" +msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)" + +#: merge-recursive.c:1255 +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:1258 +#, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"Om detta är riktigt lägger du bara till det i indexet, till\n" +"exempel så här:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"vilket godtar lösningen.\n" + +#: merge-recursive.c:1267 +#, c-format +msgid "Failed to merge submodule %s (multiple merges found)" +msgstr "" +"Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)" + +#: merge-recursive.c:1326 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:1034 +#: merge-recursive.c:1331 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:1146 +#: merge-recursive.c:1363 +#, c-format +msgid "Auto-merging %s" +msgstr "Slår ihop %s automatiskt" + +#: merge-recursive.c:1434 +#, 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:1501 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2178,7 +2954,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:1151 +#: merge-recursive.c:1506 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2187,7 +2963,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:1158 +#: merge-recursive.c:1513 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2196,7 +2972,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:1163 +#: merge-recursive.c:1518 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2205,20 +2981,31 @@ 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:1197 +#: merge-recursive.c:1552 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1197 +#: merge-recursive.c:1552 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1254 +#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394 +#: merge-recursive.c:3129 +#, c-format +msgid "Refusing to lose dirty file at %s" +msgstr "Vägrar förlora lortig fil vid \"%s\"" + +#: merge-recursive.c:1620 #, 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:1279 +#: merge-recursive.c:1625 +#, 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:1651 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2227,144 +3014,196 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1284 +#: merge-recursive.c:1656 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1346 +#: merge-recursive.c:1720 #, 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:1379 +#: merge-recursive.c:1759 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Byter namn på %s till %s och %s till %s istället" -#: merge-recursive.c:1582 +#: merge-recursive.c:1771 +#, 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:1977 +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to place %s because " +"directory %s was renamed to multiple other directories, with no destination " +"getting a majority of the files." +msgstr "" +"KONFLIKT (namnändrad delad katalog): Osäker på var %s skall placeras då " +"katalogen %s bytte namn till flera andra kataloger, utan att någon " +"destination fick en majoritet av filerna." + +#: merge-recursive.c:2009 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " +"implicit directory rename(s) putting the following path(s) there: %s." +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:2019 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " +"implicit directory renames tried to put these paths there: %s" +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:2111 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" +">%s in %s" +msgstr "" +"KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog " +"%s->%s i %s" + +#: merge-recursive.c:2356 +#, c-format +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "" +"VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har " +"bytt namn." + +#: merge-recursive.c:2762 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s" -#: merge-recursive.c:1597 +#: merge-recursive.c:2777 #, c-format msgid "Adding merged %s" msgstr "Lägger till sammanslagen %s" -#: merge-recursive.c:1604 merge-recursive.c:1834 +#: merge-recursive.c:2784 merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:1661 +#: merge-recursive.c:2941 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:1664 +#: merge-recursive.c:2944 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:1733 +#: merge-recursive.c:3013 msgid "modify" msgstr "ändra" -#: merge-recursive.c:1733 +#: merge-recursive.c:3013 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:1743 +#: merge-recursive.c:3024 msgid "content" msgstr "innehåll" -#: merge-recursive.c:1750 +#: merge-recursive.c:3031 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:1786 +#: merge-recursive.c:3076 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:1800 -#, c-format -msgid "Auto-merging %s" -msgstr "Slår ihop %s automatiskt" - -#: merge-recursive.c:1804 git-submodule.sh:879 +#: merge-recursive.c:3098 git-submodule.sh:865 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:1805 +#: merge-recursive.c:3099 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:1899 +#: merge-recursive.c:3221 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:1925 +#: merge-recursive.c:3247 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:1931 +#: merge-recursive.c:3253 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:1938 +#: merge-recursive.c:3260 #, 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:1947 +#: merge-recursive.c:3269 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:1987 +#: merge-recursive.c:3303 #, c-format -msgid "Dirty index: cannot merge (dirty: %s)" -msgstr "Smutsigt index: kan inte slå ihop (smutsiga: %s)" +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Dina lokala ändringar av följande filer skulle skrivas över av " +"sammanslagning:\n" +" %s" -#: merge-recursive.c:1991 +#: merge-recursive.c:3314 msgid "Already up to date!" msgstr "Redan à jour!" -#: merge-recursive.c:2000 +#: merge-recursive.c:3323 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:2097 +#: merge-recursive.c:3422 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:2110 +#: merge-recursive.c:3435 #, 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:2149 +#: merge-recursive.c:3474 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:2212 +#: merge-recursive.c:3540 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816 +#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." -#: notes-merge.c:272 +#: notes-merge.c:274 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -2376,21 +3215,21 @@ msgstr "" "att checka in eller avbryta föregående sammanslagning innan du påbörjar en " "ny antecknings-sammanslagning." -#: notes-merge.c:279 +#: notes-merge.c:281 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)." -#: notes-utils.c:43 +#: notes-utils.c:45 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd" -#: notes-utils.c:102 +#: notes-utils.c:104 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Felaktigt värde för notes.rewriteMode: '%s'" -#: notes-utils.c:112 +#: notes-utils.c:114 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" @@ -2399,35 +3238,55 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" #. the environment variable, the second %s is #. its value. #. -#: notes-utils.c:142 +#: notes-utils.c:144 #, c-format msgid "Bad %s value: '%s'" msgstr "Felaktigt värde på %s: \"%s\"" -#: object.c:239 +#: object.c:54 +#, c-format +msgid "invalid object type \"%s\"" +msgstr "ogiltig objekttyp \"%s\"" + +#: object.c:173 +#, c-format +msgid "object %s is a %s, not a %s" +msgstr "objektet %s är en %s, inte en %s" + +#: object.c:233 +#, c-format +msgid "object %s has unknown type id %d" +msgstr "objektet %s har okänd typ-id %d" + +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" -#: packfile.c:561 +#: object.c:266 object.c:277 +#, c-format +msgid "sha1 mismatch %s" +msgstr "sha1 stämmer inte överens %s" + +#: packfile.c:563 msgid "offset before end of packfile (broken .idx?)" msgstr "offset före slutet av packfilen (trasig .idx?)" -#: packfile.c:1694 +#: packfile.c:1745 #, 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:1698 +#: packfile.c:1749 #, 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:619 +#: parse-options.c:672 msgid "..." msgstr "..." -#: parse-options.c:638 +#: parse-options.c:691 #, c-format msgid "usage: %s" msgstr "användning: %s" @@ -2435,26 +3294,31 @@ msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:644 +#: parse-options.c:697 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:647 +#: parse-options.c:700 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:686 +#: parse-options.c:739 msgid "-NUM" msgstr "-TAL" -#: parse-options-cb.c:108 +#: parse-options-cb.c:44 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "trasigt utlöpsdatum: ”%s”" + +#: parse-options-cb.c:112 #, c-format msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: path.c:891 +#: path.c:892 #, c-format msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för gruppen" @@ -2533,11 +3397,71 @@ 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 +msgid "flush packet write failed" +msgstr "fel vid skrivning av \"flush\"-paket" + +#: pkt-line.c:142 pkt-line.c:228 +msgid "protocol error: impossibly long line" +msgstr "protokollfel: omöjligt lång rad" + +#: pkt-line.c:158 pkt-line.c:160 +msgid "packet write with format failed" +msgstr "paketskrivning med format misslyckades" + +#: pkt-line.c:192 +msgid "packet write failed - data exceeds max packet size" +msgstr "paketskrivning misslyckades - data överskrider maximal paketstorlek" + +#: pkt-line.c:199 pkt-line.c:206 +msgid "packet write failed" +msgstr "paketskrivning misslyckades" + +#: pkt-line.c:291 +msgid "read error" +msgstr "läsfel" + +#: pkt-line.c:299 +msgid "the remote end hung up unexpectedly" +msgstr "fjärren lade på oväntat" + +#: pkt-line.c:327 +#, c-format +msgid "protocol error: bad line length character: %.4s" +msgstr "protokollfel: felaktig radlängdstecken: %.4s" + +#: pkt-line.c:337 pkt-line.c:342 +#, c-format +msgid "protocol error: bad line length %d" +msgstr "protokollfel: felaktig radlängd: %d" + #: pretty.c:962 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" -#: read-cache.c:1473 +#: range-diff.c:48 +msgid "could not start `log`" +msgstr "kunde inte starta \"log\"" + +#: range-diff.c:51 +msgid "could not read `log` output" +msgstr "kunde inte läsa utdata från \"log\"" + +#: range-diff.c:66 sequencer.c:4540 +#, c-format +msgid "could not parse commit '%s'" +msgstr "kunde inte tolka incheckningen\" %s\"" + +#: range-diff.c:196 +msgid "failed to generate diff" +msgstr "misslyckades skapa diff" + +#: range-diff.c:421 range-diff.c:423 +#, c-format +msgid "could not parse log for '%s'" +msgstr "kunde inte tolka loggen för \"%s\"" + +#: read-cache.c:1579 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2546,7 +3470,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1483 +#: read-cache.c:1589 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2555,221 +3479,329 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049 +#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627 +#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" -#: read-cache.c:2461 +#: read-cache.c:2666 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte öppna git-katalog: %s" -#: read-cache.c:2473 +#: read-cache.c:2678 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort länken: %s" +#: refs.c:192 +#, c-format +msgid "%s does not point to a valid object!" +msgstr "\"%s\" pekar inte på ett giltigt objekt!" + +#: refs.c:579 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "ignorerar dinglande symbolisk referens %s" + +#: refs.c:581 ref-filter.c:2067 +#, c-format +msgid "ignoring broken ref %s" +msgstr "ignorerar trasig referens %s" + +#: refs.c:685 +#, c-format +msgid "could not open '%s' for writing: %s" +msgstr "kunde inte öppna \"%s\" för skrivning: %s" + +#: refs.c:695 refs.c:746 +#, c-format +msgid "could not read ref '%s'" +msgstr "Kunde inte läsa referensen \"%s\"" + +#: refs.c:701 +#, c-format +msgid "ref '%s' already exists" +msgstr "referensen \"%s\" finns redan" + #: refs.c:706 #, c-format -msgid "Could not open '%s' for writing" -msgstr "Kunde inte öppna \"%s\" för skrivning" +msgid "unexpected object ID when writing '%s'" +msgstr "oväntat objekt-id vid skrivning \"%s\"" -#: refs.c:1850 +#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492 +#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564 +#: wrapper.c:656 +#, c-format +msgid "could not write to '%s'" +msgstr "kunde inte skriva till \"%s\"" + +#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:780 +#, c-format +msgid "could not open '%s' for writing" +msgstr "kunde inte öppna \"%s\" för skrivning" + +#: refs.c:748 +#, c-format +msgid "unexpected object ID when deleting '%s'" +msgstr "oväntat objekt-id vid borttagning \"%s\"" + +#: refs.c:879 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "loggen för referensen %s har lucka efter %s" + +#: refs.c:885 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "loggen för referensen %s slutade oväntat på %s" + +#: refs.c:943 +#, c-format +msgid "log for %s is empty" +msgstr "loggen för %s är tom" + +#: refs.c:1035 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "vägrar uppdatera referens med trasigt namn \"%s\"" + +#: refs.c:1111 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "update_ref misslyckades för referensen \"%s\": %s" + +#: refs.c:1853 +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "flera uppdateringar för referensen \"%s\" tillåts inte" + +#: refs.c:1885 msgid "ref updates forbidden inside quarantine environment" msgstr "referensuppdateringar förbjudna i karantänmiljö" -#: refs/files-backend.c:1189 +#: refs.c:1981 refs.c:2011 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "\"%s\" finns; kan inte skapa \"%s\"" + +#: refs.c:1987 refs.c:2022 +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt" + +#: refs/files-backend.c:1191 #, c-format msgid "could not remove reference %s" msgstr "kunde inte ta bort referensen %s" -#: refs/files-backend.c:1203 refs/packed-backend.c:1528 -#: refs/packed-backend.c:1538 +#: refs/files-backend.c:1205 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:1206 refs/packed-backend.c:1541 +#: refs/files-backend.c:1208 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" -#: ref-filter.c:35 wt-status.c:1842 +#: refspec.c:137 +#, c-format +msgid "invalid refspec '%s'" +msgstr "felaktig referensspecifikation: \"%s\"" + +#: ref-filter.c:38 wt-status.c:1850 msgid "gone" msgstr "försvunnen" -#: ref-filter.c:36 +#: ref-filter.c:39 #, c-format msgid "ahead %d" msgstr "före %d" -#: ref-filter.c:37 +#: ref-filter.c:40 #, c-format msgid "behind %d" msgstr "bakom %d" -#: ref-filter.c:38 +#: ref-filter.c:41 #, c-format msgid "ahead %d, behind %d" msgstr "före %d, bakom %d" -#: ref-filter.c:107 +#: ref-filter.c:137 #, c-format msgid "expected format: %%(color:<color>)" msgstr "förväntat format: %%(color:<color>)" -#: ref-filter.c:109 +#: ref-filter.c:139 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "okänd färg: %%(color:%s)" -#: ref-filter.c:129 +#: ref-filter.c:161 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Heltalsvärde förväntades refname:lstrip=%s" -#: ref-filter.c:133 +#: ref-filter.c:165 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Heltalsvärde förväntades refname:rstrip=%s" -#: ref-filter.c:135 +#: ref-filter.c:167 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "okänt %%(%s)-argument: %s" -#: ref-filter.c:184 +#: ref-filter.c:222 +#, c-format +msgid "%%(objecttype) does not take arguments" +msgstr "%%(objecttype) tar inte argument" + +#: ref-filter.c:234 +#, c-format +msgid "%%(objectsize) does not take arguments" +msgstr "%%(objectsize) tar inte argument" + +#: ref-filter.c:246 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) tar inte argument" -#: ref-filter.c:191 +#: ref-filter.c:255 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) tar inte argument" -#: ref-filter.c:209 +#: ref-filter.c:275 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "okänt %%(trailers)-argument: %s" -#: ref-filter.c:232 +#: ref-filter.c:304 #, c-format msgid "positive value expected contents:lines=%s" msgstr "positivt värde förväntat contents:lines=%s" -#: ref-filter.c:234 +#: ref-filter.c:306 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "okänt %%(contents)-argument: %s" -#: ref-filter.c:247 +#: ref-filter.c:321 #, c-format msgid "positive value expected objectname:short=%s" msgstr "positivt värde förväntat objectname:short=%s" -#: ref-filter.c:251 +#: ref-filter.c:325 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "okänt %%(objectname)-argument: %s" -#: ref-filter.c:278 +#: ref-filter.c:355 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "förväntat format: %%(align:<bredd>,<position>)" -#: ref-filter.c:290 +#: ref-filter.c:367 #, c-format msgid "unrecognized position:%s" msgstr "okänd position:%s" -#: ref-filter.c:294 +#: ref-filter.c:374 #, c-format msgid "unrecognized width:%s" msgstr "okänd bredd:%s" -#: ref-filter.c:300 +#: ref-filter.c:383 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "okänt %%(align)-argument: %s" -#: ref-filter.c:304 +#: ref-filter.c:391 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "positiv bredd förväntad med atomen %%(align)" -#: ref-filter.c:319 +#: ref-filter.c:409 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "okänt %%(if)-argument: %s" -#: ref-filter.c:409 +#: ref-filter.c:505 #, c-format msgid "malformed field name: %.*s" msgstr "felformat fältnamn: %.*s" -#: ref-filter.c:435 +#: ref-filter.c:532 #, c-format msgid "unknown field name: %.*s" msgstr "okänt fältnamn: %.*s" -#: ref-filter.c:547 +#: ref-filter.c:656 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: atomen %%(if) använd utan en %%(then)-atom" -#: ref-filter.c:607 +#: ref-filter.c:719 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: atomen %%(then) använd utan en %%(if)-atom" -#: ref-filter.c:609 +#: ref-filter.c:721 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: atomen %%(then) använd mer än en gång" -#: ref-filter.c:611 +#: ref-filter.c:723 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atomen %%(then) använd efter %%(else)" -#: ref-filter.c:637 +#: ref-filter.c:751 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: atomen %%(else) använd utan en %%(if)-atom" -#: ref-filter.c:639 +#: ref-filter.c:753 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format: atomen %%(else) använd utan en %%(then)-atom" -#: ref-filter.c:641 +#: ref-filter.c:755 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format: atomen %%(else) använd mer än en gång" -#: ref-filter.c:654 +#: ref-filter.c:770 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: atomen %%(end) använd utan motsvarande atom" -#: ref-filter.c:709 +#: ref-filter.c:827 #, c-format msgid "malformed format string %s" msgstr "felformad formatsträng %s" -#: ref-filter.c:1313 +#: ref-filter.c:1416 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: ref-filter.c:1316 +#: ref-filter.c:1419 +#, c-format +msgid "(no branch, rebasing detached HEAD %s)" +msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)" + +#: ref-filter.c:1422 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" @@ -2777,7 +3809,7 @@ msgstr "(ingen gren, \"bisect\" startad på %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1324 +#: ref-filter.c:1430 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD frånkopplat vid %s)" @@ -2785,147 +3817,142 @@ msgstr "(HEAD frånkopplat vid %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1331 +#: ref-filter.c:1437 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD frånkopplat från %s)" -#: ref-filter.c:1335 +#: ref-filter.c:1441 msgid "(no branch)" msgstr "(ingen gren)" -#: ref-filter.c:1364 +#: ref-filter.c:1475 ref-filter.c:1623 #, c-format msgid "missing object %s for %s" msgstr "objektet %s saknas för %s" -#: ref-filter.c:1367 +#: ref-filter.c:1483 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer misslyckades på %s för %s" -#: ref-filter.c:1819 +#: ref-filter.c:1980 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:1886 +#: ref-filter.c:2062 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:1891 -#, c-format -msgid "ignoring broken ref %s" -msgstr "ignorerar trasig referens %s" - -#: ref-filter.c:2152 +#: ref-filter.c:2340 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:2246 +#: ref-filter.c:2444 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: remote.c:795 +#: remote.c:606 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Kan inte hämta både %s och %s till %s" -#: remote.c:799 +#: remote.c:610 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spårar vanligtvis %s, inte %s" -#: remote.c:803 +#: remote.c:614 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#: remote.c:811 +#: remote.c:622 msgid "Internal error" msgstr "Internt fel" -#: remote.c:1726 remote.c:1828 +#: remote.c:1536 remote.c:1637 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: remote.c:1735 +#: remote.c:1545 #, c-format msgid "no such branch: '%s'" msgstr "okänd gren: \"%s\"" -#: remote.c:1738 +#: remote.c:1548 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppström angiven för grenen \"%s\"" -#: remote.c:1744 +#: remote.c:1554 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren" -#: remote.c:1759 +#: remote.c:1569 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren" -#: remote.c:1771 +#: remote.c:1581 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "grenen \"%s\" har ingen fjärr för \"push\"" -#: remote.c:1782 +#: remote.c:1591 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\"" -#: remote.c:1795 +#: remote.c:1604 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mål (push.default är \"ingenting\")" -#: remote.c:1817 +#: remote.c:1626 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mål" -#: remote.c:2132 +#: remote.c:1951 #, 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:2136 +#: remote.c:1955 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:2139 +#: remote.c:1958 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:2143 +#: remote.c:1962 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n" -#: remote.c:2146 +#: remote.c:1965 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (använd \"%s\" för detaljer)\n" -#: remote.c:2150 +#: remote.c:1969 #, 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:2156 +#: remote.c:1975 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:2159 +#: remote.c:1978 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2935,11 +3962,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2167 +#: remote.c:1986 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:2170 +#: remote.c:1989 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2954,28 +3981,43 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2180 +#: remote.c:1999 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n" -#: revision.c:2277 +#: replace-object.c:20 +#, c-format +msgid "bad replace ref name: %s" +msgstr "felaktig ersättningsreferensnamn: %s" + +#: replace-object.c:29 +#, c-format +msgid "duplicate replace ref: %s" +msgstr "duplicerat ersättningsreferensnamn: %s" + +#: replace-object.c:72 +#, c-format +msgid "replace depth too high for object %s" +msgstr "ersättningsdjupet för högt för objektet %s" + +#: revision.c:2305 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2280 +#: revision.c:2308 #, 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:2477 +#: revision.c:2505 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" -#: run-command.c:731 +#: run-command.c:728 msgid "open /dev/null failed" msgstr "misslyckades öppna /dev/null" -#: run-command.c:1274 +#: run-command.c:1271 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -2984,29 +4026,29 @@ msgstr "" "Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n" "Du kan inaktivera varningen med \"git config advice.ignoredHook false\"." -#: send-pack.c:141 +#: send-pack.c:142 msgid "unexpected flush packet while reading remote unpack status" msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus" -#: send-pack.c:143 +#: send-pack.c:144 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "kunde inte tolka fjärruppackningsstatus: %s" -#: send-pack.c:145 +#: send-pack.c:146 #, c-format msgid "remote unpack failed: %s" msgstr "fjärruppackning misslyckades: %s" -#: send-pack.c:308 +#: send-pack.c:309 msgid "failed to sign the push certificate" msgstr "misslyckades underteckna push-certifikatet" -#: send-pack.c:421 +#: send-pack.c:422 msgid "the receiving end does not support --signed push" msgstr "mottagarsidan stöder inte push med --signed" -#: send-pack.c:423 +#: send-pack.c:424 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -3014,37 +4056,42 @@ msgstr "" "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --" "signed" -#: send-pack.c:435 +#: send-pack.c:436 msgid "the receiving end does not support --atomic push" msgstr "mottagarsidan stöder inte push med --atomic" -#: send-pack.c:440 +#: send-pack.c:441 msgid "the receiving end does not support push options" msgstr "mottagarsidan stöder inte push-flaggor" -#: sequencer.c:158 +#: sequencer.c:177 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\"" -#: sequencer.c:267 +#: sequencer.c:278 +#, c-format +msgid "could not delete '%s'" +msgstr "kunde inte ta bort \"%s\"" + +#: sequencer.c:304 msgid "revert" msgstr "revert" -#: sequencer.c:269 +#: sequencer.c:306 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:271 +#: sequencer.c:308 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:273 +#: sequencer.c:310 #, c-format -msgid "Unknown action: %d" -msgstr "Okänd funktion: %d" +msgid "unknown action: %d" +msgstr "okänd funktion: %d" -#: sequencer.c:330 +#: sequencer.c:367 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -3052,7 +4099,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:333 +#: sequencer.c:370 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -3062,43 +4109,39 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:346 sequencer.c:2245 +#: sequencer.c:383 sequencer.c:2488 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264 -#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656 -#, c-format -msgid "could not write to '%s'" -msgstr "kunde inte skriva till \"%s\"" - -#: sequencer.c:353 +#: sequencer.c:390 #, c-format msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252 +#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508 +#: sequencer.c:2741 #, c-format msgid "failed to finalize '%s'" msgstr "misslyckades färdigställa \"%s\"" -#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259 -#: builtin/commit.c:722 builtin/merge.c:1047 +#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391 +#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740 +#: builtin/merge.c:1081 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: sequencer.c:405 +#: sequencer.c:444 #, c-format msgid "your local changes would be overwritten by %s." msgstr "dina lokala ändringar skulle skrivas över av %s." -#: sequencer.c:409 +#: sequencer.c:448 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:438 +#: sequencer.c:477 #, c-format msgid "%s: fast-forward" msgstr "%s: snabbspola" @@ -3106,20 +4149,35 @@ msgstr "%s: snabbspola" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:526 +#: sequencer.c:566 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:542 +#: sequencer.c:582 +msgid "unable to update cache tree" +msgstr "kan inte uppdatera cacheträd" + +#: sequencer.c:595 msgid "could not resolve HEAD commit" msgstr "kunde inte bestämma HEAD:s incheckning" -#: sequencer.c:562 -msgid "unable to update cache tree" -msgstr "kan inte uppdatera cacheträd" +#: sequencer.c:723 sequencer.c:740 +#, c-format +msgid "could not parse '%s' (looking for '%s')" +msgstr "kunde inte tolka \"%s\" (letar efter \"%s\")" + +#: sequencer.c:731 +#, c-format +msgid "bad quoting on %s value in '%s'" +msgstr "felaktig citering på %s-värde i \"%s\"" + +#: sequencer.c:747 +#, c-format +msgid "invalid date format '%s' in '%s'" +msgstr "ogiltigt datumformat \"%s\" i \"%s\"" -#: sequencer.c:658 +#: sequencer.c:761 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3148,11 +4206,15 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:915 +#: sequencer.c:830 +msgid "writing root commit" +msgstr "skriver rotincheckning" + +#: sequencer.c:1055 msgid "'prepare-commit-msg' hook failed" msgstr "kroken \"prepare-commit-msg\" misslyckades" -#: sequencer.c:922 +#: sequencer.c:1062 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3179,7 +4241,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:935 +#: sequencer.c:1075 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3204,329 +4266,344 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:975 +#: sequencer.c:1115 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: sequencer.c:977 +#: sequencer.c:1117 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: sequencer.c:1023 +#: sequencer.c:1163 msgid "unable to resolve HEAD after creating commit" msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning" -#: sequencer.c:1025 +#: sequencer.c:1165 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: sequencer.c:1029 +#: sequencer.c:1169 msgid " (root-commit)" msgstr " (rotincheckning)" -#: sequencer.c:1050 +#: sequencer.c:1190 msgid "could not parse HEAD" msgstr "kunde inte tolka HEAD" -#: sequencer.c:1052 +#: sequencer.c:1192 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s är inte en incheckning!" -#: sequencer.c:1056 builtin/commit.c:1491 +#: sequencer.c:1196 builtin/commit.c:1528 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: sequencer.c:1107 sequencer.c:1673 +#: sequencer.c:1247 sequencer.c:1845 msgid "unable to parse commit author" msgstr "kunde inte tolka incheckningens författare" -#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643 +#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: sequencer.c:1134 sequencer.c:1186 +#: sequencer.c:1274 sequencer.c:1329 #, c-format msgid "unable to read commit message from '%s'" msgstr "kunde inte läsa incheckningsmeddelande från \"%s\"" -#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826 -#: builtin/merge.c:851 +#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855 +#: builtin/merge.c:880 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: sequencer.c:1213 +#: sequencer.c:1356 #, c-format msgid "could not parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: sequencer.c:1218 +#: sequencer.c:1361 #, c-format msgid "could not parse parent commit %s" msgstr "kunde inte tolka föräldraincheckningen %s" -#: sequencer.c:1347 +#: sequencer.c:1457 sequencer.c:1565 #, c-format -msgid "" -"unexpected 1st line of squash message:\n" -"\n" -"\t%.*s" -msgstr "" -"oväntad första rad i squash-meddelande:\n" -"\n" -"\t%.*s" - -#: sequencer.c:1353 -#, c-format -msgid "" -"invalid 1st line of squash message:\n" -"\n" -"\t%.*s" -msgstr "" -"ogiltig första rad i squash-meddelande:\n" -"\n" -"\t%.*s" +msgid "unknown command: %d" +msgstr "okänt kommando: %d" -#: sequencer.c:1359 sequencer.c:1384 +#: sequencer.c:1512 sequencer.c:1537 #, c-format msgid "This is a combination of %d commits." msgstr "Det här är en kombination av %d incheckningar." -#: sequencer.c:1368 sequencer.c:3265 +#: sequencer.c:1522 sequencer.c:4520 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:1370 +#: sequencer.c:1524 sequencer.c:2768 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:1372 +#: sequencer.c:1526 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:1378 +#: sequencer.c:1532 #, c-format msgid "cannot write '%s'" msgstr "kan inte skriva \"%s\"" -#: sequencer.c:1387 git-rebase--interactive.sh:452 +#: sequencer.c:1539 git-rebase--preserve-merges.sh:441 msgid "This is the 1st commit message:" msgstr "Det här är 1:a incheckningsmeddelandet:" -#: sequencer.c:1395 +#: sequencer.c:1547 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:1402 +#: sequencer.c:1554 #, c-format msgid "This is the commit message #%d:" msgstr "Det här är incheckningsmeddelande %d:" -#: sequencer.c:1407 +#: sequencer.c:1560 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Incheckningsmeddelande %d kommer hoppas över:" -#: sequencer.c:1412 -#, c-format -msgid "unknown command: %d" -msgstr "okänt kommando: %d" - -#: sequencer.c:1479 +#: sequencer.c:1643 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:1498 +#: sequencer.c:1650 +msgid "cannot fixup root commit" +msgstr "kan inte göra \"fixup\" på rotincheckning" + +#: sequencer.c:1669 #, 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:1506 +#: sequencer.c:1677 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:1510 +#: sequencer.c:1681 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning." -#: sequencer.c:1516 +#: sequencer.c:1687 #, 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:1535 +#: sequencer.c:1706 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:1600 sequencer.c:2397 +#: sequencer.c:1771 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:1654 +#: sequencer.c:1826 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:1655 +#: sequencer.c:1827 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:1702 -msgid "empty commit set passed" -msgstr "den angivna uppsättningen incheckningar är tom" - -#: sequencer.c:1712 +#: sequencer.c:1885 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:1718 +#: sequencer.c:1892 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:1792 +#: sequencer.c:1972 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s tar inte argument: \"%s\"" -#: sequencer.c:1801 +#: sequencer.c:1981 #, c-format msgid "missing arguments for %s" msgstr "argument saknas för %s" -#: sequencer.c:1844 +#: sequencer.c:2040 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:1852 +#: sequencer.c:2048 #, c-format msgid "cannot '%s' without a previous commit" msgstr "kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091 +#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333 #, c-format msgid "could not read '%s'." msgstr "kunde inte läsa \"%s\"." -#: sequencer.c:1906 +#: sequencer.c:2119 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:1908 +#: sequencer.c:2121 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: ”%s”" -#: sequencer.c:1913 +#: sequencer.c:2126 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:1924 +#: sequencer.c:2137 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:1926 +#: sequencer.c:2139 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:1993 -#, c-format -msgid "invalid key: %s" -msgstr "felaktig nyckel: %s" - -#: sequencer.c:1996 +#: sequencer.c:2209 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:2062 +#: sequencer.c:2285 +msgid "unusable squash-onto" +msgstr "oanvändbar squash-onto" + +#: sequencer.c:2301 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: ”%s”" -#: sequencer.c:2100 +#: sequencer.c:2335 sequencer.c:3775 +msgid "empty commit set passed" +msgstr "den angivna uppsättningen incheckningar är tom" + +#: sequencer.c:2343 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:2101 +#: sequencer.c:2344 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:2104 +#: sequencer.c:2347 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:2118 +#: sequencer.c:2361 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:2173 sequencer.c:2761 +#: sequencer.c:2416 sequencer.c:3543 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:2175 +#: sequencer.c:2418 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:2177 sequencer.c:2212 +#: sequencer.c:2420 sequencer.c:2455 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:2198 builtin/grep.c:720 +#: sequencer.c:2441 builtin/grep.c:721 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:2200 +#: sequencer.c:2443 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:2201 +#: sequencer.c:2444 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:2207 +#: sequencer.c:2450 #, 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:2218 +#: sequencer.c:2461 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:2324 sequencer.c:2679 +#: sequencer.c:2565 sequencer.c:3461 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:2362 sequencer.c:2659 +#: sequencer.c:2603 sequencer.c:3441 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:2402 builtin/difftool.c:639 +#: sequencer.c:2618 +#, c-format +msgid "unable to copy '%s' to '%s'" +msgstr "kan inte kopiera in \"%s\" till \"%s\"" + +#: sequencer.c:2626 +#, c-format +msgid "" +"You can amend the commit now, with\n" +"\n" +" git commit --amend %s\n" +"\n" +"Once you are satisfied with your changes, run\n" +"\n" +" git rebase --continue\n" +msgstr "" +"Du kan utöka incheckningen nu, med\n" +"\n" +"\tgit commit --amend %s\n" +"\n" +"När du är nöjd med dina ändringar kör du\n" +"\n" +"\tgit rebase --continue\n" + +#: sequencer.c:2636 +#, c-format +msgid "Could not apply %s... %.*s" +msgstr "Kunde inte tillämpa %s... %.*s" + +#: sequencer.c:2643 +#, c-format +msgid "Could not merge %.*s" +msgstr "Kunde inte slå ihop %.*s" + +#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:2421 +#: sequencer.c:2680 sequencer.c:3095 msgid "could not read index" msgstr "kunde inte läsa indexet" -#: sequencer.c:2426 +#: sequencer.c:2685 #, c-format msgid "" "execution failed: %s\n" @@ -3541,11 +4618,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:2432 +#: sequencer.c:2691 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:2438 +#: sequencer.c:2697 #, c-format msgid "" "execution succeeded: %s\n" @@ -3562,17 +4639,81 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:2497 +#: sequencer.c:2758 +#, c-format +msgid "illegal label name: '%.*s'" +msgstr "ogiltigt etikettnamn: \"%.*s\"" + +#: sequencer.c:2810 +msgid "writing fake root commit" +msgstr "skriver fejkad rotincheckning" + +#: sequencer.c:2815 +msgid "writing squash-onto" +msgstr "skriver squash-onto" + +#: sequencer.c:2850 +#, c-format +msgid "failed to find tree of %s" +msgstr "kunde inte hitta trädet för %s." + +#: sequencer.c:2868 +msgid "could not write index" +msgstr "kunde inte skriva indexet" + +#: sequencer.c:2895 +#, c-format +msgid "could not resolve '%s'" +msgstr "kunde inte upplösa \"%s\"" + +#: sequencer.c:2921 +msgid "cannot merge without a current revision" +msgstr "kan inte slå ihop utan en aktuell incheckning" + +#: sequencer.c:2943 +#, c-format +msgid "unable to parse '%.*s'" +msgstr "kan inte tolka \"%.*s\"" + +#: sequencer.c:2952 +#, c-format +msgid "nothing to merge: '%.*s'" +msgstr "inget att slå samman: \"%.*s\"" + +#: sequencer.c:2964 +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:2979 +#, c-format +msgid "could not get commit message of '%s'" +msgstr "kunde inte läsa incheckningsmeddelande för \"%s\"" + +#: sequencer.c:2989 sequencer.c:3015 +#, c-format +msgid "could not write '%s'" +msgstr "kunde inte skriva \"%s\"" + +#: sequencer.c:3127 +#, c-format +msgid "could not even attempt to merge '%.*s'" +msgstr "kunde inte ens försöka slå ihop \"%.*s\"" + +#: sequencer.c:3143 +msgid "merge: Unable to write new index file" +msgstr "sammanslagning: Kunde inte skriva ny indexfil" + +#: sequencer.c:3211 #, c-format msgid "Applied autostash.\n" msgstr "Tillämpade autostash.\n" -#: sequencer.c:2509 +#: sequencer.c:3223 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:2512 git-rebase.sh:178 +#: sequencer.c:3226 git-rebase.sh:188 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3583,52 +4724,69 @@ 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:2595 +#: sequencer.c:3257 +#, c-format +msgid "" +"Could not execute the todo command\n" +"\n" +" %.*s\n" +"It has been rescheduled; To edit the command before continuing, please\n" +"edit the todo list first:\n" +"\n" +" git rebase --edit-todo\n" +" git rebase --continue\n" +msgstr "" +"Kunde inte köra todo-kommandot\n" +"\n" +" %.*s\n" +"Det har lagts tillbaka i kön; För att redigera kommandot innan du\n" +"fortsätter, redigera först attgöra-listan:\n" +"\n" +" git rebase --edit-todo\n" +" git rebase --continue\n" + +#: sequencer.c:3325 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:2637 +#: sequencer.c:3404 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:2667 +#: sequencer.c:3449 msgid "could not read orig-head" msgstr "kunde inte läsa orig-head" -#: sequencer.c:2672 sequencer.c:3262 +#: sequencer.c:3454 sequencer.c:4517 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:2686 +#: sequencer.c:3468 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:2770 +#: sequencer.c:3554 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:2775 -msgid "could not remove CHERRY_PICK_HEAD" -msgstr "kunde inte ta bort CHERRY_PICK_HEAD" - -#: sequencer.c:2784 +#: sequencer.c:3563 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:2786 +#: sequencer.c:3565 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:2788 +#: sequencer.c:3567 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:2791 +#: sequencer.c:3570 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3638,45 +4796,54 @@ msgstr "" "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" "först och kör sedan \"git rebase --continute\" igen." -#: sequencer.c:2801 +#: sequencer.c:3595 sequencer.c:3633 +#, c-format +msgid "could not write file: '%s'" +msgstr "kunde inte skriva fil: \"%s\"" + +#: sequencer.c:3648 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "kunde inte ta bort CHERRY_PICK_HEAD" + +#: sequencer.c:3655 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:2881 +#: sequencer.c:3752 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen ”%s”" -#: sequencer.c:2885 +#: sequencer.c:3756 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:2918 +#: sequencer.c:3791 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" -#: sequencer.c:3023 +#: sequencer.c:4238 msgid "make_script: unhandled options" msgstr "make_script: flaggor som inte stöds" -#: sequencer.c:3026 +#: sequencer.c:4241 msgid "make_script: error preparing revisions" msgstr "make_script: fel när revisioner skulle förberedas" -#: sequencer.c:3060 sequencer.c:3095 +#: sequencer.c:4281 sequencer.c:4337 #, c-format msgid "unusable todo list: '%s'" msgstr "oanvändbar todo-lista: %s" -#: sequencer.c:3146 +#: sequencer.c:4396 #, 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:3212 +#: sequencer.c:4466 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -3685,7 +4852,7 @@ msgstr "" "Varning: vissa incheckningar kan av misstag ha tappats.\n" "Tappade incheckningar (nyaste först):\n" -#: sequencer.c:3219 +#: sequencer.c:4473 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3705,7 +4872,7 @@ msgstr "" "\" (fel).\n" "\n" -#: sequencer.c:3231 +#: sequencer.c:4486 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -3716,27 +4883,16 @@ msgstr "" "continue\".\n" "Avbryt ombaseringen med \"git rebase --abort\".\n" -#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing" -msgstr "kunde inte öppna \"%s\" för skrivning" - -#: sequencer.c:3285 -#, c-format -msgid "could not parse commit '%s'" -msgstr "kunde inte tolka incheckningen\" %s\"" - -#: sequencer.c:3401 +#: sequencer.c:4660 msgid "the script was already rearranged." msgstr "skriptet har redan omordnats." -#: setup.c:122 +#: setup.c:123 #, c-format msgid "'%s' is outside repository" msgstr "\"%s\" är utanför arkivet" -#: setup.c:171 +#: setup.c:172 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -3746,7 +4902,7 @@ msgstr "" "Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns " "lokalt." -#: setup.c:184 +#: setup.c:185 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3758,12 +4914,12 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:233 +#: setup.c:234 #, 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:252 +#: setup.c:253 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3774,92 +4930,92 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:388 +#: setup.c:389 msgid "unable to set up work tree using invalid config" msgstr "kan inte skapa arbetskatalog med felaktig konfiguration" -#: setup.c:395 +#: setup.c:393 msgid "this operation must be run in a work tree" msgstr "funktionen måste köras i en arbetskatalog" -#: setup.c:506 +#: setup.c:503 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Förväntade git-arkivversion <= %d, hittade %d" -#: setup.c:514 +#: setup.c:511 msgid "unknown repository extensions found:" msgstr "okända arkivutökningar hittades:" -#: setup.c:533 +#: setup.c:530 #, c-format msgid "error opening '%s'" msgstr "fel vid öppning av \"%s\"" -#: setup.c:535 +#: setup.c:532 #, 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:537 +#: setup.c:534 #, c-format msgid "error reading %s" msgstr "fel vid läsning av %s" -#: setup.c:539 +#: setup.c:536 #, c-format msgid "invalid gitfile format: %s" msgstr "ogiltigt gitfilformat: %s" -#: setup.c:541 +#: setup.c:538 #, c-format msgid "no path in gitfile: %s" msgstr "ingen sökväg i gitfil: %s" -#: setup.c:543 +#: setup.c:540 #, c-format msgid "not a git repository: %s" msgstr "inte ett git-arkiv: %s" -#: setup.c:642 +#: setup.c:639 #, c-format msgid "'$%s' too big" msgstr "\"$%s\" för stor" -#: setup.c:656 +#: setup.c:653 #, c-format msgid "not a git repository: '%s'" msgstr "inte ett git-arkiv: \"%s\"" -#: setup.c:685 setup.c:687 setup.c:718 +#: setup.c:682 setup.c:684 setup.c:715 #, c-format msgid "cannot chdir to '%s'" msgstr "kan inte byta katalog (chdir) till \"%s\"" -#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818 +#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815 msgid "cannot come back to cwd" msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)" -#: setup.c:816 +#: setup.c:813 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "inte ett git-arkiv (eller någon av föräldrakatalogerna): %s" -#: setup.c:827 +#: setup.c:824 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "misslyckades ta status på \"%*ss%s%s\"" -#: setup.c:1057 +#: setup.c:1054 msgid "Unable to read current working directory" msgstr "Kan inte läsa aktuell arbetskatalog" -#: setup.c:1069 setup.c:1075 +#: setup.c:1066 setup.c:1072 #, c-format msgid "cannot change to '%s'" msgstr "kan inte byta till \"%s\"" -#: setup.c:1088 +#: setup.c:1085 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -3869,7 +5025,7 @@ msgstr "" "monteringspunkten %s)\n" "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." -#: setup.c:1172 +#: setup.c:1168 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3878,53 +5034,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:1215 +#: setup.c:1211 msgid "open /dev/null or dup failed" msgstr "misslyckades öppna /dev/null eller \"dup\"" -#: setup.c:1230 +#: setup.c:1226 msgid "fork failed" msgstr "\"fork\" misslyckades" -#: setup.c:1235 +#: setup.c:1231 msgid "setsid failed" msgstr "\"setsid\" misslyckades" -#: sha1_file.c:592 +#: sha1-file.c:381 +#, 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:432 +#, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "kunde inte normalisera alternativ objektsökväg: %s" + +#: sha1-file.c:503 +#, c-format +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "%s: ignorerar alternativa objektlagringar, för djup nästling" + +#: sha1-file.c:510 +#, c-format +msgid "unable to normalize object directory: %s" +msgstr "kan inte normalisera objektkatalogen: %s" + +#: sha1-file.c:565 +msgid "unable to fdopen alternates lockfile" +msgstr "kan inte utföra \"fdopen\" på låsfil för \"alternates\"" + +#: sha1-file.c:583 +msgid "unable to read alternates file" +msgstr "kan inte läsa \"alternates\"-filen" + +#: sha1-file.c:590 +msgid "unable to move new alternates file into place" +msgstr "kan inte flytta ny \"alternates\"-fil på plats" + +#: sha1-file.c:625 #, c-format msgid "path '%s' does not exist" msgstr "sökvägen \"%s\" finns inte" -#: sha1_file.c:618 +#: sha1-file.c:651 #, 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:624 +#: sha1-file.c:657 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: sha1_file.c:630 +#: sha1-file.c:663 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: sha1_file.c:638 +#: sha1-file.c:671 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: sha1_name.c:422 +#: sha1-file.c:781 +#, 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:806 +msgid "mmap failed" +msgstr "mmap misslyckades" + +#: sha1-file.c:973 +#, c-format +msgid "object file %s is empty" +msgstr "objektfilen %s är tom" + +#: sha1-file.c:1093 sha1-file.c:2206 +#, c-format +msgid "corrupt loose object '%s'" +msgstr "trasigt löst objekt \"%s\"" + +#: sha1-file.c:1095 sha1-file.c:2210 +#, c-format +msgid "garbage at end of loose object '%s'" +msgstr "skräp i slutet av löst objekt \"%s\"" + +#: sha1-file.c:1137 +msgid "invalid object type" +msgstr "felaktig objekttyp" + +#: sha1-file.c:1219 +#, 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:1222 +#, c-format +msgid "unable to unpack %s header" +msgstr "kan inte packa upp %s-huvudet" + +#: sha1-file.c:1228 +#, 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:1231 +#, c-format +msgid "unable to parse %s header" +msgstr "kan inte tolka %s-huvud" + +#: sha1-file.c:1422 +#, c-format +msgid "failed to read object %s" +msgstr "misslyckades läsa objektet %s" + +#: sha1-file.c:1426 +#, c-format +msgid "replacement %s not found for %s" +msgstr "ersättningen %s hittades inte för %s" + +#: sha1-file.c:1430 +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "löst objekt %s (lagrat i %s) är trasigt" + +#: sha1-file.c:1434 +#, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "packat objekt %s (lagrat i %s) är trasigt" + +#: sha1-file.c:1536 +#, c-format +msgid "unable to write sha1 filename %s" +msgstr "kan inte skriva sha1-filnamn %s" + +#: sha1-file.c:1543 +#, c-format +msgid "unable to set permission to '%s'" +msgstr "kan inte sätta behörigheten till \"%s\"" + +#: sha1-file.c:1550 +msgid "file write error" +msgstr "fel vid skrivning av fil" + +#: sha1-file.c:1569 +msgid "error when closing sha1 file" +msgstr "fel vid stängning av sha1-fil" + +#: sha1-file.c:1635 +#, 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:1637 +msgid "unable to create temporary file" +msgstr "kan inte skapa temporär fil" + +#: sha1-file.c:1661 +msgid "unable to write sha1 file" +msgstr "kan inte skriva sha1-filen" + +#: sha1-file.c:1667 +#, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)" + +#: sha1-file.c:1671 +#, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "\"deflateend\" på objektet %s misslyckades (%d)" + +#: sha1-file.c:1675 +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "förvirrad av instabil objektkälldata för %s" + +#: sha1-file.c:1685 builtin/pack-objects.c:899 +#, c-format +msgid "failed utime() on %s" +msgstr "\"utime()\" misslyckades på %s" + +#: sha1-file.c:1760 +#, c-format +msgid "cannot read sha1_file for %s" +msgstr "kan inte läsa sha1_file för %s" + +#: sha1-file.c:1805 +msgid "corrupt commit" +msgstr "trasik incheckning" + +#: sha1-file.c:1813 +msgid "corrupt tag" +msgstr "trasig tagg" + +#: sha1-file.c:1906 +#, c-format +msgid "read error while indexing %s" +msgstr "läsfel vid indexering av %s" + +#: sha1-file.c:1909 +#, c-format +msgid "short read while indexing %s" +msgstr "för lite lästes vid indexering av %s" + +#: sha1-file.c:1980 sha1-file.c:1989 +#, c-format +msgid "%s: failed to insert into database" +msgstr "%s: misslyckades lägga in i databasen" + +#: sha1-file.c:1995 +#, c-format +msgid "%s: unsupported file type" +msgstr "%s: filtypen stöds ej" + +#: sha1-file.c:2019 +#, c-format +msgid "%s is not a valid object" +msgstr "%s är inte ett giltigt objekt" + +#: sha1-file.c:2021 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s är inte ett giltigt \"%s\"-objekt" + +#: sha1-file.c:2048 builtin/index-pack.c:158 +#, c-format +msgid "unable to open %s" +msgstr "kan inte öppna %s" + +#: sha1-file.c:2217 sha1-file.c:2269 +#, c-format +msgid "sha1 mismatch for %s (expected %s)" +msgstr "sha1 stämmer inte för %s (förväntade %s)" + +#: sha1-file.c:2241 +#, c-format +msgid "unable to mmap %s" +msgstr "kan inte utföra \"mmap\" för %s" + +#: sha1-file.c:2246 +#, c-format +msgid "unable to unpack header of %s" +msgstr "kan inte packa upp huvud för %s" + +#: sha1-file.c:2252 +#, c-format +msgid "unable to parse header of %s" +msgstr "kan inte tolka huvud för %s" + +#: sha1-file.c:2263 +#, c-format +msgid "unable to unpack contents of %s" +msgstr "kan inte tolka innehåll i %s" + +#: sha1-name.c:444 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "kort SHA1 %s är tvetydig" -#: sha1_name.c:433 +#: sha1-name.c:455 msgid "The candidates are:" msgstr "Kandidaterna är:" -#: sha1_name.c:693 +#: sha1-name.c:699 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" @@ -3946,71 +5327,81 @@ msgstr "" "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n" "genom att köra \"git config advice.objectNameWarning false\"" -#: submodule.c:96 submodule.c:130 +#: submodule.c:97 submodule.c:131 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Kan inte ändra .gitmodules-fil som inte slagits ihop, lös " "sammanslagningskonflikter först" -#: submodule.c:100 submodule.c:134 +#: submodule.c:101 submodule.c:135 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s" -#: submodule.c:108 +#: submodule.c:109 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Kunde inte uppdatera .gitmodules-posten %s" -#: submodule.c:141 +#: submodule.c:142 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Kunde inte ta bort .gitmodules-posten för %s" -#: submodule.c:152 +#: submodule.c:153 msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:312 +#: submodule.c:315 #, c-format msgid "in unpopulated submodule '%s'" msgstr "i ej utcheckad undermodul \"%s\"" -#: submodule.c:343 +#: submodule.c:346 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" -#: submodule.c:833 +#: submodule.c:839 #, 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:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724 +#: submodule.c:1071 builtin/branch.c:670 builtin/submodule--helper.c:1888 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens." -#: submodule.c:1370 +#: submodule.c:1377 #, c-format msgid "'%s' not recognized as a git repository" msgstr "\"%s\" känns inte igen som ett git-arkiv" -#: submodule.c:1508 +#: submodule.c:1515 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "kunde inte starta \"git status\" i undermodulen \"%s\"" -#: submodule.c:1521 +#: submodule.c:1528 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "kunde inte köra \"git status\" i undermodulen \"%s\"" -#: submodule.c:1614 +#: submodule.c:1543 +#, 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:1633 #, c-format msgid "submodule '%s' has dirty index" msgstr "undermodulen \"%s\" har ett smutsigt index" -#: submodule.c:1878 +#: submodule.c:1685 +#, c-format +msgid "Submodule '%s' could not be updated." +msgstr "Undermoduler \"%s\" kunde inte uppdateras." + +#: submodule.c:1734 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -4018,18 +5409,18 @@ msgstr "" "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " "stöds ej" -#: submodule.c:1890 submodule.c:1946 +#: submodule.c:1746 submodule.c:1802 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" -#: submodule.c:1894 builtin/submodule--helper.c:1246 -#: builtin/submodule--helper.c:1256 +#: submodule.c:1750 builtin/submodule--helper.c:1406 +#: builtin/submodule--helper.c:1416 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: submodule.c:1897 +#: submodule.c:1753 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -4040,29 +5431,30 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:1981 +#: submodule.c:1837 #, c-format msgid "could not recurse into submodule '%s'" msgstr "kunde inte rekursera in i undermodulen \"%s\"" -#: submodule.c:2025 +#: submodule.c:1881 msgid "could not start ls-files in .." msgstr "kunde inte starta ls-files i .." -#: submodule.c:2045 -msgid "BUG: returned path string doesn't match cwd?" -msgstr "BUG: returnerad sökvägssträng matchar inte cwd?" - -#: submodule.c:2064 +#: submodule.c:1920 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en oväntad returkod %d" -#: submodule-config.c:263 +#: submodule-config.c:231 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "ignorerar misstänkt undermodulnamn: %s" + +#: submodule-config.c:295 msgid "negative values not allowed for submodule.fetchjobs" msgstr "negativa värden är inte tillåtna för submodule.fetchjobs" -#: submodule-config.c:436 +#: submodule-config.c:468 #, c-format msgid "invalid value for %s" msgstr "ogiltigt värde för %s" @@ -4078,7 +5470,7 @@ msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\"" msgid "unknown value '%s' for key '%s'" msgstr "okänt värde \"%s\" för nyckeln \"%s\"" -#: trailer.c:539 trailer.c:544 builtin/remote.c:290 +#: trailer.c:539 trailer.c:544 builtin/remote.c:294 #, c-format msgid "more than one %s" msgstr "mer än en %s" @@ -4097,7 +5489,7 @@ msgstr "kunde inte läsa indatafilen \"%s\"" msgid "could not read from stdin" msgstr "kunde inte läsa från standard in" -#: trailer.c:1008 builtin/am.c:46 +#: trailer.c:1008 builtin/am.c:47 #, c-format msgid "could not stat %s" msgstr "kunde inte ta status på %s" @@ -4121,17 +5513,44 @@ msgstr "kunde inte öppna temporär fil" msgid "could not rename temporary file to %s" msgstr "kunde inte byta namn på temporär fil till %s" -#: transport.c:63 +#: transport.c:116 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n" -#: transport.c:152 +#: transport.c:142 +#, c-format +msgid "could not read bundle '%s'" +msgstr "kunde inte läsa paketet (bundlen) \"%s\"" + +#: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: ogiltig flagga för depth: ”%s”" -#: transport.c:916 +#: transport.c:586 +msgid "could not parse transport.color.* config" +msgstr "kunde inte tolka inställningen för transport.color.*" + +#: transport.c:659 +msgid "support for protocol v2 not implemented yet" +msgstr "stöd för protokoll v2 ännu ej implementerat" + +#: transport.c:785 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "okänt värde för inställningen \"%s\": %s" + +#: transport.c:851 +#, c-format +msgid "transport '%s' not allowed" +msgstr "transporten \"%s\" tillåts inte" + +#: transport.c:903 +msgid "git-over-rsync is no longer supported" +msgstr "git-over-rsync stöds inte längre" + +#: transport.c:998 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -4140,7 +5559,7 @@ msgstr "" "Följande undermodulsökvägar innehåller ändringar som\n" "inte kan hittas av fjärrarna:\n" -#: transport.c:920 +#: transport.c:1002 #, c-format msgid "" "\n" @@ -4167,32 +5586,209 @@ msgstr "" "för att sända dem till fjärren.\n" "\n" -#: transport.c:928 +#: transport.c:1010 msgid "Aborting." msgstr "Avbryter." -#: transport-helper.c:1079 +#: transport.c:1148 +msgid "failed to push all needed submodules" +msgstr "kunde inte sända alla nödvändiga undermoduler" + +#: transport.c:1270 transport-helper.c:643 +msgid "operation not supported by protocol" +msgstr "funktionen stöds inte av protokollet" + +#: transport.c:1352 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "felaktig rad vid tolkning av alternativa referenser: %s" + +#: transport-helper.c:51 transport-helper.c:80 +msgid "full write to remote helper failed" +msgstr "komplett skrivning till fjärrhjälpare misslyckades" + +#: transport-helper.c:132 +#, 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 +msgid "can't dup helper output fd" +msgstr "kunde inte duplicera utdata-filhandtag" + +#: transport-helper.c:199 +#, c-format +msgid "" +"unknown mandatory capability %s; this remote helper probably needs newer " +"version of Git" +msgstr "" +"okänd krävd förmåga (capability) %s; fjärrhjälparen behöver antagligen en " +"nyare version av Git" + +#: transport-helper.c:205 +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 +#, c-format +msgid "%s unexpectedly said: '%s'" +msgstr "%s sade oväntat: \"%s\"" + +#: transport-helper.c:401 +#, c-format +msgid "%s also locked %s" +msgstr "%s låste också %s" + +#: transport-helper.c:479 +msgid "couldn't run fast-import" +msgstr "kunde inte köra fast-import" + +#: transport-helper.c:502 +msgid "error while running fast-import" +msgstr "fel när fast-import kördes" + +#: transport-helper.c:531 transport-helper.c:1091 +#, c-format +msgid "could not read ref %s" +msgstr "kunde inte läsa referensen %s" + +#: transport-helper.c:576 +#, c-format +msgid "unknown response to connect: %s" +msgstr "okänt svar på ansluntning: %s" + +#: transport-helper.c:598 +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 +msgid "invalid remote service path" +msgstr "felaktig sökväg till fjärrtjänst" + +#: transport-helper.c:646 +#, c-format +msgid "can't connect to subservice %s" +msgstr "kan inte ansluta till undertjänsten %s" + +#: transport-helper.c:713 +#, c-format +msgid "expected ok/error, helper said '%s'" +msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\"" + +#: transport-helper.c:766 +#, c-format +msgid "helper reported unexpected status of %s" +msgstr "hjälparen returnerade oväntad status %s" + +#: transport-helper.c:827 +#, c-format +msgid "helper %s does not support dry-run" +msgstr "hjälparen %s stöder inte dry-run" + +#: transport-helper.c:830 +#, c-format +msgid "helper %s does not support --signed" +msgstr "hjälparen %s stöder inte --signed" + +#: transport-helper.c:833 +#, c-format +msgid "helper %s does not support --signed=if-asked" +msgstr "hjälparen %s stöder inte --signed=if-asked" + +#: transport-helper.c:840 +#, c-format +msgid "helper %s does not support 'push-option'" +msgstr "hjälparen %s stöder inte \"push-option\"" + +#: transport-helper.c:932 +msgid "remote-helper doesn't support push; refspec needed" +msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs" + +#: transport-helper.c:937 +#, c-format +msgid "helper %s does not support 'force'" +msgstr "hjälparen %s stöder inte \"force\"" + +#: transport-helper.c:984 +msgid "couldn't run fast-export" +msgstr "kunde inte köra fast-export" + +#: transport-helper.c:989 +msgid "error while running fast-export" +msgstr "fel vid körning av fast-export" + +#: transport-helper.c:1014 +#, c-format +msgid "" +"No refs in common and none specified; doing nothing.\n" +"Perhaps you should specify a branch such as 'master'.\n" +msgstr "" +"Inga gemensamma referenser och inga angavs; gör inget.\n" +"Du kanske borde ange en gren såsom \"master\".\n" + +#: transport-helper.c:1077 +#, c-format +msgid "malformed response in ref list: %s" +msgstr "felformat svar i referenslistan: %s" + +#: transport-helper.c:1230 +#, c-format +msgid "read(%s) failed" +msgstr "läs(%s) misslyckades" + +#: transport-helper.c:1257 #, c-format -msgid "Could not read ref %s" -msgstr "Kunde inte läsa referensen %s" +msgid "write(%s) failed" +msgstr "skriv(%s) misslyckades" -#: tree-walk.c:31 +#: transport-helper.c:1306 +#, c-format +msgid "%s thread failed" +msgstr "%s-tråden misslyckades" + +#: transport-helper.c:1310 +#, c-format +msgid "%s thread failed to join: %s" +msgstr "%s-tråden misslyckades ansluta: %s" + +#: transport-helper.c:1329 transport-helper.c:1333 +#, 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:1370 +#, c-format +msgid "%s process failed to wait" +msgstr "processen %s misslyckades vänta" + +#: transport-helper.c:1374 +#, c-format +msgid "%s process failed" +msgstr "processen %s misslyckades" + +#: transport-helper.c:1392 transport-helper.c:1401 +msgid "can't start thread for copying data" +msgstr "kan inte skapa tråd för kopiering av data" + +#: tree-walk.c:33 msgid "too-short tree object" msgstr "trädobjekt för kort" -#: tree-walk.c:37 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "felformat läge i trädpost" -#: tree-walk.c:41 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "tomt filnamn i trädpost" -#: tree-walk.c:114 +#: tree-walk.c:115 msgid "too-short tree file" msgstr "trädfil för kort" -#: unpack-trees.c:108 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -4201,7 +5797,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:110 +#: unpack-trees.c:114 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -4210,7 +5806,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%s" -#: unpack-trees.c:113 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4220,7 +5816,7 @@ msgstr "" "sammanslagning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:115 +#: unpack-trees.c:119 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4230,7 +5826,7 @@ msgstr "" "sammanslagning:\n" "%%s" -#: unpack-trees.c:118 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4239,7 +5835,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"." -#: unpack-trees.c:120 +#: unpack-trees.c:124 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4248,7 +5844,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:125 +#: unpack-trees.c:129 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -4258,7 +5854,7 @@ msgstr "" "dem:\n" "%s" -#: unpack-trees.c:129 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4267,7 +5863,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:131 +#: unpack-trees.c:135 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4276,7 +5872,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%s" -#: unpack-trees.c:134 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4286,7 +5882,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du slår samman." -#: unpack-trees.c:136 +#: unpack-trees.c:140 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4296,7 +5892,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:139 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4305,7 +5901,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%sFlytta eller ta bort dem innan du \"%s\"." -#: unpack-trees.c:141 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4314,7 +5910,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%s" -#: unpack-trees.c:146 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4325,7 +5921,7 @@ msgstr "" "utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:148 +#: unpack-trees.c:153 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4336,7 +5932,7 @@ msgstr "" "utcheckningen:\n" "%%s" -#: unpack-trees.c:151 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4346,7 +5942,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:153 +#: unpack-trees.c:158 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4356,7 +5952,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:156 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4365,7 +5961,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%sFlytta eller ta bort dem innan du \"%s\"." -#: unpack-trees.c:158 +#: unpack-trees.c:163 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4374,12 +5970,12 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:165 +#: unpack-trees.c:171 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda." -#: unpack-trees.c:168 +#: unpack-trees.c:174 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -4388,7 +5984,7 @@ msgstr "" "Kan inte uppdatera gles utcheckning: följande poster är inte à jour:\n" "%s" -#: unpack-trees.c:170 +#: unpack-trees.c:176 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4399,7 +5995,7 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:172 +#: unpack-trees.c:178 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4410,7 +6006,7 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:174 +#: unpack-trees.c:180 #, c-format msgid "" "Cannot update submodule:\n" @@ -4419,12 +6015,12 @@ msgstr "" "Kan inte uppdatera undermodul:\n" "%s" -#: unpack-trees.c:251 +#: unpack-trees.c:254 #, c-format msgid "Aborting\n" msgstr "Avbryter\n" -#: unpack-trees.c:333 +#: unpack-trees.c:336 msgid "Checking out files" msgstr "Checkar ut filer" @@ -4492,8 +6088,8 @@ msgstr "\"%s\" pekar inte tillbaka till \"%s\"" msgid "could not open '%s' for reading and writing" msgstr "kunde inte öppna \"%s\" för läsning och skrivning" -#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 -#: builtin/am.c:862 builtin/merge.c:1044 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:321 builtin/am.c:771 +#: builtin/am.c:863 builtin/merge.c:1078 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" @@ -4507,155 +6103,155 @@ msgstr "kan inte komma åt \"%s\"" msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" -#: wt-status.c:151 +#: wt-status.c:154 msgid "Unmerged paths:" msgstr "Ej sammanslagna sökvägar:" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:181 wt-status.c:208 #, 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:180 wt-status.c:207 +#: wt-status.c:183 wt-status.c:210 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:184 +#: wt-status.c:187 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (använd \"git add <fil>...\" för att ange lösning)" -#: wt-status.c:186 wt-status.c:190 +#: wt-status.c:189 wt-status.c:193 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:188 +#: wt-status.c:191 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:199 wt-status.c:1007 +#: wt-status.c:202 wt-status.c:1015 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:217 wt-status.c:1016 +#: wt-status.c:220 wt-status.c:1024 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" -#: wt-status.c:221 +#: wt-status.c:224 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:223 +#: wt-status.c:226 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:224 +#: wt-status.c:227 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:226 +#: wt-status.c:229 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:238 +#: wt-status.c:241 #, 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:253 +#: wt-status.c:256 msgid "both deleted:" msgstr "borttaget av bägge:" -#: wt-status.c:255 +#: wt-status.c:258 msgid "added by us:" msgstr "tillagt av oss:" -#: wt-status.c:257 +#: wt-status.c:260 msgid "deleted by them:" msgstr "borttaget av dem:" -#: wt-status.c:259 +#: wt-status.c:262 msgid "added by them:" msgstr "tillagt av dem:" -#: wt-status.c:261 +#: wt-status.c:264 msgid "deleted by us:" msgstr "borttaget av oss:" -#: wt-status.c:263 +#: wt-status.c:266 msgid "both added:" msgstr "tillagt av bägge:" -#: wt-status.c:265 +#: wt-status.c:268 msgid "both modified:" msgstr "ändrat av bägge:" -#: wt-status.c:275 +#: wt-status.c:278 msgid "new file:" msgstr "ny fil:" -#: wt-status.c:277 +#: wt-status.c:280 msgid "copied:" msgstr "kopierad:" -#: wt-status.c:279 +#: wt-status.c:282 msgid "deleted:" msgstr "borttagen:" -#: wt-status.c:281 +#: wt-status.c:284 msgid "modified:" msgstr "ändrad:" -#: wt-status.c:283 +#: wt-status.c:286 msgid "renamed:" msgstr "namnbytt:" -#: wt-status.c:285 +#: wt-status.c:288 msgid "typechange:" msgstr "typbyte:" -#: wt-status.c:287 +#: wt-status.c:290 msgid "unknown:" msgstr "okänd:" -#: wt-status.c:289 +#: wt-status.c:292 msgid "unmerged:" msgstr "osammanslagen:" -#: wt-status.c:369 +#: wt-status.c:372 msgid "new commits, " msgstr "nya incheckningar, " -#: wt-status.c:371 +#: wt-status.c:374 msgid "modified content, " msgstr "ändrat innehåll, " -#: wt-status.c:373 +#: wt-status.c:376 msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:847 +#: wt-status.c:853 #, 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:879 +#: wt-status.c:885 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:881 +#: wt-status.c:887 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:963 +#: wt-status.c:969 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -4663,107 +6259,107 @@ msgstr "" "Raden ovan får inte ändras eller tas bort.\n" "Allt under den kommer tas bort." -#: wt-status.c:1076 +#: wt-status.c:1084 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:1079 +#: wt-status.c:1087 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:1081 +#: wt-status.c:1089 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)" -#: wt-status.c:1086 +#: wt-status.c:1094 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:1089 +#: wt-status.c:1097 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:1099 +#: wt-status.c:1107 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:1102 +#: wt-status.c:1110 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:1106 +#: wt-status.c:1114 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:1108 +#: wt-status.c:1116 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:1110 +#: wt-status.c:1118 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:1242 +#: wt-status.c:1250 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo saknas." -#: wt-status.c:1244 +#: wt-status.c:1252 msgid "No commands done." msgstr "Inga kommandon utförda." -#: wt-status.c:1247 +#: wt-status.c:1255 #, 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:1258 +#: wt-status.c:1266 #, c-format msgid " (see more in file %s)" msgstr " (se fler i filen %s)" -#: wt-status.c:1263 +#: wt-status.c:1271 msgid "No commands remaining." msgstr "Inga kommandon återstår." -#: wt-status.c:1266 +#: wt-status.c:1274 #, 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:1274 +#: wt-status.c:1282 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:1287 +#: wt-status.c:1295 #, 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:1292 +#: wt-status.c:1300 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1306 +#: wt-status.c:1314 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1308 +#: wt-status.c:1316 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1310 +#: wt-status.c:1318 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:1316 +#: wt-status.c:1324 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1320 +#: wt-status.c:1328 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -4771,126 +6367,126 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1325 +#: wt-status.c:1333 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:1328 +#: wt-status.c:1336 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:1332 +#: wt-status.c:1340 #, 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:1337 +#: wt-status.c:1345 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:1340 +#: wt-status.c:1348 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:1342 +#: wt-status.c:1350 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:1352 +#: wt-status.c:1360 #, 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:1357 +#: wt-status.c:1365 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1360 +#: wt-status.c:1368 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1362 +#: wt-status.c:1370 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:1371 +#: wt-status.c:1379 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1376 +#: wt-status.c:1384 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1379 +#: wt-status.c:1387 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1381 +#: wt-status.c:1389 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1392 +#: wt-status.c:1400 #, 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:1396 +#: wt-status.c:1404 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1399 +#: wt-status.c:1407 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:1596 +#: wt-status.c:1604 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1602 +#: wt-status.c:1610 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå " -#: wt-status.c:1604 +#: wt-status.c:1612 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå " -#: wt-status.c:1609 +#: wt-status.c:1617 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1611 +#: wt-status.c:1619 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1614 +#: wt-status.c:1622 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1634 +#: wt-status.c:1642 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1635 +#: wt-status.c:1643 msgid "No commits yet" msgstr "Inga incheckningar ännu" -#: wt-status.c:1649 +#: wt-status.c:1657 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1651 +#: wt-status.c:1659 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1655 +#: wt-status.c:1663 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4902,32 +6498,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1661 +#: wt-status.c:1669 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1663 +#: wt-status.c:1671 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1669 +#: wt-status.c:1677 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1674 +#: wt-status.c:1682 #, 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:1677 +#: wt-status.c:1685 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1680 +#: wt-status.c:1688 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -4936,67 +6532,67 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1683 +#: wt-status.c:1691 #, 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:1686 +#: wt-status.c:1694 #, 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:1689 wt-status.c:1694 +#: wt-status.c:1697 wt-status.c:1702 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1692 +#: wt-status.c:1700 #, 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:1696 +#: wt-status.c:1704 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1809 +#: wt-status.c:1817 msgid "No commits yet on " msgstr "Inga incheckningar ännu på " -#: wt-status.c:1813 +#: wt-status.c:1821 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1844 +#: wt-status.c:1852 msgid "different" msgstr "olika" -#: wt-status.c:1846 wt-status.c:1854 +#: wt-status.c:1854 wt-status.c:1862 msgid "behind " msgstr "efter " -#: wt-status.c:1849 wt-status.c:1852 +#: wt-status.c:1857 wt-status.c:1860 msgid "ahead " msgstr "före " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2358 +#: wt-status.c:2376 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "kan inte %s: Du har oköade ändringar." -#: wt-status.c:2364 +#: wt-status.c:2382 msgid "additionally, your index contains uncommitted changes." msgstr "dessutom innehåller dit index ändringar som inte har checkats in." -#: wt-status.c:2366 +#: wt-status.c:2384 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in." -#: compat/precompose_utf8.c:58 builtin/clone.c:440 +#: compat/precompose_utf8.c:58 builtin/clone.c:443 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" @@ -5010,7 +6606,7 @@ msgstr "git add [<flaggor>] [--] <sökväg>..." msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:88 builtin/commit.c:257 +#: builtin/add.c:88 builtin/commit.c:279 msgid "updating files failed" msgstr "misslyckades uppdatera filer" @@ -5023,7 +6619,7 @@ msgstr "ta bort \"%s\"\n" msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:233 builtin/rev-parse.c:888 +#: builtin/add.c:233 builtin/rev-parse.c:893 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" @@ -5054,77 +6650,73 @@ msgstr "Tom patch. Avbryter." msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:271 +#: builtin/add.c:269 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:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124 -#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 -#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 +#: builtin/add.c:289 builtin/clean.c:906 builtin/fetch.c:134 builtin/mv.c:123 +#: builtin/prune-packed.c:56 builtin/pull.c:212 builtin/push.c:557 +#: builtin/remote.c:1344 builtin/rm.c:240 builtin/send-pack.c:165 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:294 +#: builtin/add.c:292 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302 +#: builtin/add.c:293 builtin/checkout.c:1144 builtin/reset.c:302 msgid "select hunks interactively" msgstr "välj stycken interaktivt" -#: builtin/add.c:296 +#: builtin/add.c:294 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:297 +#: builtin/add.c:295 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:298 +#: builtin/add.c:296 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:299 +#: builtin/add.c:297 msgid "renormalize EOL of tracked files (implies -u)" msgstr "åternormalisera radslut i spårade filer (implicerar -u)" -#: builtin/add.c:300 +#: builtin/add.c:298 msgid "record only the fact that the path will be added later" msgstr "registrera endast att sökvägen kommer läggas till senare" -#: builtin/add.c:301 +#: builtin/add.c:299 msgid "add changes from all tracked and untracked files" msgstr "lägg till ändringar från alla spårade och ospårade filer" -#: builtin/add.c:304 +#: builtin/add.c:302 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)" -#: builtin/add.c:306 +#: builtin/add.c:304 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:307 +#: builtin/add.c:305 msgid "just skip files which cannot be added because of errors" msgstr "hoppa bara över filer som inte kan läggas till på grund av fel" -#: builtin/add.c:308 +#: builtin/add.c:306 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:964 -msgid "(+/-)x" -msgstr "(+/-)x" - -#: builtin/add.c:309 builtin/update-index.c:965 +#: builtin/add.c:308 builtin/update-index.c:973 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" -#: builtin/add.c:311 +#: builtin/add.c:310 msgid "warn when adding an embedded repository" msgstr "varna när ett inbyggt arkiv läggs till" -#: builtin/add.c:326 +#: builtin/add.c:325 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -5155,17 +6747,17 @@ msgstr "" "\n" "Se ”git help submodule” för ytterligare information." -#: builtin/add.c:354 +#: builtin/add.c:353 #, c-format msgid "adding embedded git repository: %s" msgstr "lägger till inbäddat git-arkiv: %s" -#: builtin/add.c:372 +#: builtin/add.c:371 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Använd -f om du verkligen vill lägga till dem.\n" -#: builtin/add.c:380 +#: builtin/add.c:379 msgid "adding files failed" msgstr "misslyckades lägga till filer" @@ -5192,115 +6784,115 @@ msgstr "Inget angivet, inget tillagt.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280 -#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316 -#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241 -#: builtin/rm.c:271 builtin/submodule--helper.c:326 +#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:282 +#: builtin/checkout.c:485 builtin/clean.c:953 builtin/commit.c:338 +#: builtin/diff-tree.c:115 builtin/grep.c:492 builtin/mv.c:144 +#: builtin/reset.c:241 builtin/rm.c:270 builtin/submodule--helper.c:329 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/am.c:414 +#: builtin/am.c:415 msgid "could not parse author script" msgstr "kunde inte tolka författarskript" -#: builtin/am.c:498 +#: builtin/am.c:499 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "\"%s\" togs bort av kroken applypatch-msg" -#: builtin/am.c:539 +#: builtin/am.c:540 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/am.c:576 +#: builtin/am.c:577 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/am.c:602 +#: builtin/am.c:603 msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:790 +#: builtin/am.c:791 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:855 +#: builtin/am.c:856 msgid "Only one StGIT patch series can be applied at once" msgstr "Endast en StGIT-patchserie kan tillämpas åt gången" -#: builtin/am.c:903 +#: builtin/am.c:904 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:908 builtin/am.c:920 +#: builtin/am.c:909 builtin/am.c:921 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:915 +#: builtin/am.c:916 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:1008 +#: builtin/am.c:1009 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:1013 builtin/clone.c:405 +#: builtin/am.c:1014 builtin/clone.c:408 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:1018 +#: builtin/am.c:1019 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1148 builtin/commit.c:342 +#: builtin/am.c:1149 builtin/commit.c:364 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/am.c:1162 +#: builtin/am.c:1163 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "När du har löst problemet, kör \"%s --continue\"." -#: builtin/am.c:1163 +#: builtin/am.c:1164 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället." -#: builtin/am.c:1164 +#: builtin/am.c:1165 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"." -#: builtin/am.c:1271 +#: builtin/am.c:1272 msgid "Patch is empty." msgstr "Patchen är tom." -#: builtin/am.c:1337 +#: builtin/am.c:1338 #, c-format msgid "invalid ident line: %.*s" msgstr "ogiltig ident-rad: %.*s" -#: builtin/am.c:1359 +#: builtin/am.c:1360 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: builtin/am.c:1554 +#: builtin/am.c:1556 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: builtin/am.c:1556 +#: builtin/am.c:1558 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1575 +#: builtin/am.c:1577 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -5308,30 +6900,30 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1581 +#: builtin/am.c:1583 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1606 +#: builtin/am.c:1608 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1637 +#: builtin/am.c:1640 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1683 builtin/am.c:1687 +#: builtin/am.c:1686 builtin/am.c:1690 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1703 +#: builtin/am.c:1706 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "kan inte vara interaktiv om standard in inte är ansluten till en terminal." -#: builtin/am.c:1708 +#: builtin/am.c:1711 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -5339,25 +6931,25 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1718 +#: builtin/am.c:1721 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: " -#: builtin/am.c:1768 +#: builtin/am.c:1771 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1808 builtin/am.c:1879 +#: builtin/am.c:1811 builtin/am.c:1879 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1824 +#: builtin/am.c:1828 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1832 +#: builtin/am.c:1834 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" @@ -5432,8 +7024,8 @@ msgstr "historisk flagga -- no-op" msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57 -#: builtin/repack.c:182 +#: builtin/am.c:2222 builtin/init-db.c:485 builtin/prune-packed.c:58 +#: builtin/repack.c:299 msgid "be quiet" msgstr "var tyst" @@ -5475,16 +7067,17 @@ msgstr "ta bort allting före en saxlinje" msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 -#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203 -#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197 -#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382 -#: parse-options.h:144 parse-options.h:146 parse-options.h:257 +#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:673 builtin/grep.c:857 builtin/merge.c:237 +#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:308 +#: builtin/repack.c:312 builtin/repack.c:314 builtin/show-branch.c:650 +#: builtin/show-ref.c:170 builtin/tag.c:384 parse-options.h:144 +#: parse-options.h:146 parse-options.h:258 msgid "n" msgstr "n" -#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38 -#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39 +#: builtin/am.c:2266 builtin/branch.c:651 builtin/for-each-ref.c:38 +#: builtin/replace.c:543 builtin/tag.c:420 builtin/verify-tag.c:39 msgid "format" msgstr "format" @@ -5528,8 +7121,8 @@ msgstr "ljug om incheckningsdatum" msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237 -#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398 +#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:271 +#: builtin/pull.c:183 builtin/revert.c:113 builtin/tag.c:400 msgid "key-id" msgstr "nyckel-id" @@ -5668,115 +7261,141 @@ msgstr "--write-terms kräver två argument" msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state tar inga argument" -#: builtin/blame.c:27 +#: builtin/blame.c:31 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" -#: builtin/blame.c:32 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" -#: builtin/blame.c:677 +#: builtin/blame.c:406 +#, c-format +msgid "expecting a color: %s" +msgstr "förväntade en färg: %s" + +#: builtin/blame.c:413 +msgid "must end with a color" +msgstr "måste sluta med en färg" + +#: builtin/blame.c:700 +#, c-format +msgid "invalid color '%s' in color.blame.repeatedLines" +msgstr "felaktig färg \"%s\" i color.blame.repeatedLines" + +#: builtin/blame.c:718 +msgid "invalid value for blame.coloring" +msgstr "ogiltigt värde för blame.coloring" + +#: builtin/blame.c:789 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:678 +#: builtin/blame.c:790 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" -#: builtin/blame.c:679 +#: builtin/blame.c:791 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:680 +#: builtin/blame.c:792 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:681 +#: builtin/blame.c:793 msgid "Force progress reporting" msgstr "Tvinga förloppsrapportering" -#: builtin/blame.c:682 +#: builtin/blame.c:794 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:683 +#: builtin/blame.c:795 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:684 +#: builtin/blame.c:796 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:685 +#: builtin/blame.c:797 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:686 +#: builtin/blame.c:798 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:687 +#: builtin/blame.c:799 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:688 +#: builtin/blame.c:800 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:689 +#: builtin/blame.c:801 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:690 +#: builtin/blame.c:802 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:691 +#: builtin/blame.c:803 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:692 +#: builtin/blame.c:804 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:699 +#: builtin/blame.c:805 +msgid "color redundant metadata from previous line differently" +msgstr "färglägg redundant metadata från tidigare rader annorlunda" + +#: builtin/blame.c:806 +msgid "color lines by age" +msgstr "färglägg rader efter ålder" + +#: builtin/blame.c:813 msgid "Use an experimental heuristic to improve diffs" msgstr "Använd en experimentell algoritm för att förbättra diffar" -#: builtin/blame.c:701 +#: builtin/blame.c:815 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:702 +#: builtin/blame.c:816 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:703 +#: builtin/blame.c:817 msgid "Use <file>'s contents as the final image" msgstr "Använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:704 builtin/blame.c:705 +#: builtin/blame.c:818 builtin/blame.c:819 msgid "score" msgstr "poäng" -#: builtin/blame.c:704 +#: builtin/blame.c:818 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:705 +#: builtin/blame.c:819 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:706 +#: builtin/blame.c:820 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:706 +#: builtin/blame.c:820 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med början på 1" -#: builtin/blame.c:753 +#: builtin/blame.c:869 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress kan inte användas med --incremental eller porslinsformat" @@ -5788,50 +7407,50 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:804 +#: builtin/blame.c:920 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" -#: builtin/blame.c:890 +#: builtin/blame.c:1007 #, 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:936 +#: builtin/blame.c:1053 msgid "Blaming lines" msgstr "Klandra rader" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<flaggor>] [-l] [-f] <grennamn> [<startpunkt>]" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..." -#: builtin/branch.c:30 +#: builtin/branch.c:31 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>" -#: builtin/branch.c:31 +#: builtin/branch.c:32 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" msgstr "git branch [<flaggor>] (-c | -C) [<gammal_gren>] <ny_gren>" -#: builtin/branch.c:32 +#: builtin/branch.c:33 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<flaggor>] [-r | -a] [--points-at]" -#: builtin/branch.c:33 +#: builtin/branch.c:34 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<flaggor>] [-r | -a] [--format]" -#: builtin/branch.c:146 +#: builtin/branch.c:151 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -5840,7 +7459,7 @@ msgstr "" "tar bort grenen \"%s\" som har slagits ihop med\n" " \"%s\", men ännu inte slagits ihop med HEAD." -#: builtin/branch.c:150 +#: builtin/branch.c:155 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -5849,12 +7468,12 @@ msgstr "" "tar inte bort grenen \"%s\" som inte har slagits ihop med\n" " \"%s\", trots att den har slagits ihop med HEAD." -#: builtin/branch.c:164 +#: builtin/branch.c:169 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" -#: builtin/branch.c:168 +#: builtin/branch.c:173 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -5863,113 +7482,113 @@ msgstr "" "Grenen \"%s\" har inte slagits samman i sin helhet.\n" "Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"." -#: builtin/branch.c:181 +#: builtin/branch.c:186 msgid "Update of config-file failed" msgstr "Misslyckades uppdatera konfigurationsfil" -#: builtin/branch.c:212 +#: builtin/branch.c:217 msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -#: builtin/branch.c:218 +#: builtin/branch.c:223 msgid "Couldn't look up commit object for HEAD" msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" -#: builtin/branch.c:232 +#: builtin/branch.c:237 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\"" -#: builtin/branch.c:247 +#: builtin/branch.c:252 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "fjärrspårande grenen \"%s\" hittades inte." -#: builtin/branch.c:248 +#: builtin/branch.c:253 #, c-format msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." -#: builtin/branch.c:263 +#: builtin/branch.c:268 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\"" -#: builtin/branch.c:264 +#: builtin/branch.c:269 #, c-format msgid "Error deleting branch '%s'" msgstr "Fel vid borttagning av grenen \"%s\"" -#: builtin/branch.c:271 +#: builtin/branch.c:276 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Tog bort fjärrspårande grenen %s (var %s).\n" -#: builtin/branch.c:272 +#: builtin/branch.c:277 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:417 builtin/tag.c:58 +#: builtin/branch.c:421 builtin/tag.c:59 msgid "unable to parse format string" msgstr "kan inte tolka formatsträng" -#: builtin/branch.c:450 +#: builtin/branch.c:458 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Grenen %s ombaseras på %s" -#: builtin/branch.c:454 +#: builtin/branch.c:462 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" på %s" -#: builtin/branch.c:471 +#: builtin/branch.c:479 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:473 +#: builtin/branch.c:481 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:484 +#: builtin/branch.c:492 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:511 +#: builtin/branch.c:519 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:513 +#: builtin/branch.c:521 msgid "Branch copy failed" msgstr "Misslyckades kopiera gren" -#: builtin/branch.c:517 +#: builtin/branch.c:525 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Skapade kopia av felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:520 +#: builtin/branch.c:528 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:526 +#: builtin/branch.c:534 #, 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:535 +#: builtin/branch.c:543 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:537 +#: builtin/branch.c:545 msgid "Branch is copied, but update of config-file failed" msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:553 +#: builtin/branch.c:561 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5980,221 +7599,227 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/branch.c:586 +#: builtin/branch.c:602 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:588 +#: builtin/branch.c:604 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:589 +#: builtin/branch.c:605 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:590 +#: builtin/branch.c:606 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:592 +#: builtin/branch.c:608 msgid "do not use" msgstr "använd ej" -#: builtin/branch.c:594 +#: builtin/branch.c:610 msgid "upstream" msgstr "uppströms" -#: builtin/branch.c:594 +#: builtin/branch.c:610 msgid "change the upstream info" msgstr "ändra uppströmsinformationen" -#: builtin/branch.c:595 +#: builtin/branch.c:611 msgid "Unset the upstream info" msgstr "Ta bort uppströmsinformationen" -#: builtin/branch.c:596 +#: builtin/branch.c:612 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:597 +#: builtin/branch.c:613 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:599 builtin/branch.c:601 +#: builtin/branch.c:615 builtin/branch.c:617 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:600 builtin/branch.c:602 +#: builtin/branch.c:616 builtin/branch.c:618 msgid "print only branches that don't contain the commit" msgstr "visa endast grenar som inte innehåller incheckningen" -#: builtin/branch.c:605 +#: builtin/branch.c:621 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:606 +#: builtin/branch.c:622 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:608 +#: builtin/branch.c:624 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:609 +#: builtin/branch.c:625 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:610 +#: builtin/branch.c:626 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:611 +#: builtin/branch.c:627 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:612 +#: builtin/branch.c:628 msgid "copy a branch and its reflog" msgstr "kopiera en gren och dess reflogg" -#: builtin/branch.c:613 +#: builtin/branch.c:629 msgid "copy a branch, even if target exists" msgstr "kopiera en gren, även om målet finns" -#: builtin/branch.c:614 +#: builtin/branch.c:630 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:615 +#: builtin/branch.c:631 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:617 +#: builtin/branch.c:634 +msgid "deprecated synonym for --create-reflog" +msgstr "avrådd synonym för --create-reflog" + +#: builtin/branch.c:639 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:618 +#: builtin/branch.c:640 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:619 +#: builtin/branch.c:641 msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:620 +#: builtin/branch.c:642 msgid "print only branches that are not merged" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:621 +#: builtin/branch.c:643 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411 +#: builtin/branch.c:644 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 +#: builtin/tag.c:413 msgid "key" msgstr "nyckel" -#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412 +#: builtin/branch.c:645 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 +#: builtin/tag.c:414 msgid "field name to sort on" msgstr "fältnamn att sortera på" -#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408 -#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 -#: builtin/tag.c:414 +#: builtin/branch.c:647 builtin/for-each-ref.c:43 builtin/notes.c:410 +#: builtin/notes.c:413 builtin/notes.c:573 builtin/notes.c:576 +#: builtin/tag.c:416 msgid "object" msgstr "objekt" -#: builtin/branch.c:626 +#: builtin/branch.c:648 msgid "print only branches of the object" msgstr "visa endast grenar för objektet" -#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421 +#: builtin/branch.c:650 builtin/for-each-ref.c:49 builtin/tag.c:423 msgid "sorting and filtering are case insensitive" msgstr "sortering och filtrering skiljer gemener och VERSALER" -#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419 +#: builtin/branch.c:651 builtin/for-each-ref.c:38 builtin/tag.c:421 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/branch.c:652 builtin/clone.c:735 +#: builtin/branch.c:674 builtin/clone.c:739 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:675 +#: builtin/branch.c:697 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751 +#: builtin/branch.c:717 builtin/branch.c:769 builtin/branch.c:778 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:718 +#: builtin/branch.c:745 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:723 +#: 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:730 +#: builtin/branch.c:757 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu." -#: builtin/branch.c:733 +#: builtin/branch.c:760 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:748 +#: builtin/branch.c:775 msgid "too many branches for a copy operation" msgstr "för många grenar för kopiering" -#: builtin/branch.c:757 +#: builtin/branch.c:784 msgid "too many arguments for a rename operation" msgstr "för många flaggor för namnbyte" -#: builtin/branch.c:762 +#: 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:766 +#: 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:769 builtin/branch.c:791 builtin/branch.c:807 +#: builtin/branch.c:796 builtin/branch.c:818 builtin/branch.c:834 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:773 +#: builtin/branch.c:800 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:785 +#: builtin/branch.c:812 msgid "too many arguments to unset upstream" msgstr "för många flaggor för att ta bort uppström" -#: builtin/branch.c:789 +#: builtin/branch.c:816 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:795 +#: builtin/branch.c:822 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:810 +#: builtin/branch.c:837 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:813 +#: builtin/branch.c:840 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -6215,7 +7840,7 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/cat-file.c:523 +#: builtin/cat-file.c:577 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -6223,7 +7848,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>" -#: builtin/cat-file.c:524 +#: builtin/cat-file.c:578 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -6231,67 +7856,71 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:561 +#: builtin/cat-file.c:615 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<typ> kan vara en av: blob, tree, commit, tag" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:616 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:563 +#: builtin/cat-file.c:617 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:565 +#: builtin/cat-file.c:619 msgid "exit with zero when there's no error" msgstr "avsluta med noll när det inte uppstått något fel" -#: builtin/cat-file.c:566 +#: builtin/cat-file.c:620 msgid "pretty-print object's content" msgstr "visa objektets innehåll snyggt" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:622 msgid "for blob objects, run textconv on object's content" msgstr "för blob-objekt, kör filter på objektets innehåll" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:624 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:571 git-submodule.sh:878 +#: builtin/cat-file.c:625 git-submodule.sh:864 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:572 +#: builtin/cat-file.c:626 msgid "use a specific path for --textconv/--filters" msgstr "använd specifik sökväg för --textconv/--filters" -#: builtin/cat-file.c:574 +#: builtin/cat-file.c:628 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt" -#: builtin/cat-file.c:575 +#: builtin/cat-file.c:629 msgid "buffer --batch output" msgstr "buffra utdata från --batch" -#: builtin/cat-file.c:577 +#: builtin/cat-file.c:631 msgid "show info and content of objects fed from the standard input" msgstr "visa information och innehåll för objekt som listas på standard in" -#: builtin/cat-file.c:580 +#: builtin/cat-file.c:634 msgid "show info about objects fed from the standard input" msgstr "visa information för objekt som listas på standard in" -#: builtin/cat-file.c:583 +#: builtin/cat-file.c:637 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "följ symboliska länkar i trädet (använd med --batch eller --batch-check)" -#: builtin/cat-file.c:585 +#: builtin/cat-file.c:639 msgid "show all objects with --batch or --batch-check" msgstr "visa alla objekt med --batch eller --batch-check" +#: builtin/cat-file.c:641 +msgid "do not order --batch-all-objects output" +msgstr "ordna inte --batch-all-objects output" + #: builtin/check-attr.c:12 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <attr>...] [--] <sökväg>..." @@ -6308,7 +7937,7 @@ msgstr "visa alla attribut som satts på filen" msgid "use .gitattributes only from the index" msgstr "använd .gitattributes endast från indexet" -#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101 msgid "read file names from stdin" msgstr "läs filnamn från standard in" @@ -6316,7 +7945,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:20 builtin/checkout.c:1106 builtin/gc.c:358 +#: builtin/check-ignore.c:20 builtin/checkout.c:1120 builtin/gc.c:503 +#: builtin/worktree.c:447 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -6406,9 +8036,9 @@ msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" #: builtin/checkout-index.c:173 builtin/column.c:31 -#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206 -#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574 -#: builtin/worktree.c:570 +#: builtin/submodule--helper.c:1361 builtin/submodule--helper.c:1364 +#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1736 +#: builtin/worktree.c:620 msgid "string" msgstr "sträng" @@ -6420,113 +8050,113 @@ msgstr "när filer skapas, lägg till <sträng> först" msgid "copy out the files from named stage" msgstr "kopiera ut filer från namngiven etapp" -#: builtin/checkout.c:27 +#: builtin/checkout.c:29 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<flaggor>] <gren>" -#: builtin/checkout.c:28 +#: builtin/checkout.c:30 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..." -#: builtin/checkout.c:136 builtin/checkout.c:169 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:138 builtin/checkout.c:171 +#: builtin/checkout.c:140 builtin/checkout.c:173 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:154 +#: builtin/checkout.c:156 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner" -#: builtin/checkout.c:198 +#: builtin/checkout.c:200 #, c-format msgid "path '%s' does not have necessary versions" msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner" -#: builtin/checkout.c:215 +#: builtin/checkout.c:217 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:231 +#: builtin/checkout.c:233 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 -#: builtin/checkout.c:262 +#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261 +#: builtin/checkout.c:264 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar" -#: builtin/checkout.c:265 builtin/checkout.c:268 +#: builtin/checkout.c:267 builtin/checkout.c:270 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:271 +#: builtin/checkout.c:273 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt." -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:342 builtin/checkout.c:349 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:505 +#: builtin/checkout.c:508 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:636 +#: builtin/checkout.c:645 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:677 +#: builtin/checkout.c:686 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:681 builtin/clone.c:689 +#: builtin/checkout.c:690 builtin/clone.c:692 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:685 +#: builtin/checkout.c:694 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:688 +#: builtin/checkout.c:697 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:692 +#: builtin/checkout.c:701 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:694 builtin/checkout.c:1039 +#: builtin/checkout.c:703 builtin/checkout.c:1052 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:696 +#: builtin/checkout.c:705 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:747 +#: builtin/checkout.c:756 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:753 +#: builtin/checkout.c:762 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6549,7 +8179,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:772 +#: builtin/checkout.c:781 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6576,161 +8206,161 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:804 +#: builtin/checkout.c:813 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:808 +#: builtin/checkout.c:817 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:836 builtin/checkout.c:1034 +#: builtin/checkout.c:845 builtin/checkout.c:1047 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:940 +#: builtin/checkout.c:952 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:980 builtin/worktree.c:249 +#: builtin/checkout.c:993 builtin/worktree.c:241 builtin/worktree.c:396 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1022 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1048 +#: builtin/checkout.c:1061 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1051 builtin/checkout.c:1055 +#: builtin/checkout.c:1064 builtin/checkout.c:1068 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067 -#: builtin/checkout.c:1070 +#: builtin/checkout.c:1072 builtin/checkout.c:1075 builtin/checkout.c:1080 +#: builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1075 +#: builtin/checkout.c:1088 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387 -#: builtin/worktree.c:389 +#: builtin/checkout.c:1121 builtin/checkout.c:1123 builtin/clone.c:119 +#: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:440 +#: builtin/worktree.c:442 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1108 +#: builtin/checkout.c:1122 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1110 +#: builtin/checkout.c:1124 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1125 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1112 builtin/worktree.c:391 +#: builtin/checkout.c:1126 builtin/worktree.c:444 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1127 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1115 +#: builtin/checkout.c:1129 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1115 +#: builtin/checkout.c:1129 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1131 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1118 +#: builtin/checkout.c:1134 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1120 +#: builtin/checkout.c:1136 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1138 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:1124 builtin/merge.c:239 +#: builtin/checkout.c:1140 builtin/merge.c:273 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263 +#: builtin/checkout.c:1142 builtin/log.c:1510 parse-options.h:264 msgid "style" msgstr "stil" -#: builtin/checkout.c:1127 +#: builtin/checkout.c:1143 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1130 +#: builtin/checkout.c:1146 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1132 +#: builtin/checkout.c:1148 msgid "second guess 'git checkout <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1134 +#: builtin/checkout.c:1150 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:1138 builtin/clone.c:83 builtin/fetch.c:150 -#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556 -#: builtin/send-pack.c:173 +#: builtin/checkout.c:1154 builtin/clone.c:86 builtin/fetch.c:138 +#: builtin/merge.c:270 builtin/pull.c:128 builtin/push.c:572 +#: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1184 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1185 +#: builtin/checkout.c:1201 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1190 -msgid "Missing branch name; try -b" -msgstr "Grennamn saknas; försök med -b" +#: builtin/checkout.c:1206 +msgid "missing branch name; try -b" +msgstr "grennamn saknas; försök med -b" -#: builtin/checkout.c:1226 +#: builtin/checkout.c:1243 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1233 +#: builtin/checkout.c:1250 #, 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:1237 +#: builtin/checkout.c:1254 #, 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:1241 +#: builtin/checkout.c:1258 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6738,39 +8368,68 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/clean.c:26 +#: builtin/checkout.c:1278 +#, c-format +msgid "" +"'%s' matched more than one remote tracking branch.\n" +"We found %d remotes with a reference that matched. So we fell back\n" +"on trying to resolve the argument as a path, but failed there too!\n" +"\n" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" +"\"%s\" motsvarar mer än en spårad fjärrgren.\n" +"Vi hittade %d fjärrar med en motsvarande referens. Så vi förösökte\n" +"istället tolka argumentet som en sökväg, men misslyckades också där!\n" +"\n" +"Om du menade checka ut en spårad fjärrgren på t.ex \"origin\", kan du\n" +"göra det genom att ange hela namnet med flaggan --track:\n" +"\n" +" git checkout --track origin/<namn>\n" +"\n" +"Om du alltid vill att utcheckningar med tvetydiga <namn> skall\n" +"föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n" +"checkout.defaultRemote=origin i din konfiguration." + +#: builtin/clean.c:27 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <mönster>] [-x | -X] [--] " "<sökvägar>..." -#: builtin/clean.c:30 +#: builtin/clean.c:31 #, c-format msgid "Removing %s\n" msgstr "Tar bort %s\n" -#: builtin/clean.c:31 +#: builtin/clean.c:32 #, c-format msgid "Would remove %s\n" msgstr "Skulle ta bort %s\n" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Skipping repository %s\n" msgstr "Hoppar över arkivet %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would skip repository %s\n" msgstr "Skulle hoppa över arkivet %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "failed to remove %s" msgstr "misslyckades ta bort %s" -#: builtin/clean.c:302 git-add--interactive.perl:572 +#: builtin/clean.c:297 git-add--interactive.perl:579 #, c-format msgid "" "Prompt help:\n" @@ -6783,7 +8442,7 @@ msgstr "" "foo - markera post baserad på unikt prefix\n" " - (tomt) markera ingenting\n" -#: builtin/clean.c:306 git-add--interactive.perl:581 +#: builtin/clean.c:301 git-add--interactive.perl:588 #, c-format msgid "" "Prompt help:\n" @@ -6804,38 +8463,38 @@ msgstr "" "* - välj alla poster\n" " - (tomt) avsluta markering\n" -#: builtin/clean.c:522 git-add--interactive.perl:547 -#: git-add--interactive.perl:552 +#: builtin/clean.c:517 git-add--interactive.perl:554 +#: git-add--interactive.perl:559 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Vadå (%s)?\n" -#: builtin/clean.c:664 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "Ange ignoreringsmönster>>" -#: builtin/clean.c:701 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "VARNING: Hittar inte poster som motsvarar: %s" -#: builtin/clean.c:722 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "Välj poster att ta bort" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:763 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "Ta bort %s [Y=ja / N=nej]? " -#: builtin/clean.c:788 git-add--interactive.perl:1710 +#: builtin/clean.c:783 git-add--interactive.perl:1717 #, c-format msgid "Bye.\n" msgstr "Hej då.\n" -#: builtin/clean.c:796 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6853,64 +8512,64 @@ msgstr "" "help - denna skärm\n" "? - hjälp för kommandoval" -#: builtin/clean.c:823 git-add--interactive.perl:1786 +#: builtin/clean.c:818 git-add--interactive.perl:1793 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: builtin/clean.c:824 git-add--interactive.perl:1783 +#: builtin/clean.c:819 git-add--interactive.perl:1790 msgid "What now" msgstr "Vad nu" -#: builtin/clean.c:832 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Skulle ta bort följande post:" msgstr[1] "Skulle ta bort följande poster:" -#: builtin/clean.c:848 +#: builtin/clean.c:843 msgid "No more files to clean, exiting." msgstr "Inga fler filer att städa, avslutar." -#: builtin/clean.c:910 +#: builtin/clean.c:905 msgid "do not print names of files removed" msgstr "skriv inte ut namn på borttagna filer" -#: builtin/clean.c:912 +#: builtin/clean.c:907 msgid "force" msgstr "tvinga" -#: builtin/clean.c:913 +#: builtin/clean.c:908 msgid "interactive cleaning" msgstr "städa interaktivt" -#: builtin/clean.c:915 +#: builtin/clean.c:910 msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535 -#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159 -#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 -#: builtin/show-ref.c:176 +#: builtin/clean.c:911 builtin/describe.c:545 builtin/describe.c:547 +#: builtin/grep.c:875 builtin/log.c:161 builtin/log.c:163 +#: builtin/ls-files.c:549 builtin/name-rev.c:415 builtin/name-rev.c:417 +#: builtin/show-ref.c:177 msgid "pattern" msgstr "mönster" -#: builtin/clean.c:917 +#: builtin/clean.c:912 msgid "add <pattern> to ignore rules" msgstr "lägg till <mönster> till ignoreringsregler" -#: builtin/clean.c:918 +#: builtin/clean.c:913 msgid "remove ignored files, too" msgstr "ta även bort ignorerade filer" -#: builtin/clean.c:920 +#: builtin/clean.c:915 msgid "remove only ignored files" msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:938 +#: builtin/clean.c:933 msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" -#: builtin/clean.c:942 +#: builtin/clean.c:937 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -6918,7 +8577,7 @@ msgstr "" "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar " "städa" -#: builtin/clean.c:945 +#: builtin/clean.c:940 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6926,144 +8585,146 @@ msgstr "" "clean.requireForce har standardvärdet true och varken -i, -n eller -f " "angavs; vägrar städa" -#: builtin/clone.c:40 +#: builtin/clone.c:43 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:85 +#: builtin/clone.c:88 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479 +#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:480 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:90 +#: builtin/clone.c:93 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:92 +#: builtin/clone.c:95 msgid "to clone from a local repository" msgstr "för att klona från ett lokalt arkiv" -#: builtin/clone.c:94 +#: builtin/clone.c:97 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hårda länkar, kopiera alltid" -#: builtin/clone.c:96 +#: builtin/clone.c:99 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:98 builtin/clone.c:102 +#: builtin/clone.c:101 builtin/clone.c:105 msgid "pathspec" msgstr "sökvägsangivelse" -#: builtin/clone.c:98 builtin/clone.c:102 +#: builtin/clone.c:101 builtin/clone.c:105 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:105 +#: builtin/clone.c:108 msgid "number of submodules cloned in parallel" msgstr "antal undermoduler som klonas parallellt" -#: builtin/clone.c:106 builtin/init-db.c:476 +#: builtin/clone.c:109 builtin/init-db.c:477 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:107 builtin/init-db.c:477 +#: builtin/clone.c:110 builtin/init-db.c:478 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210 -#: builtin/submodule--helper.c:1577 +#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:1739 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:113 +#: builtin/clone.c:116 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1741 msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" -#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/pack-objects.c:3191 builtin/repack.c:320 msgid "name" msgstr "namn" -#: builtin/clone.c:115 +#: builtin/clone.c:118 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:117 +#: builtin/clone.c:120 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checka ut <gren> istället för fjärrens HEAD" -#: builtin/clone.c:119 +#: builtin/clone.c:122 msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813 -#: builtin/pull.c:211 +#: builtin/clone.c:123 builtin/fetch.c:139 builtin/grep.c:814 +#: builtin/pull.c:216 msgid "depth" msgstr "djup" -#: builtin/clone.c:121 +#: builtin/clone.c:124 msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017 +#: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3182 #: parse-options.h:154 msgid "time" msgstr "tid" -#: builtin/clone.c:123 +#: builtin/clone.c:126 msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon från en angiven tidpunkt" -#: builtin/clone.c:124 builtin/fetch.c:155 +#: builtin/clone.c:127 builtin/fetch.c:143 builtin/fetch.c:166 msgid "revision" msgstr "revision" -#: builtin/clone.c:125 builtin/fetch.c:156 +#: builtin/clone.c:128 builtin/fetch.c:144 msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" -#: builtin/clone.c:127 +#: builtin/clone.c:130 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:129 +#: builtin/clone.c:132 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:131 +#: builtin/clone.c:134 msgid "any cloned submodules will be shallow" msgstr "klonade undermoduler kommer vara grunda" -#: builtin/clone.c:132 builtin/init-db.c:485 +#: builtin/clone.c:135 builtin/init-db.c:486 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:133 builtin/init-db.c:486 +#: builtin/clone.c:136 builtin/init-db.c:487 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" -#: builtin/clone.c:134 +#: builtin/clone.c:137 msgid "key=value" msgstr "nyckel=värde" -#: builtin/clone.c:135 +#: builtin/clone.c:138 msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224 -#: builtin/push.c:567 +#: builtin/clone.c:139 builtin/fetch.c:162 builtin/pull.c:229 +#: builtin/push.c:583 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227 -#: builtin/push.c:569 +#: builtin/clone.c:141 builtin/fetch.c:164 builtin/pull.c:232 +#: builtin/push.c:585 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" -#: builtin/clone.c:276 +#: builtin/clone.c:279 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -7071,42 +8732,42 @@ msgstr "" "Kunde inte gissa katalognamn.\n" "Ange en katalog på kommandoraden" -#: builtin/clone.c:329 +#: builtin/clone.c:332 #, 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:401 +#: builtin/clone.c:404 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: builtin/clone.c:409 +#: builtin/clone.c:412 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:423 +#: builtin/clone.c:426 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" -#: builtin/clone.c:445 +#: builtin/clone.c:448 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:449 +#: builtin/clone.c:452 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:475 +#: builtin/clone.c:478 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:489 +#: builtin/clone.c:492 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -7116,137 +8777,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:566 +#: builtin/clone.c:569 #, 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:661 -msgid "remote did not send all necessary objects" -msgstr "fjärren sände inte alla nödvändiga objekt" - -#: builtin/clone.c:677 +#: builtin/clone.c:680 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:726 +#: builtin/clone.c:730 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:756 +#: builtin/clone.c:760 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:801 +#: builtin/clone.c:805 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:864 +#: builtin/clone.c:868 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:866 +#: builtin/clone.c:870 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:906 builtin/receive-pack.c:1946 +#: builtin/clone.c:910 builtin/receive-pack.c:1935 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:910 +#: builtin/clone.c:914 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:923 +#: builtin/clone.c:927 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:926 +#: builtin/clone.c:930 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:939 +#: builtin/clone.c:943 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:945 builtin/fetch.c:1455 +#: builtin/clone.c:949 builtin/fetch.c:1512 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:955 +#: builtin/clone.c:959 #, 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:965 +#: builtin/clone.c:969 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270 -#: builtin/worktree.c:255 builtin/worktree.c:285 +#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:271 +#: builtin/worktree.c:247 builtin/worktree.c:277 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:985 +#: builtin/clone.c:989 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:1005 +#: builtin/clone.c:1009 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:1007 +#: builtin/clone.c:1011 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:1031 +#: builtin/clone.c:1035 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" "clone --recursive är inte kompatibel med --reference och --reference-if-able" -#: builtin/clone.c:1093 +#: builtin/clone.c:1096 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1095 +#: builtin/clone.c:1098 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1097 +#: builtin/clone.c:1100 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1099 +#: builtin/clone.c:1102 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1102 +#: builtin/clone.c:1105 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1107 +#: builtin/clone.c:1110 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1169 builtin/clone.c:1177 +#: builtin/clone.c:1180 builtin/clone.c:1188 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1180 +#: builtin/clone.c:1191 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -7278,19 +8935,19 @@ msgstr "Spaltfyllnad i högerkanten" msgid "Padding space between columns" msgstr "Spaltfyllnad mellan spalter" -#: builtin/column.c:52 +#: builtin/column.c:51 msgid "--command must be the first argument" msgstr "--command måste vara första argument" -#: builtin/commit.c:37 +#: builtin/commit.c:38 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<flaggor>] [--] <sökväg>..." -#: builtin/commit.c:42 +#: builtin/commit.c:43 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<flaggor>] [--] <sökväg>..." -#: builtin/commit.c:47 +#: builtin/commit.c:48 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -7300,7 +8957,7 @@ msgstr "" "blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n" "så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n" -#: builtin/commit.c:52 +#: builtin/commit.c:53 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -7314,11 +8971,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:59 +#: builtin/commit.c:60 msgid "Otherwise, please use 'git reset'\n" msgstr "Använd annars \"git reset\"\n" -#: builtin/commit.c:62 +#: builtin/commit.c:63 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -7334,61 +8991,61 @@ msgstr "" "\"git cherry-pick --continue\" kommer därefter att återuppta\n" "cherry-pick för återstående incheckningar.\n" -#: builtin/commit.c:284 +#: builtin/commit.c:306 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:325 +#: builtin/commit.c:347 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:331 +#: builtin/commit.c:353 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:344 +#: builtin/commit.c:366 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporärt index" -#: builtin/commit.c:346 +#: builtin/commit.c:368 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cacheträdet" -#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:462 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:427 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:429 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a cherry-pick." msgstr "kan inte utföra en delvis incheckning under en cherry-pick." -#: builtin/commit.c:437 +#: builtin/commit.c:455 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:456 +#: builtin/commit.c:474 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:553 +#: builtin/commit.c:571 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar författarhuvud" -#: builtin/commit.c:555 +#: builtin/commit.c:573 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:574 +#: builtin/commit.c:592 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:626 +#: builtin/commit.c:644 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -7396,38 +9053,38 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024 +#: builtin/commit.c:681 builtin/commit.c:714 builtin/commit.c:1042 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:675 builtin/shortlog.c:309 +#: builtin/commit.c:693 builtin/shortlog.c:317 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:677 +#: builtin/commit.c:695 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:681 +#: builtin/commit.c:699 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:710 builtin/commit.c:718 +#: builtin/commit.c:728 builtin/commit.c:736 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:715 +#: builtin/commit.c:733 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:769 +#: builtin/commit.c:787 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:787 +#: builtin/commit.c:805 #, c-format msgid "" "\n" @@ -7442,7 +9099,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:792 +#: builtin/commit.c:810 #, c-format msgid "" "\n" @@ -7457,7 +9114,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:805 +#: builtin/commit.c:823 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7467,7 +9124,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:813 +#: builtin/commit.c:831 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7478,147 +9135,147 @@ 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:830 +#: builtin/commit.c:848 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:838 +#: builtin/commit.c:856 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:845 +#: builtin/commit.c:863 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:862 +#: builtin/commit.c:880 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:928 +#: builtin/commit.c:946 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:942 builtin/tag.c:256 +#: builtin/commit.c:960 builtin/tag.c:258 #, 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:986 +#: builtin/commit.c:1004 #, 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:1000 +#: builtin/commit.c:1018 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Ogiltigt ignorerat läge \"%s\"" -#: builtin/commit.c:1014 builtin/commit.c:1264 +#: builtin/commit.c:1032 builtin/commit.c:1269 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1052 +#: builtin/commit.c:1070 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1085 +#: builtin/commit.c:1103 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:1094 +#: builtin/commit.c:1112 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1097 +#: builtin/commit.c:1115 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:1099 +#: builtin/commit.c:1117 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:1102 +#: builtin/commit.c:1120 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1112 +#: builtin/commit.c:1130 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:1114 +#: builtin/commit.c:1132 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F." -#: builtin/commit.c:1122 +#: builtin/commit.c:1140 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:1139 +#: builtin/commit.c:1157 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:1141 +#: builtin/commit.c:1159 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:1155 builtin/tag.c:542 +#: builtin/commit.c:1173 builtin/tag.c:544 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1160 +#: builtin/commit.c:1178 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1278 builtin/commit.c:1443 +#: builtin/commit.c:1303 builtin/commit.c:1480 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1280 builtin/commit.c:1445 +#: builtin/commit.c:1305 builtin/commit.c:1482 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1282 +#: builtin/commit.c:1307 msgid "show stash information" msgstr "visa information om stash" -#: builtin/commit.c:1284 builtin/commit.c:1447 +#: builtin/commit.c:1309 builtin/commit.c:1484 msgid "compute full ahead/behind values" msgstr "beräkna fullständiga före-/efter-värden" -#: builtin/commit.c:1286 +#: builtin/commit.c:1311 msgid "version" msgstr "version" -#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542 -#: builtin/worktree.c:541 +#: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558 +#: builtin/worktree.c:591 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1289 builtin/commit.c:1451 +#: builtin/commit.c:1314 builtin/commit.c:1488 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1292 builtin/commit.c:1454 +#: builtin/commit.c:1317 builtin/commit.c:1491 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457 -#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396 +#: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494 +#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/tag.c:398 msgid "mode" msgstr "läge" -#: builtin/commit.c:1295 builtin/commit.c:1457 +#: builtin/commit.c:1320 builtin/commit.c:1494 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:1299 +#: builtin/commit.c:1324 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -7626,11 +9283,11 @@ msgstr "" "visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: " "traditional)" -#: builtin/commit.c:1301 parse-options.h:167 +#: builtin/commit.c:1326 parse-options.h:167 msgid "when" msgstr "när" -#: builtin/commit.c:1302 +#: builtin/commit.c:1327 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7638,337 +9295,454 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1304 +#: builtin/commit.c:1329 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1323 +#: builtin/commit.c:1330 +msgid "do not detect renames" +msgstr "detektera inte namnändringar" + +#: builtin/commit.c:1332 +msgid "detect renames, optionally set similarity index" +msgstr "detektera namnändringar, möjligen sätt likhetsindex" + +#: builtin/commit.c:1352 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:1413 +#: builtin/commit.c:1450 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1414 +#: builtin/commit.c:1451 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1416 +#: builtin/commit.c:1453 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1417 builtin/tag.c:393 +#: builtin/commit.c:1454 builtin/merge.c:261 builtin/tag.c:395 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1418 +#: builtin/commit.c:1455 msgid "author" msgstr "författare" -#: builtin/commit.c:1418 +#: builtin/commit.c:1455 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1419 builtin/gc.c:359 +#: builtin/commit.c:1456 builtin/gc.c:504 msgid "date" msgstr "datum" -#: builtin/commit.c:1419 +#: builtin/commit.c:1456 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402 -#: builtin/notes.c:565 builtin/tag.c:391 +#: builtin/commit.c:1457 builtin/merge.c:257 builtin/notes.c:404 +#: builtin/notes.c:567 builtin/tag.c:393 msgid "message" msgstr "meddelande" -#: builtin/commit.c:1420 +#: builtin/commit.c:1457 msgid "commit message" msgstr "incheckningsmeddelande" -#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423 -#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92 +#: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460 +#: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1421 +#: builtin/commit.c:1458 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1422 +#: builtin/commit.c:1459 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1423 +#: builtin/commit.c:1460 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1424 +#: builtin/commit.c:1461 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:1425 +#: builtin/commit.c:1462 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:1426 builtin/log.c:1446 builtin/merge.c:240 -#: builtin/pull.c:149 builtin/revert.c:105 +#: builtin/commit.c:1463 builtin/log.c:1457 builtin/merge.c:274 +#: builtin/pull.c:154 builtin/revert.c:106 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1427 +#: builtin/commit.c:1464 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1428 +#: builtin/commit.c:1465 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1429 +#: builtin/commit.c:1466 msgid "default" msgstr "standard" -#: builtin/commit.c:1429 builtin/tag.c:397 +#: builtin/commit.c:1466 builtin/tag.c:399 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" -#: builtin/commit.c:1430 +#: builtin/commit.c:1467 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179 -#: builtin/revert.c:113 +#: builtin/commit.c:1469 builtin/merge.c:272 builtin/pull.c:184 +#: builtin/revert.c:114 msgid "GPG sign commit" msgstr "GPG-signera incheckning" -#: builtin/commit.c:1435 +#: builtin/commit.c:1472 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1436 +#: builtin/commit.c:1473 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1437 +#: builtin/commit.c:1474 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1438 +#: builtin/commit.c:1475 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1439 +#: builtin/commit.c:1476 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1440 +#: builtin/commit.c:1477 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1441 +#: builtin/commit.c:1478 msgid "bypass pre-commit and commit-msg hooks" msgstr "förbigå pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1442 +#: builtin/commit.c:1479 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1455 +#: builtin/commit.c:1492 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1456 +#: builtin/commit.c:1493 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1461 +#: builtin/commit.c:1498 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1463 +#: builtin/commit.c:1500 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1536 +#: builtin/commit.c:1573 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1543 +#: builtin/commit.c:1580 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1562 +#: builtin/commit.c:1599 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1573 +#: builtin/commit.c:1610 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1578 +#: builtin/commit.c:1615 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1613 +#: builtin/commit.c:1650 msgid "" -"Repository has been updated, but unable to write\n" +"repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" -"Arkivet har uppdaterats, men kunde inte skriva filen\n" +"arkivet har uppdaterats, men kunde inte skriva filen\n" "new_index. Kontrollera att disken inte är full och\n" "att kvoten inte har överskridits, och kör sedan\n" "\"git reset HEAD\" för att återställa." +#: builtin/commit-graph.c:10 +msgid "git commit-graph [--object-dir <objdir>]" +msgstr "git commit-graph [--object-dir <objkat>]" + +#: builtin/commit-graph.c:11 builtin/commit-graph.c:23 +msgid "git commit-graph read [--object-dir <objdir>]" +msgstr "git commit-graph read [--object-dir <objkat>]" + +#: builtin/commit-graph.c:12 builtin/commit-graph.c:18 +msgid "git commit-graph verify [--object-dir <objdir>]" +msgstr "git commit-graph verify [--object-dir <objkat>]" + +#: builtin/commit-graph.c:13 builtin/commit-graph.c:28 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--" +"stdin-packs|--stdin-commits]" +msgstr "" +"git commit-graph write [--object-dir <objkat>] [--append] [--reachable|--" +"stdin-packs|--stdin-commits]" + +#: builtin/commit-graph.c:48 builtin/commit-graph.c:77 +#: builtin/commit-graph.c:131 builtin/commit-graph.c:184 builtin/fetch.c:150 +#: builtin/log.c:1477 +msgid "dir" +msgstr "kat" + +#: builtin/commit-graph.c:49 builtin/commit-graph.c:78 +#: builtin/commit-graph.c:132 builtin/commit-graph.c:185 +msgid "The object directory to store the graph" +msgstr "Objektkatalogen där grafen skall lagras" + +#: builtin/commit-graph.c:134 +msgid "start walk at all refs" +msgstr "starta traversering vid alla referenser" + +#: builtin/commit-graph.c:136 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "sök paketindex listade på standard in efter incheckningar" + +#: builtin/commit-graph.c:138 +msgid "start walk at commits listed by stdin" +msgstr "börja gå genom incheckningar listade på standard in" + +#: builtin/commit-graph.c:140 +msgid "include all commits already in the commit-graph file" +msgstr "ta med alla incheckningar redan i filen commit-graph" + +#: builtin/commit-graph.c:149 +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "använd som mest en av --reachable, --stdin-commit och --stdin-packs" + #: builtin/config.c:10 msgid "git config [<options>]" msgstr "git config [<flaggor>]" -#: builtin/config.c:58 +#: builtin/config.c:101 +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "okänt argument för --type, %s" + +#: builtin/config.c:113 +msgid "only one type at a time" +msgstr "endast en typ åt gången" + +#: builtin/config.c:122 msgid "Config file location" msgstr "Konfigurationsfilens plats" -#: builtin/config.c:59 +#: builtin/config.c:123 msgid "use global config file" msgstr "använd global konfigurationsfil" -#: builtin/config.c:60 +#: builtin/config.c:124 msgid "use system config file" msgstr "använd systemets konfigurationsfil" -#: builtin/config.c:61 +#: builtin/config.c:125 msgid "use repository config file" msgstr "använd arkivets konfigurationsfil" -#: builtin/config.c:62 +#: builtin/config.c:126 msgid "use given config file" msgstr "använd angiven konfigurationsfil" -#: builtin/config.c:63 +#: builtin/config.c:127 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:63 +#: builtin/config.c:127 msgid "read config from given blob object" msgstr "läs konfiguration från givet blob-objekt" -#: builtin/config.c:64 +#: builtin/config.c:128 msgid "Action" msgstr "Åtgärd" -#: builtin/config.c:65 +#: builtin/config.c:129 msgid "get value: name [value-regex]" msgstr "hämta värde: namn [värde-reguttr]" -#: builtin/config.c:66 +#: builtin/config.c:130 msgid "get all values: key [value-regex]" msgstr "hämta alla värden: nyckel [värde-reguttr]" -#: builtin/config.c:67 +#: builtin/config.c:131 msgid "get values for regexp: name-regex [value-regex]" msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]" -#: builtin/config.c:68 +#: builtin/config.c:132 msgid "get value specific for the URL: section[.var] URL" msgstr "hämta värde specifikt URL:en: sektion[.var] URL" -#: builtin/config.c:69 +#: builtin/config.c:133 msgid "replace all matching variables: name value [value_regex]" msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]" -#: builtin/config.c:70 +#: builtin/config.c:134 msgid "add a new variable: name value" msgstr "lägg till en ny variabel: namn värde" -#: builtin/config.c:71 +#: builtin/config.c:135 msgid "remove a variable: name [value-regex]" msgstr "ta bort en variabel: namn [värde-reguttr]" -#: builtin/config.c:72 +#: builtin/config.c:136 msgid "remove all matches: name [value-regex]" msgstr "ta bort alla träffar: namn [värde-reguttr]" -#: builtin/config.c:73 +#: builtin/config.c:137 msgid "rename section: old-name new-name" msgstr "byt namn på sektion: gammalt-namn nytt-namn" -#: builtin/config.c:74 +#: builtin/config.c:138 msgid "remove a section: name" msgstr "ta bort en sektion: namn" -#: builtin/config.c:75 +#: builtin/config.c:139 msgid "list all" msgstr "visa alla" -#: builtin/config.c:76 +#: builtin/config.c:140 msgid "open an editor" msgstr "öppna textredigeringsprogram" -#: builtin/config.c:77 +#: builtin/config.c:141 msgid "find the color configured: slot [default]" msgstr "hitta den inställda färgen: slot [default]" -#: builtin/config.c:78 +#: builtin/config.c:142 msgid "find the color setting: slot [stdout-is-tty]" msgstr "hitta färginställningen: slot [stdout-is-tty]" -#: builtin/config.c:79 +#: builtin/config.c:143 msgid "Type" msgstr "Typ" -#: builtin/config.c:80 +#: builtin/config.c:144 +msgid "value is given this type" +msgstr "värdet har givits denna typ" + +#: builtin/config.c:145 msgid "value is \"true\" or \"false\"" msgstr "värdet är \"true\" eller \"false\"" -#: builtin/config.c:81 +#: builtin/config.c:146 msgid "value is decimal number" msgstr "värdet är ett decimalt tal" -#: builtin/config.c:82 +#: builtin/config.c:147 msgid "value is --bool or --int" msgstr "värdet är --bool eller --int" -#: builtin/config.c:83 +#: builtin/config.c:148 msgid "value is a path (file or directory name)" msgstr "värdet är en sökväg (fil- eller katalognamn)" -#: builtin/config.c:84 +#: builtin/config.c:149 msgid "value is an expiry date" msgstr "värdet är ett utgångsdatum" -#: builtin/config.c:85 +#: builtin/config.c:150 msgid "Other" msgstr "Andra" -#: builtin/config.c:86 +#: builtin/config.c:151 msgid "terminate values with NUL byte" msgstr "terminera värden med NUL-byte" -#: builtin/config.c:87 +#: builtin/config.c:152 msgid "show variable names only" msgstr "visa endast variabelnamn" -#: builtin/config.c:88 +#: builtin/config.c:153 msgid "respect include directives on lookup" msgstr "respektera inkluderingsdirektiv vid uppslag" -#: builtin/config.c:89 +#: builtin/config.c:154 msgid "show origin of config (file, standard input, blob, command line)" msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)" -#: builtin/config.c:335 +#: builtin/config.c:155 +msgid "value" +msgstr "värde" + +#: builtin/config.c:155 +msgid "with --get, use default value when missing entry" +msgstr "med --get, använd standardvärde vid saknad post" + +#: builtin/config.c:168 +#, c-format +msgid "wrong number of arguments, should be %d" +msgstr "fel antal argument, skulle vara %d" + +#: builtin/config.c:170 +#, c-format +msgid "wrong number of arguments, should be from %d to %d" +msgstr "fel antal argument, skulle vara från %d till %d" + +#: builtin/config.c:304 +#, c-format +msgid "invalid key pattern: %s" +msgstr "felaktigt nyckelmönster: %s" + +#: builtin/config.c:340 +#, c-format +msgid "failed to format default config value: %s" +msgstr "misslyckades formatera standardkonfigurationsvärde: %s" + +#: builtin/config.c:397 +#, c-format +msgid "cannot parse color '%s'" +msgstr "kan inte tolka färgen \"%s\"" + +#: builtin/config.c:439 msgid "unable to parse default color value" msgstr "kan inte tolka standardfärgvärde" -#: builtin/config.c:479 +#: builtin/config.c:492 builtin/config.c:724 +msgid "not in a git directory" +msgstr "inte i en git-katalog" + +#: builtin/config.c:495 +msgid "writing to stdin is not supported" +msgstr "skriva till standard in stöds inte" + +#: builtin/config.c:498 +msgid "writing config blobs is not supported" +msgstr "skriva konfigurations-blobar stöds inte" + +#: builtin/config.c:583 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7983,16 +9757,68 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:507 +#: builtin/config.c:606 +msgid "only one config file at a time" +msgstr "endast en konfigurationsfil åt gången" + +#: builtin/config.c:611 msgid "--local can only be used inside a git repository" msgstr "--local kan bara användas inuti ett git-arkiv" -#: builtin/config.c:632 +#: builtin/config.c:614 +msgid "--blob can only be used inside a git repository" +msgstr "--blob kan bara användas inuti ett git-arkiv" + +#: builtin/config.c:633 +msgid "$HOME not set" +msgstr "$HOME inte satt" + +#: builtin/config.c:670 +msgid "--get-color and variable type are incoherent" +msgstr "--get-color och variabeltyp stämmer inte överens" + +#: builtin/config.c:675 +msgid "only one action at a time" +msgstr "endast en åtgärd åt gången" + +#: builtin/config.c:688 +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "--name-only gäller bara för --list eller --get-regexp" + +#: builtin/config.c:694 +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "" +"--show-origin gäller bara för --get, --get-all, --get-regexp och --list" + +#: builtin/config.c:700 +msgid "--default is only applicable to --get" +msgstr "--default gäller bara för --get" + +#: builtin/config.c:713 +#, c-format +msgid "unable to read config file '%s'" +msgstr "kan inte konfigurationsfil \"%s\"" + +#: builtin/config.c:716 +msgid "error processing config file(s)" +msgstr "fel vid hantering av konfigurationsfil(er)" + +#: builtin/config.c:726 +msgid "editing stdin is not supported" +msgstr "redigering av standard in stöds ej" + +#: builtin/config.c:728 +msgid "editing blobs is not supported" +msgstr "redigering av blobar stöds ej" + +#: builtin/config.c:742 #, c-format msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%s\"" -#: builtin/config.c:645 +#: builtin/config.c:755 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -8001,66 +9827,71 @@ msgstr "" "kan inte skriva över flera värden med ett ensamt värde\n" " Använd en regexp, --add eller --replace-all för att ändra %s." -#: builtin/count-objects.c:88 +#: builtin/config.c:829 builtin/config.c:840 +#, c-format +msgid "no such section: %s" +msgstr "ingen sådan sektion: %s" + +#: builtin/count-objects.c:90 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:98 +#: builtin/count-objects.c:100 msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" -#: builtin/describe.c:22 +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<flaggor>] [<incheckning-igt>...]" -#: builtin/describe.c:23 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<flaggor>] --dirty" -#: builtin/describe.c:57 +#: builtin/describe.c:62 msgid "head" msgstr "huvud" -#: builtin/describe.c:57 +#: builtin/describe.c:62 msgid "lightweight" msgstr "lättviktig" -#: builtin/describe.c:57 +#: builtin/describe.c:62 msgid "annotated" msgstr "annoterad" -#: builtin/describe.c:267 +#: builtin/describe.c:272 #, c-format msgid "annotated tag %s not available" msgstr "den annoterade taggen %s inte tillgänglig" -#: builtin/describe.c:271 +#: builtin/describe.c:276 #, c-format msgid "annotated tag %s has no embedded name" msgstr "den annoterade taggen %s har inget inbäddat namn" -#: builtin/describe.c:273 +#: builtin/describe.c:278 #, c-format msgid "tag '%s' is really '%s' here" msgstr "taggen \"%s\" är i verkligheten \"%s\" här" -#: builtin/describe.c:317 +#: builtin/describe.c:322 #, c-format msgid "no tag exactly matches '%s'" msgstr "ingen tagg motsvarar \"%s\" exakt" -#: builtin/describe.c:319 +#: builtin/describe.c:324 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" "Ingen exakt träff mot referenser eller taggar, söker för att beskriva\n" -#: builtin/describe.c:366 +#: builtin/describe.c:378 #, c-format msgid "finished search at %s\n" msgstr "avslutade sökning på %s\n" -#: builtin/describe.c:392 +#: builtin/describe.c:404 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -8069,7 +9900,7 @@ msgstr "" "Inga annoterade taggar kan beskriva \"%s\".\n" "Det finns dock oannoterade taggar: testa --tags." -#: builtin/describe.c:396 +#: builtin/describe.c:408 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -8078,12 +9909,12 @@ msgstr "" "Inga taggar kan beskriva \"%s\".\n" "Testa --always, eller skapa några taggar." -#: builtin/describe.c:426 +#: builtin/describe.c:438 #, c-format msgid "traversed %lu commits\n" msgstr "traverserade %lu incheckningar\n" -#: builtin/describe.c:429 +#: builtin/describe.c:441 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -8092,90 +9923,90 @@ msgstr "" "mer än %i taggar hittades; listar de %i senaste\n" "gav upp sökningen vid %s\n" -#: builtin/describe.c:497 +#: builtin/describe.c:509 #, c-format msgid "describe %s\n" msgstr "beskriva %s\n" -#: builtin/describe.c:500 builtin/log.c:502 +#: builtin/describe.c:512 builtin/log.c:508 #, c-format msgid "Not a valid object name %s" msgstr "Objektnamnet är inte giltigt: %s" -#: builtin/describe.c:508 +#: builtin/describe.c:520 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s är varken incheckning eller blob" -#: builtin/describe.c:522 +#: builtin/describe.c:534 msgid "find the tag that comes after the commit" msgstr "hitta taggen som kommer efter incheckningen" -#: builtin/describe.c:523 +#: builtin/describe.c:535 msgid "debug search strategy on stderr" msgstr "felsök sökstrategin på standard fel" -#: builtin/describe.c:524 +#: builtin/describe.c:536 msgid "use any ref" msgstr "använd alla referenser" -#: builtin/describe.c:525 +#: builtin/describe.c:537 msgid "use any tag, even unannotated" msgstr "använd alla taggar, även oannoterade" -#: builtin/describe.c:526 +#: builtin/describe.c:538 msgid "always use long format" msgstr "använd alltid långt format" -#: builtin/describe.c:527 +#: builtin/describe.c:539 msgid "only follow first parent" msgstr "följ endast första föräldern" -#: builtin/describe.c:530 +#: builtin/describe.c:542 msgid "only output exact matches" msgstr "skriv endast ut exakta träffar" -#: builtin/describe.c:532 +#: builtin/describe.c:544 msgid "consider <n> most recent tags (default: 10)" msgstr "överväg de <n> nyaste taggarna (standard: 10)" -#: builtin/describe.c:534 +#: builtin/describe.c:546 msgid "only consider tags matching <pattern>" msgstr "överväg endast taggar som motsvarar <mönster>" -#: builtin/describe.c:536 +#: builtin/describe.c:548 msgid "do not consider tags matching <pattern>" msgstr "överväg inte taggar som motsvarar <mönster>" -#: builtin/describe.c:538 builtin/name-rev.c:406 +#: builtin/describe.c:550 builtin/name-rev.c:424 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" -#: builtin/describe.c:539 builtin/describe.c:542 +#: builtin/describe.c:551 builtin/describe.c:554 msgid "mark" msgstr "märke" -#: builtin/describe.c:540 +#: builtin/describe.c:552 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")" -#: builtin/describe.c:543 +#: builtin/describe.c:555 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")" -#: builtin/describe.c:561 +#: builtin/describe.c:573 msgid "--long is incompatible with --abbrev=0" msgstr "--long är inkompatibel med --abbrev=0" -#: builtin/describe.c:590 +#: builtin/describe.c:602 msgid "No names found, cannot describe anything." msgstr "Inga namn hittades, kan inte beskriva något." -#: builtin/describe.c:640 +#: builtin/describe.c:652 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden" -#: builtin/describe.c:642 +#: builtin/describe.c:654 msgid "--broken is incompatible with commit-ishes" msgstr "--broken är inkompatibelt med \"commit-ish\"-värden" @@ -8189,51 +10020,51 @@ msgstr "\"%s\": inte en normal fil eller symbolisk länk" msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:356 +#: builtin/diff.c:363 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:399 +#: builtin/diff.c:407 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:408 +#: builtin/diff.c:416 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:413 +#: builtin/diff.c:421 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." -#: builtin/difftool.c:29 +#: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" "git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]" -#: builtin/difftool.c:259 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "misslyckades: %d" -#: builtin/difftool.c:301 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/difftool.c:303 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "kunde inte läsa symbolisk länk-fil %s" -#: builtin/difftool.c:311 +#: builtin/difftool.c:312 #, c-format msgid "could not read object %s for symlink %s" msgstr "kunde inte läsa objektet %s för symboliska länken %s" -#: builtin/difftool.c:412 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -8241,33 +10072,33 @@ msgstr "" "kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n" "katalogdiffläge (\"-d\" och \"--dir-diff\")." -#: builtin/difftool.c:632 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "bägge filerna ändrade: \"%s\" och \"%s\"." -#: builtin/difftool.c:634 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "filen i arbetskatalogen lämnades kvar." -#: builtin/difftool.c:645 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "temporära filer finns i \"%s\"." -#: builtin/difftool.c:646 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "du kanske vill städa eller rädda dem." -#: builtin/difftool.c:695 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "använd \"diff.guitool\" istället för \"diff.tool\"" -#: builtin/difftool.c:697 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "utför diff för hela katalogen" -#: builtin/difftool.c:699 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "fråga inte vid start av diff-verktyg" @@ -8276,8 +10107,8 @@ msgid "use symlinks in dir-diff mode" msgstr "använd symboliska länkar i katalogdiffläge" #: builtin/difftool.c:706 -msgid "<tool>" -msgstr "<verktyg>" +msgid "tool" +msgstr "verktyg" #: builtin/difftool.c:707 msgid "use the specified diff tool" @@ -8295,10 +10126,6 @@ msgstr "" "låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde " "skilt från noll" -#: builtin/difftool.c:714 -msgid "<command>" -msgstr "<kommando>" - #: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "ange eget kommando för att visa diffar" @@ -8311,152 +10138,148 @@ msgstr "inget <verktyg> angavs för --tool=<verktyg>" msgid "no <cmd> given for --extcmd=<cmd>" msgstr "inget <kommando> angavs för --extcmd=<kommando>" -#: builtin/fast-export.c:26 +#: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-flaggor]" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1006 msgid "show progress after <n> objects" msgstr "visa förlopp efter <n> objekt" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1008 msgid "select handling of signed tags" msgstr "välj hantering av signerade taggar" -#: builtin/fast-export.c:1003 +#: builtin/fast-export.c:1011 msgid "select handling of tags that tag filtered objects" msgstr "välj hantering av taggar som har taggfiltrerade objekt" -#: builtin/fast-export.c:1006 +#: builtin/fast-export.c:1014 msgid "Dump marks to this file" msgstr "Dump märken till filen" -#: builtin/fast-export.c:1008 +#: builtin/fast-export.c:1016 msgid "Import marks from this file" msgstr "Importera märken från filen" -#: builtin/fast-export.c:1010 +#: builtin/fast-export.c:1018 msgid "Fake a tagger when tags lack one" msgstr "Fejka taggare när taggen saknar en" -#: builtin/fast-export.c:1012 +#: builtin/fast-export.c:1020 msgid "Output full tree for each commit" msgstr "Skriv ut hela trädet för varje incheckning" -#: builtin/fast-export.c:1014 +#: builtin/fast-export.c:1022 msgid "Use the done feature to terminate the stream" msgstr "Använd done-funktionen för att avsluta strömmen" -#: builtin/fast-export.c:1015 +#: builtin/fast-export.c:1023 msgid "Skip output of blob data" msgstr "Hoppa över skrivning av blob-data" -#: builtin/fast-export.c:1016 +#: builtin/fast-export.c:1024 msgid "refspec" msgstr "referensspecifikation" -#: builtin/fast-export.c:1017 +#: builtin/fast-export.c:1025 msgid "Apply refspec to exported refs" msgstr "Applicera referensspecifikation på exporterade referenser" -#: builtin/fast-export.c:1018 +#: builtin/fast-export.c:1026 msgid "anonymize output" msgstr "anonymisera utdata" -#: builtin/fetch.c:25 +#: builtin/fetch.c:27 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/fetch.c:26 +#: builtin/fetch.c:28 msgid "git fetch [<options>] <group>" msgstr "git fetch [<flaggor>] <grupp>" -#: builtin/fetch.c:27 +#: builtin/fetch.c:29 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" -#: builtin/fetch.c:28 +#: builtin/fetch.c:30 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:124 builtin/pull.c:188 +#: builtin/fetch.c:112 builtin/pull.c:193 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:126 builtin/pull.c:191 +#: builtin/fetch.c:114 builtin/pull.c:196 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:128 builtin/pull.c:194 +#: builtin/fetch.c:116 builtin/pull.c:199 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:129 builtin/pull.c:196 +#: builtin/fetch.c:117 builtin/pull.c:201 msgid "force overwrite of local branch" msgstr "tvinga överskrivning av lokal gren" -#: builtin/fetch.c:131 +#: builtin/fetch.c:119 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:133 builtin/pull.c:198 +#: builtin/fetch.c:121 builtin/pull.c:203 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:135 +#: builtin/fetch.c:123 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:137 +#: builtin/fetch.c:125 msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:139 builtin/pull.c:201 +#: builtin/fetch.c:127 builtin/pull.c:206 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:141 +#: builtin/fetch.c:129 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:142 builtin/fetch.c:165 builtin/pull.c:126 +#: builtin/fetch.c:130 builtin/fetch.c:153 builtin/pull.c:131 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:143 +#: builtin/fetch.c:131 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:147 builtin/pull.c:209 +#: builtin/fetch.c:135 builtin/pull.c:214 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:149 +#: builtin/fetch.c:137 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212 +#: builtin/fetch.c:140 builtin/fetch.c:146 builtin/pull.c:217 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:154 +#: builtin/fetch.c:142 msgid "deepen history of shallow repository based on time" msgstr "fördjupa historik för grund klon baserad på tid" -#: builtin/fetch.c:160 builtin/pull.c:215 +#: builtin/fetch.c:148 builtin/pull.c:220 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:162 builtin/log.c:1466 -msgid "dir" -msgstr "kat" - -#: builtin/fetch.c:163 +#: builtin/fetch.c:151 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:166 +#: builtin/fetch.c:154 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -8464,89 +10287,105 @@ msgstr "" "standard för rekursiv hämtning av undermoduler (lägre prioritet än " "konfigurationsfiler)" -#: builtin/fetch.c:170 builtin/pull.c:218 +#: builtin/fetch.c:158 builtin/pull.c:223 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:171 builtin/pull.c:220 +#: builtin/fetch.c:159 builtin/pull.c:225 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:172 builtin/pull.c:221 +#: builtin/fetch.c:160 builtin/pull.c:226 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:431 +#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/send-pack.c:172 +msgid "server-specific" +msgstr "serverspecifik" + +#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/send-pack.c:173 +msgid "option to transmit" +msgstr "" +"inget att checka in\n" +"flagga att sända" + +#: builtin/fetch.c:167 +msgid "report that we have only objects reachable from this object" +msgstr "rapportera att vi bara har objekt nåbara från detta objektet" + +#: builtin/fetch.c:418 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:549 +#: builtin/fetch.c:552 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s" -#: builtin/fetch.c:642 +#: builtin/fetch.c:645 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:646 +#: builtin/fetch.c:649 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:659 builtin/fetch.c:739 +#: builtin/fetch.c:662 builtin/fetch.c:744 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:660 +#: builtin/fetch.c:663 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:669 +#: builtin/fetch.c:672 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719 -#: builtin/fetch.c:734 +#: builtin/fetch.c:673 builtin/fetch.c:708 builtin/fetch.c:724 +#: builtin/fetch.c:739 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:689 +#: builtin/fetch.c:694 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:692 +#: builtin/fetch.c:697 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:695 +#: builtin/fetch.c:700 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:734 +#: builtin/fetch.c:739 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:739 +#: builtin/fetch.c:744 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:784 +#: builtin/fetch.c:790 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s sände inte alla nödvändiga objekt\n" -#: builtin/fetch.c:804 +#: builtin/fetch.c:811 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "avvisa %s då grunda rötter inte kan uppdateras" -#: builtin/fetch.c:892 builtin/fetch.c:988 +#: builtin/fetch.c:900 builtin/fetch.c:1011 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:903 +#: builtin/fetch.c:911 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -8555,56 +10394,56 @@ msgstr "" "vissa lokala referenser kunde inte uppdateras; testa att köra\n" " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt" -#: builtin/fetch.c:958 +#: builtin/fetch.c:981 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:959 +#: builtin/fetch.c:982 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:991 +#: builtin/fetch.c:1014 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:992 builtin/remote.c:1024 +#: builtin/fetch.c:1015 builtin/remote.c:1035 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:1015 +#: builtin/fetch.c:1038 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv" -#: builtin/fetch.c:1034 +#: builtin/fetch.c:1057 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s" -#: builtin/fetch.c:1037 +#: builtin/fetch.c:1060 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1277 +#: builtin/fetch.c:1339 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1279 builtin/remote.c:97 +#: builtin/fetch.c:1341 builtin/remote.c:99 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1325 builtin/fetch.c:1498 +#: builtin/fetch.c:1387 builtin/fetch.c:1555 msgid "" "--filter can only be used with the remote configured in core.partialClone" msgstr "" "--filter kan endast användas med fjärren konfigurerad i core.partialClone" -#: builtin/fetch.c:1350 +#: builtin/fetch.c:1410 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8612,66 +10451,66 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar skall hämtas från." -#: builtin/fetch.c:1394 +#: builtin/fetch.c:1447 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1439 +#: builtin/fetch.c:1496 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1441 +#: builtin/fetch.c:1498 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1446 +#: builtin/fetch.c:1503 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1448 +#: builtin/fetch.c:1505 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1464 +#: builtin/fetch.c:1521 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1466 +#: builtin/fetch.c:1523 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1475 +#: builtin/fetch.c:1532 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1482 +#: builtin/fetch.c:1539 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" -#: builtin/fmt-merge-msg.c:15 +#: builtin/fmt-merge-msg.c:17 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:671 msgid "populate log with at most <n> entries from shortlog" msgstr "fyll i loggen med som mest <n> poster från shortlog" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:674 msgid "alias for --log (deprecated)" msgstr "alias för --log (avråds)" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:677 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:678 msgid "use <text> as start of message" msgstr "inled meddelande med <text>" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:679 msgid "file to read from" msgstr "fil att läsa från" @@ -8712,7 +10551,7 @@ msgstr "citera platshållare passande för Tcl" msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:39 builtin/tag.c:420 +#: builtin/for-each-ref.c:39 builtin/tag.c:422 msgid "respect format colors" msgstr "använd formatfärger" @@ -8736,83 +10575,83 @@ msgstr "visa endast referenser som innehåller incheckningen" msgid "print only refs which don't contain the commit" msgstr "visa endast referenser som inte innehåller incheckningen" -#: builtin/fsck.c:568 +#: builtin/fsck.c:574 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:660 +#: builtin/fsck.c:666 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:666 +#: builtin/fsck.c:672 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:667 +#: builtin/fsck.c:673 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:668 +#: builtin/fsck.c:674 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:669 +#: builtin/fsck.c:675 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:670 +#: builtin/fsck.c:676 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:671 +#: builtin/fsck.c:677 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:672 +#: builtin/fsck.c:678 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:673 +#: builtin/fsck.c:679 msgid "check only connectivity" msgstr "kontrollera endast konnektivitet" -#: builtin/fsck.c:674 +#: builtin/fsck.c:680 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:676 +#: builtin/fsck.c:682 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:677 builtin/prune.c:108 +#: builtin/fsck.c:683 builtin/prune.c:110 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:678 +#: builtin/fsck.c:684 msgid "show verbose names for reachable objects" msgstr "visa ordrika namn för nåbara objekt" -#: builtin/fsck.c:742 +#: builtin/fsck.c:750 msgid "Checking objects" msgstr "Kontrollerar objekt" -#: builtin/gc.c:27 +#: builtin/gc.c:34 msgid "git gc [<options>]" msgstr "git gc [<flaggor>]" -#: builtin/gc.c:80 +#: builtin/gc.c:90 #, c-format msgid "Failed to fstat %s: %s" msgstr "Misslyckades ta status (fstat) på %s: %s" -#: builtin/gc.c:312 +#: builtin/gc.c:455 #, c-format msgid "Can't stat %s" msgstr "Kan inte ta status på %s" -#: builtin/gc.c:321 +#: builtin/gc.c:464 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8827,43 +10666,52 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:360 +#: builtin/gc.c:505 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:362 +#: builtin/gc.c:507 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:363 +#: builtin/gc.c:508 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:366 +#: builtin/gc.c:511 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:384 +#: builtin/gc.c:514 +msgid "repack all other packs except the largest pack" +msgstr "packa om alla paket förutom det största paketet" + +#: builtin/gc.c:531 +#, c-format +msgid "failed to parse gc.logexpiry value %s" +msgstr "kunde inte tolka värdet %s för gc.logexpiry" + +#: builtin/gc.c:542 #, c-format -msgid "Failed to parse gc.logexpiry value %s" -msgstr "Kan inte tolka värdet %s för gc.logexpiry" +msgid "failed to parse prune expiry value %s" +msgstr "kunde inte tolka värdet %s för prune expiry" -#: builtin/gc.c:412 +#: builtin/gc.c:562 #, 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:414 +#: builtin/gc.c:564 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:415 +#: builtin/gc.c:565 #, 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:440 +#: builtin/gc.c:601 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -8871,23 +10719,23 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:487 +#: builtin/gc.c:652 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort " "dem." -#: builtin/grep.c:27 +#: builtin/grep.c:28 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]" -#: builtin/grep.c:225 +#: builtin/grep.c:226 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: misslyckades skapa tråd. %s" -#: builtin/grep.c:283 +#: builtin/grep.c:284 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "felaktigt antal trådar angivet (%d) för %s" @@ -8896,245 +10744,254 @@ msgstr "felaktigt antal trådar angivet (%d) för %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712 +#: builtin/grep.c:293 builtin/index-pack.c:1536 builtin/index-pack.c:1728 +#: builtin/pack-objects.c:2636 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622 +#: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:637 +#: builtin/grep.c:638 #, c-format msgid "unable to grep from object of type %s" msgstr "kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:703 +#: builtin/grep.c:704 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:790 +#: builtin/grep.c:791 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:792 +#: builtin/grep.c:793 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:794 +#: builtin/grep.c:795 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:796 +#: builtin/grep.c:797 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:798 +#: builtin/grep.c:799 msgid "recursively search in each submodule" msgstr "sök varje undermodul rekursivt" -#: builtin/grep.c:801 +#: builtin/grep.c:802 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:803 +#: builtin/grep.c:804 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:805 +#: builtin/grep.c:806 msgid "match patterns only at word boundaries" msgstr "matcha endast mönster vid ordgränser" -#: builtin/grep.c:807 +#: builtin/grep.c:808 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:809 +#: builtin/grep.c:810 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:812 +#: builtin/grep.c:813 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:814 +#: builtin/grep.c:815 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:818 +#: builtin/grep.c:819 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:821 +#: builtin/grep.c:822 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:824 +#: builtin/grep.c:825 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:827 +#: builtin/grep.c:828 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:830 +#: builtin/grep.c:831 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:831 +#: builtin/grep.c:832 +msgid "show column number of first match" +msgstr "visa kolumnnummer för första träff" + +#: builtin/grep.c:833 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:832 +#: builtin/grep.c:834 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:834 +#: builtin/grep.c:836 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:836 +#: builtin/grep.c:838 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:838 +#: builtin/grep.c:840 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:841 +#: builtin/grep.c:843 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:843 +#: builtin/grep.c:845 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:846 +#: builtin/grep.c:848 +msgid "show only matching parts of a line" +msgstr "visa endast träffade delar av rader" + +#: builtin/grep.c:850 msgid "show the number of matches instead of matching lines" msgstr "visa antal träffar istället för träffade rader" -#: builtin/grep.c:847 +#: builtin/grep.c:851 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:849 +#: builtin/grep.c:853 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:851 +#: builtin/grep.c:855 msgid "show filename only once above matches from same file" msgstr "visa filnamn endast en gång ovanför träffar från samma fil" -#: builtin/grep.c:854 +#: builtin/grep.c:858 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:857 +#: builtin/grep.c:861 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:859 +#: builtin/grep.c:863 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:861 +#: builtin/grep.c:865 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:862 +#: builtin/grep.c:866 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:865 +#: builtin/grep.c:869 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:867 +#: builtin/grep.c:871 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:870 +#: builtin/grep.c:874 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:872 +#: builtin/grep.c:876 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:874 +#: builtin/grep.c:878 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:886 +#: builtin/grep.c:890 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:888 +#: builtin/grep.c:892 msgid "show only matches from files that match all patterns" msgstr "visa endast träffar från filer som träffar alla mönster" -#: builtin/grep.c:890 +#: builtin/grep.c:894 msgid "show parse tree for grep expression" msgstr "visa analysträd för grep-uttryck" -#: builtin/grep.c:894 +#: builtin/grep.c:898 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:894 +#: builtin/grep.c:898 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:898 +#: builtin/grep.c:902 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:962 -msgid "no pattern given." -msgstr "inget mönster angavs." +#: builtin/grep.c:966 +msgid "no pattern given" +msgstr "inget mönster angavs" -#: builtin/grep.c:994 +#: builtin/grep.c:1002 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index och --untracked kan inte användas med revisioner" -#: builtin/grep.c:1001 +#: builtin/grep.c:1009 #, c-format msgid "unable to resolve revision: %s" msgstr "kan inte slå upp revision: %s" -#: builtin/grep.c:1036 builtin/index-pack.c:1519 +#: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2632 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:1041 +#: builtin/grep.c:1049 builtin/pack-objects.c:3286 msgid "no threads support, ignoring --threads" msgstr "trådstöd saknas, ignorerar --threads" -#: builtin/grep.c:1065 +#: builtin/grep.c:1073 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1088 -msgid "option not supported with --recurse-submodules." -msgstr "flaggan stöds inte med --recurse-submodules." +#: builtin/grep.c:1096 +msgid "option not supported with --recurse-submodules" +msgstr "flaggan stöds inte med --recurse-submodules" -#: builtin/grep.c:1094 -msgid "--cached or --untracked cannot be used with --no-index." -msgstr "--cached och --untracked kan inte användas med --no-index." - -#: builtin/grep.c:1100 -msgid "--[no-]exclude-standard cannot be used for tracked contents." -msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll." +#: builtin/grep.c:1102 +msgid "--cached or --untracked cannot be used with --no-index" +msgstr "--cached och --untracked kan inte användas med --no-index" #: builtin/grep.c:1108 -msgid "both --cached and trees are given." -msgstr "både --cached och träd angavs." +msgid "--[no-]exclude-standard cannot be used for tracked contents" +msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll" + +#: builtin/grep.c:1116 +msgid "both --cached and trees are given" +msgstr "både --cached och träd angavs" -#: builtin/hash-object.c:83 +#: builtin/hash-object.c:84 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -9142,92 +10999,100 @@ msgstr "" "git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] " "<fil>..." -#: builtin/hash-object.c:84 +#: builtin/hash-object.c:85 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "type" msgstr "typ" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "object type" msgstr "objekttyp" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:98 msgid "write the object into the object database" msgstr "skriv objektet till objektdatabasen" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "read the object from stdin" msgstr "läs objektet från standard in" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:102 msgid "store file as is without filters" msgstr "spara filen som den är utan filer" -#: builtin/hash-object.c:102 +#: builtin/hash-object.c:103 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "hasha slumpmässigt skräp för att skapa korrupta objekt för felsökning av Git" -#: builtin/hash-object.c:103 +#: builtin/hash-object.c:104 msgid "process file as it were from this path" msgstr "hantera filen som om den kom från sökvägen" -#: builtin/help.c:43 +#: builtin/help.c:46 msgid "print all available commands" msgstr "visa alla tillgängliga kommandon" -#: builtin/help.c:44 +#: builtin/help.c:47 msgid "exclude guides" msgstr "uteslut vägledningar" -#: builtin/help.c:45 +#: builtin/help.c:48 msgid "print list of useful guides" msgstr "lista användbara vägledningar" -#: builtin/help.c:46 +#: builtin/help.c:49 +msgid "print all configuration variable names" +msgstr "visa namn på alla konfigurationsvariabler" + +#: builtin/help.c:51 msgid "show man page" msgstr "visa manualsida" -#: builtin/help.c:47 +#: builtin/help.c:52 msgid "show manual in web browser" msgstr "visa manual i webbläsare" -#: builtin/help.c:49 +#: builtin/help.c:54 msgid "show info page" msgstr "visa info-sida" -#: builtin/help.c:55 +#: builtin/help.c:56 +msgid "print command description" +msgstr "visa kommandobeskrivning" + +#: builtin/help.c:61 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<kommando>]" -#: builtin/help.c:67 +#: builtin/help.c:73 #, c-format msgid "unrecognized help format '%s'" msgstr "okänt hjälpformat: ”%s”" -#: builtin/help.c:94 +#: builtin/help.c:100 msgid "Failed to start emacsclient." msgstr "Misslyckades starta emacsclient." -#: builtin/help.c:107 +#: builtin/help.c:113 msgid "Failed to parse emacsclient version." msgstr "Kunde inte tolka emacsclient-version." -#: builtin/help.c:115 +#: builtin/help.c:121 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient version \"%d\" för gammal (< 22)." -#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173 +#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179 #, c-format msgid "failed to exec '%s'" msgstr "exec misslyckades för \"%s\"" -#: builtin/help.c:211 +#: builtin/help.c:217 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -9236,7 +11101,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:223 +#: builtin/help.c:229 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -9245,358 +11110,325 @@ msgstr "" "\"%s\": kommando för man-visare som stöds.\n" "Använd \"man.<verktyg>.path\" istället." -#: builtin/help.c:340 +#: builtin/help.c:346 #, c-format msgid "'%s': unknown man viewer." msgstr "\"%s\": okänd man-visare." -#: builtin/help.c:357 +#: builtin/help.c:363 msgid "no man viewer handled the request" msgstr "ingen man-visare hanterade förfrågan" -#: builtin/help.c:365 +#: builtin/help.c:371 msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:407 -msgid "Defining attributes per path" -msgstr "Definierar attribut per sökväg" - -#: builtin/help.c:408 -msgid "Everyday Git With 20 Commands Or So" -msgstr "Git för dagligt bruk i ungefär 20 kommandon" - -#: builtin/help.c:409 -msgid "A Git glossary" -msgstr "En Git-ordlista" - -#: builtin/help.c:410 -msgid "Specifies intentionally untracked files to ignore" -msgstr "Ange avsiktligen ospårade filer att ignorera" - -#: builtin/help.c:411 -msgid "Defining submodule properties" -msgstr "Ange egenskaper för undermoduler" - -#: builtin/help.c:412 -msgid "Specifying revisions and ranges for Git" -msgstr "Ange versioner och intervall i Git" - -#: builtin/help.c:413 -msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" -msgstr "Introduktion till Git (för version 1.5.1 och senare)" - -#: builtin/help.c:414 -msgid "An overview of recommended workflows with Git" -msgstr "Översikt över rekommenderade arbetsflöden med Git" - -#: builtin/help.c:426 -msgid "The common Git guides are:\n" -msgstr "De vanliga Git-vägledningarna är:\n" - -#: builtin/help.c:444 +#: builtin/help.c:418 #, c-format msgid "'%s' is aliased to '%s'" msgstr "\"%s\" är ett alias för \"%s\"" -#: builtin/help.c:466 builtin/help.c:483 +#: builtin/help.c:445 builtin/help.c:475 #, c-format msgid "usage: %s%s" msgstr "användning: %s%s" -#: builtin/index-pack.c:157 -#, c-format -msgid "unable to open %s" -msgstr "kunde inte öppna %s" +#: builtin/help.c:459 +msgid "'git help config' for more information" +msgstr "\"git help config\" för mer information" -#: builtin/index-pack.c:207 +#: builtin/index-pack.c:208 #, c-format msgid "object type mismatch at %s" msgstr "objekttyp stämmer inte överens vid %s" -#: builtin/index-pack.c:227 +#: builtin/index-pack.c:228 #, c-format msgid "did not receive expected object %s" msgstr "emottog inte det förväntade objektet %s" -#: builtin/index-pack.c:230 +#: builtin/index-pack.c:231 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objektet %s: förväntad typ %s, såg %s" -#: builtin/index-pack.c:272 +#: builtin/index-pack.c:273 #, 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:282 +#: builtin/index-pack.c:283 msgid "early EOF" msgstr "tidigt filslut" -#: builtin/index-pack.c:283 +#: builtin/index-pack.c:284 msgid "read error on input" msgstr "indataläsfel" -#: builtin/index-pack.c:295 +#: builtin/index-pack.c:296 msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:302 +#: builtin/index-pack.c:303 builtin/pack-objects.c:590 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:305 builtin/unpack-objects.c:93 +#: builtin/index-pack.c:306 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:320 +#: builtin/index-pack.c:321 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:327 #, c-format msgid "cannot open packfile '%s'" msgstr "kan inte öppna paketfilen \"%s\"" -#: builtin/index-pack.c:340 +#: builtin/index-pack.c:341 msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" -#: builtin/index-pack.c:342 +#: builtin/index-pack.c:343 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stöds ej" -#: builtin/index-pack.c:360 +#: builtin/index-pack.c:361 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s" -#: builtin/index-pack.c:481 +#: builtin/index-pack.c:482 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:530 +#: builtin/index-pack.c:531 msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:539 msgid "delta base offset is out of bound" msgstr "deltabasindex utanför gränsen" -#: builtin/index-pack.c:546 +#: builtin/index-pack.c:547 #, c-format msgid "unknown object type %d" msgstr "okänd objekttyp %d" -#: builtin/index-pack.c:577 +#: builtin/index-pack.c:578 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: builtin/index-pack.c:579 +#: builtin/index-pack.c:580 #, 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:605 +#: builtin/index-pack.c:606 msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779 -#: builtin/index-pack.c:818 builtin/index-pack.c:827 +#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780 +#: builtin/index-pack.c:819 builtin/index-pack.c:828 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:753 builtin/pack-objects.c:182 -#: builtin/pack-objects.c:276 +#: builtin/index-pack.c:754 builtin/pack-objects.c:143 +#: builtin/pack-objects.c:203 builtin/pack-objects.c:297 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:816 +#: builtin/index-pack.c:817 #, c-format msgid "cannot read existing object info %s" msgstr "kan inte läsa information om befintligt objekt %s" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:825 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:838 +#: builtin/index-pack.c:839 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:853 +#: builtin/index-pack.c:842 builtin/index-pack.c:861 +msgid "fsck error in packed object" +msgstr "fsck-fel i packat objekt" + +#: builtin/index-pack.c:858 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/index-pack.c:856 -msgid "Error in object" -msgstr "Fel i objekt" - -#: builtin/index-pack.c:858 +#: builtin/index-pack.c:863 #, 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:930 builtin/index-pack.c:961 +#: builtin/index-pack.c:935 builtin/index-pack.c:966 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1131 +#: builtin/index-pack.c:1136 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1131 +#: builtin/index-pack.c:1136 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1165 +#: builtin/index-pack.c:1170 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1170 +#: builtin/index-pack.c:1175 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1173 +#: builtin/index-pack.c:1178 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1185 +#: builtin/index-pack.c:1190 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1208 +#: builtin/index-pack.c:1213 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1219 +#: builtin/index-pack.c:1224 builtin/pack-objects.c:2407 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1261 +#: builtin/index-pack.c:1266 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1272 #, 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:1279 +#: builtin/index-pack.c:1284 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1288 #, 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:1307 +#: builtin/index-pack.c:1312 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1383 +#: builtin/index-pack.c:1389 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1397 +#: builtin/index-pack.c:1403 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1422 +#: builtin/index-pack.c:1428 #, c-format msgid "cannot write %s file '%s'" msgstr "kan inte ta skriva %s-fil \"%s\"" -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1436 #, c-format msgid "cannot close written %s file '%s'" msgstr "kan inte stänga skriven %s-fil \"%s\"" -#: builtin/index-pack.c:1454 +#: builtin/index-pack.c:1460 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1468 +#: builtin/index-pack.c:1474 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1482 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1513 +#: builtin/index-pack.c:1526 builtin/pack-objects.c:2645 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1581 +#: builtin/index-pack.c:1595 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1583 +#: builtin/index-pack.c:1597 #, 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:1631 +#: builtin/index-pack.c:1645 #, 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:1638 +#: builtin/index-pack.c:1652 #, 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:1675 +#: builtin/index-pack.c:1689 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1724 builtin/index-pack.c:1727 -#: builtin/index-pack.c:1743 builtin/index-pack.c:1747 +#: builtin/index-pack.c:1740 builtin/index-pack.c:1743 +#: builtin/index-pack.c:1759 builtin/index-pack.c:1763 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1763 +#: builtin/index-pack.c:1779 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1765 +#: builtin/index-pack.c:1781 msgid "--stdin requires a git repository" msgstr "--stdin kräver ett git-arkiv" -#: builtin/index-pack.c:1771 +#: builtin/index-pack.c:1787 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" +#: builtin/index-pack.c:1837 builtin/unpack-objects.c:580 +msgid "fsck error in pack objects" +msgstr "fsck-fel i packat objekt" + #: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" @@ -9612,72 +11444,72 @@ msgstr "kan inte ta status på mallen \"%s\"" msgid "cannot opendir '%s'" msgstr "kan inte öppna katalogen (opendir) \"%s\"" -#: builtin/init-db.c:77 +#: builtin/init-db.c:78 #, c-format msgid "cannot readlink '%s'" msgstr "kan inte läsa länk (readlink) \"%s\"" -#: builtin/init-db.c:79 +#: builtin/init-db.c:80 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\"" -#: builtin/init-db.c:85 +#: builtin/init-db.c:86 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "kan inte kopiera \"%s\" till \"%s\"" -#: builtin/init-db.c:89 +#: builtin/init-db.c:90 #, c-format msgid "ignoring template %s" msgstr "ignorerar mallen %s" -#: builtin/init-db.c:120 +#: builtin/init-db.c:121 #, c-format -msgid "templates not found %s" -msgstr "mallarna hittades inte %s" +msgid "templates not found in %s" +msgstr "mallarna hittades inte i %s" -#: builtin/init-db.c:135 +#: builtin/init-db.c:136 #, c-format msgid "not copying templates from '%s': %s" msgstr "kopierade inte mallar från \"%s\": %s" -#: builtin/init-db.c:328 +#: builtin/init-db.c:329 #, c-format msgid "unable to handle file type %d" msgstr "kan inte hantera filtyp %d" -#: builtin/init-db.c:331 +#: builtin/init-db.c:332 #, c-format msgid "unable to move %s to %s" msgstr "kan inte flytta %s till %s" -#: builtin/init-db.c:348 builtin/init-db.c:351 +#: builtin/init-db.c:349 builtin/init-db.c:352 #, c-format msgid "%s already exists" msgstr "%s finns redan" -#: builtin/init-db.c:404 +#: builtin/init-db.c:405 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Ominitierade befintligt delat Git-arkiv i %s%s\n" -#: builtin/init-db.c:405 +#: builtin/init-db.c:406 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Ominitierade befintligt Git-arkiv i %s%s\n" -#: builtin/init-db.c:409 +#: builtin/init-db.c:410 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Initierade tomt delat Git-arkiv i %s%s\n" -#: builtin/init-db.c:410 +#: builtin/init-db.c:411 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Initierade tomt Git-arkiv i %s%s\n" -#: builtin/init-db.c:458 +#: builtin/init-db.c:459 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -9685,25 +11517,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" "shared[=<behörigheter>]] [<katalog>]" -#: builtin/init-db.c:481 +#: builtin/init-db.c:482 msgid "permissions" msgstr "behörigheter" -#: builtin/init-db.c:482 +#: builtin/init-db.c:483 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:516 builtin/init-db.c:521 +#: builtin/init-db.c:517 builtin/init-db.c:522 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:525 +#: builtin/init-db.c:526 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:546 +#: builtin/init-db.c:547 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -9712,7 +11544,7 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:574 +#: builtin/init-db.c:575 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" @@ -9777,120 +11609,120 @@ msgstr "--trailer med --only-input ger ingen mening" msgid "no input file given for in-place editing" msgstr "ingen indatafil angiven för redigering på plats" -#: builtin/log.c:48 +#: builtin/log.c:51 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" -#: builtin/log.c:49 +#: builtin/log.c:52 msgid "git show [<options>] <object>..." msgstr "git show [<flaggor>] <objekt>..." -#: builtin/log.c:93 +#: builtin/log.c:96 #, c-format msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:153 +#: builtin/log.c:157 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: builtin/log.c:154 +#: builtin/log.c:158 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:155 +#: builtin/log.c:159 msgid "Use mail map file" msgstr "Använd e-postmappningsfil" -#: builtin/log.c:157 +#: builtin/log.c:161 msgid "only decorate refs that match <pattern>" msgstr "dekorera endast referenser som motsvarar <mönster>" -#: builtin/log.c:159 +#: builtin/log.c:163 msgid "do not decorate refs that match <pattern>" msgstr "dekorera inte referenser som motsvarar <mönster>" -#: builtin/log.c:160 +#: builtin/log.c:164 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:163 +#: builtin/log.c:167 msgid "Process line range n,m in file, counting from 1" msgstr "Behandla radintervallet n,m i filen, med början på 1" -#: builtin/log.c:259 +#: builtin/log.c:265 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:510 +#: builtin/log.c:516 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:525 builtin/log.c:619 +#: builtin/log.c:531 builtin/log.c:625 #, c-format msgid "Could not read object %s" msgstr "Kunde inte läsa objektet %s" -#: builtin/log.c:643 +#: builtin/log.c:649 #, c-format msgid "Unknown type: %d" msgstr "Okänd typ: %d" -#: builtin/log.c:764 +#: builtin/log.c:770 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:865 +#: builtin/log.c:871 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:881 +#: builtin/log.c:887 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte öppna patchfilen %s" -#: builtin/log.c:898 +#: builtin/log.c:904 msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:908 +#: builtin/log.c:914 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:1014 +#: builtin/log.c:1020 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:1095 +#: builtin/log.c:1101 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1122 +#: builtin/log.c:1128 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1172 +#: builtin/log.c:1178 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946 +#: builtin/log.c:1285 builtin/log.c:1945 builtin/log.c:1947 builtin/log.c:1959 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" -#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522 +#: builtin/log.c:1295 builtin/notes.c:889 builtin/tag.c:524 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/log.c:1294 +#: builtin/log.c:1300 msgid "Could not find exact merge base." msgstr "Kunde inte hitta exakt sammanslagningsbas." -#: builtin/log.c:1298 +#: builtin/log.c:1304 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -9901,336 +11733,336 @@ msgstr "" "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> " "manuellt." -#: builtin/log.c:1318 +#: builtin/log.c:1324 msgid "Failed to find exact merge base" msgstr "Kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1329 +#: builtin/log.c:1335 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1333 +#: builtin/log.c:1339 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1382 +#: builtin/log.c:1392 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1441 +#: builtin/log.c:1452 msgid "use [PATCH n/m] even with a single patch" msgstr "använd [PATCH n/m] även för en ensam patch" -#: builtin/log.c:1444 +#: builtin/log.c:1455 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1448 +#: builtin/log.c:1459 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1450 +#: builtin/log.c:1461 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1452 +#: builtin/log.c:1463 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1453 +#: builtin/log.c:1464 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1454 +#: builtin/log.c:1465 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1456 +#: builtin/log.c:1467 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1458 +#: builtin/log.c:1469 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1460 +#: builtin/log.c:1471 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Använd [RFC PATCH] istället för [PATCH]" -#: builtin/log.c:1463 +#: builtin/log.c:1474 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1466 +#: builtin/log.c:1477 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1469 +#: builtin/log.c:1480 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1472 +#: builtin/log.c:1483 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1474 +#: builtin/log.c:1485 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1476 +#: builtin/log.c:1487 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1478 +#: builtin/log.c:1489 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1480 +#: builtin/log.c:1491 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1481 +#: builtin/log.c:1492 msgid "header" msgstr "huvud" -#: builtin/log.c:1482 +#: builtin/log.c:1493 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1483 builtin/log.c:1485 +#: builtin/log.c:1494 builtin/log.c:1496 msgid "email" msgstr "epost" -#: builtin/log.c:1483 +#: builtin/log.c:1494 msgid "add To: header" msgstr "lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1485 +#: builtin/log.c:1496 msgid "add Cc: header" msgstr "lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1487 +#: builtin/log.c:1498 msgid "ident" msgstr "ident" -#: builtin/log.c:1488 +#: builtin/log.c:1499 msgid "set From address to <ident> (or committer ident if absent)" msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)" -#: builtin/log.c:1490 +#: builtin/log.c:1501 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1491 +#: builtin/log.c:1502 msgid "make first mail a reply to <message-id>" msgstr "gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1492 builtin/log.c:1495 +#: builtin/log.c:1503 builtin/log.c:1506 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1493 +#: builtin/log.c:1504 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1496 +#: builtin/log.c:1507 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1500 +#: builtin/log.c:1511 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1502 +#: builtin/log.c:1513 msgid "signature" msgstr "signatur" -#: builtin/log.c:1503 +#: builtin/log.c:1514 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1504 +#: builtin/log.c:1515 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1505 +#: builtin/log.c:1516 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1507 +#: builtin/log.c:1518 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1508 +#: builtin/log.c:1519 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1510 +#: builtin/log.c:1521 msgid "show progress while generating patches" msgstr "visa förloppsindikator medan patchar skapas" -#: builtin/log.c:1585 +#: builtin/log.c:1596 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1600 -msgid "-n and -k are mutually exclusive." -msgstr "-n och -k kan inte användas samtidigt." +#: builtin/log.c:1611 +msgid "-n and -k are mutually exclusive" +msgstr "-n och -k kan inte användas samtidigt" -#: builtin/log.c:1602 -msgid "--subject-prefix/--rfc and -k are mutually exclusive." -msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt." +#: builtin/log.c:1613 +msgid "--subject-prefix/--rfc and -k are mutually exclusive" +msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt" -#: builtin/log.c:1610 +#: builtin/log.c:1621 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1612 +#: builtin/log.c:1623 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1614 +#: builtin/log.c:1625 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1646 +#: builtin/log.c:1657 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1648 +#: builtin/log.c:1659 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1741 +#: builtin/log.c:1752 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:1773 +#: builtin/log.c:1785 msgid "Generating patches" msgstr "Skapar patchar" -#: builtin/log.c:1817 +#: builtin/log.c:1829 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1867 +#: builtin/log.c:1880 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:1921 +#: builtin/log.c:1934 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:469 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<flaggor>] [<fil>...]" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:518 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:520 msgid "use lowercase letters for 'assume unchanged' files" msgstr "använd små bokstäver för \"anta oförändrade\"-filer" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:522 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "använd små bokstäver för \"fsmonitor clean\"-filer" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:524 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:526 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:528 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:530 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:532 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show staged contents' object name in the output" msgstr "visa köat innehålls objektnamn i utdata" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show files on the filesystem that need to be removed" msgstr "visa filer i filsystemet som behöver tas bort" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show 'other' directories' names only" msgstr "visa endast namn för \"andra\" kataloger" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show line endings of files" msgstr "visa radslut i filer" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:543 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "skip files matching pattern" msgstr "hoppa över filer som motsvarar mönster" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:553 msgid "exclude patterns are read from <file>" msgstr "exkludera mönster som läses från <fil>" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:556 msgid "read additional per-directory exclude patterns in <file>" msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:558 msgid "add the standard git exclusions" msgstr "lägg till git:s standardexkluderingar" -#: builtin/ls-files.c:560 +#: builtin/ls-files.c:561 msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:564 msgid "recurse through submodules" msgstr "rekursera ner i undermoduler" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:566 msgid "if any <file> is not in the index, treat this as an error" msgstr "om en <fil> inte är indexet, betrakta det som ett fel" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "tree-ish" msgstr "träd-igt" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:568 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns" -#: builtin/ls-files.c:569 +#: builtin/ls-files.c:570 msgid "show debugging data" msgstr "visa felsökningsutdata" -#: builtin/ls-remote.c:7 +#: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" @@ -10240,75 +12072,75 @@ msgstr "" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<arkiv> [<referenser>...]]" -#: builtin/ls-remote.c:52 +#: builtin/ls-remote.c:59 msgid "do not print remote URL" msgstr "visa inte fjärr-URL" -#: builtin/ls-remote.c:53 builtin/ls-remote.c:55 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 msgid "exec" msgstr "exec" -#: builtin/ls-remote.c:54 builtin/ls-remote.c:56 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 msgid "path of git-upload-pack on the remote host" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/ls-remote.c:58 +#: builtin/ls-remote.c:65 msgid "limit to tags" msgstr "begränsa till taggar" -#: builtin/ls-remote.c:59 +#: builtin/ls-remote.c:66 msgid "limit to heads" msgstr "begränsa till huvuden" -#: builtin/ls-remote.c:60 +#: builtin/ls-remote.c:67 msgid "do not show peeled tags" msgstr "visa inte avskalade taggar" -#: builtin/ls-remote.c:62 +#: builtin/ls-remote.c:69 msgid "take url.<base>.insteadOf into account" msgstr "ta hänsyn till url.<bas>.insteadOf" -#: builtin/ls-remote.c:64 +#: builtin/ls-remote.c:73 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:67 +#: builtin/ls-remote.c:76 msgid "show underlying ref in addition to the object pointed by it" msgstr "visa underliggande referens och objektet det pekar på" -#: builtin/ls-tree.c:29 +#: builtin/ls-tree.c:30 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]" -#: builtin/ls-tree.c:127 +#: builtin/ls-tree.c:128 msgid "only show trees" msgstr "visa endast träd" -#: builtin/ls-tree.c:129 +#: builtin/ls-tree.c:130 msgid "recurse into subtrees" msgstr "rekursera ner i underträd" -#: builtin/ls-tree.c:131 +#: builtin/ls-tree.c:132 msgid "show trees when recursing" msgstr "visa träd medan rekursering" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "terminate entries with NUL byte" msgstr "terminera poster med NUL-byte" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:136 msgid "include object size" msgstr "inkludera objektstorlek" -#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 +#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 msgid "list only filenames" msgstr "visa endast filnamn" -#: builtin/ls-tree.c:142 +#: builtin/ls-tree.c:143 msgid "use full path names" msgstr "använd fullständiga sökvägsnamn" -#: builtin/ls-tree.c:144 +#: builtin/ls-tree.c:145 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" @@ -10317,183 +12149,183 @@ msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" msgid "empty mbox: '%s'" msgstr "tom mbox: ”%s”" -#: builtin/merge.c:49 +#: builtin/merge.c:51 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<flaggor>] [<incheckning>...]" -#: builtin/merge.c:50 +#: builtin/merge.c:52 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:51 +#: builtin/merge.c:53 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:108 +#: builtin/merge.c:110 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:145 +#: builtin/merge.c:176 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:146 +#: builtin/merge.c:177 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:151 +#: builtin/merge.c:182 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:201 builtin/pull.c:137 +#: builtin/merge.c:232 builtin/pull.c:142 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:204 builtin/pull.c:140 +#: builtin/merge.c:235 builtin/pull.c:145 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:205 builtin/pull.c:143 +#: builtin/merge.c:236 builtin/pull.c:148 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:207 builtin/pull.c:146 +#: builtin/merge.c:238 builtin/pull.c:151 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:210 builtin/pull.c:152 +#: builtin/merge.c:241 builtin/pull.c:157 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:212 builtin/pull.c:155 +#: builtin/merge.c:243 builtin/pull.c:160 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:214 builtin/pull.c:158 +#: builtin/merge.c:245 builtin/pull.c:163 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:215 +#: builtin/merge.c:246 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:217 builtin/pull.c:164 +#: builtin/merge.c:248 builtin/pull.c:169 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:221 builtin/pull.c:167 +#: builtin/merge.c:252 builtin/pull.c:172 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:222 builtin/notes.c:777 builtin/pull.c:171 -#: builtin/revert.c:109 +#: builtin/merge.c:253 builtin/notes.c:779 builtin/pull.c:176 +#: builtin/revert.c:110 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:223 builtin/pull.c:172 +#: builtin/merge.c:254 builtin/pull.c:177 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:224 builtin/pull.c:175 +#: builtin/merge.c:255 builtin/pull.c:180 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:225 builtin/pull.c:176 +#: builtin/merge.c:256 builtin/pull.c:181 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:227 +#: builtin/merge.c:258 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:231 +#: builtin/merge.c:265 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:233 +#: builtin/merge.c:267 msgid "continue the current in-progress merge" msgstr "fortsätt den pågående sammanslagningen" -#: builtin/merge.c:235 builtin/pull.c:183 +#: builtin/merge.c:269 builtin/pull.c:188 msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" -#: builtin/merge.c:241 +#: builtin/merge.c:275 msgid "verify commit-msg hook" msgstr "bekräfta commit-msg-krok" -#: builtin/merge.c:266 +#: builtin/merge.c:300 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:271 +#: builtin/merge.c:305 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:276 +#: builtin/merge.c:310 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:298 builtin/merge.c:315 +#: builtin/merge.c:332 builtin/merge.c:349 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:345 +#: builtin/merge.c:379 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:356 +#: builtin/merge.c:390 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:406 +#: builtin/merge.c:440 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:456 +#: builtin/merge.c:491 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:546 +#: builtin/merge.c:578 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:668 +#: builtin/merge.c:699 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:682 +#: builtin/merge.c:713 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:697 +#: builtin/merge.c:728 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:749 +#: builtin/merge.c:779 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:758 +#: builtin/merge.c:788 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra " "den.\n" -#: builtin/merge.c:764 +#: builtin/merge.c:794 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -10509,69 +12341,69 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:800 +#: builtin/merge.c:830 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:820 +#: builtin/merge.c:849 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:873 +#: builtin/merge.c:902 #, 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:912 +#: builtin/merge.c:941 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:914 +#: builtin/merge.c:943 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:916 +#: builtin/merge.c:945 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:921 +#: builtin/merge.c:950 #, 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:974 +#: builtin/merge.c:1007 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1076 +#: builtin/merge.c:1110 #, 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:1110 +#: builtin/merge.c:1144 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1212 +#: builtin/merge.c:1247 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1216 +#: builtin/merge.c:1251 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1228 +#: builtin/merge.c:1263 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1232 +#: builtin/merge.c:1267 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1248 +#: builtin/merge.c:1283 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10579,7 +12411,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1255 +#: builtin/merge.c:1290 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10587,156 +12419,156 @@ 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:1258 +#: builtin/merge.c:1293 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:1267 +#: builtin/merge.c:1302 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1275 +#: builtin/merge.c:1310 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1292 +#: builtin/merge.c:1327 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1294 +#: builtin/merge.c:1329 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:1299 +#: builtin/merge.c:1334 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1301 +#: builtin/merge.c:1336 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:1335 +#: builtin/merge.c:1370 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s." -#: builtin/merge.c:1338 +#: builtin/merge.c:1373 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s." -#: builtin/merge.c:1341 +#: builtin/merge.c:1376 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: builtin/merge.c:1344 +#: builtin/merge.c:1379 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n" -#: builtin/merge.c:1403 +#: builtin/merge.c:1438 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1412 +#: builtin/merge.c:1447 msgid "Already up to date." msgstr "Redan à jour." -#: builtin/merge.c:1422 +#: builtin/merge.c:1457 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1463 +#: builtin/merge.c:1498 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1470 +#: builtin/merge.c:1505 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1495 +#: builtin/merge.c:1530 msgid "Already up to date. Yeeah!" msgstr "Redan à jour. Toppen!" -#: builtin/merge.c:1501 +#: builtin/merge.c:1536 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1524 builtin/merge.c:1603 +#: builtin/merge.c:1559 builtin/merge.c:1638 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1528 +#: builtin/merge.c:1563 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1594 +#: builtin/merge.c:1629 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1596 +#: builtin/merge.c:1631 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1605 +#: builtin/merge.c:1640 #, 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:1617 +#: builtin/merge.c:1652 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n" -#: builtin/merge-base.c:30 +#: builtin/merge-base.c:31 msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "git merge-base [-a | --all] <incheckning> <incheckning>..." -#: builtin/merge-base.c:31 +#: builtin/merge-base.c:32 msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <incheckning>..." -#: builtin/merge-base.c:32 +#: builtin/merge-base.c:33 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <incheckning>..." -#: builtin/merge-base.c:33 +#: builtin/merge-base.c:34 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <incheckning> <incheckning>" -#: builtin/merge-base.c:34 +#: builtin/merge-base.c:35 msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <ref> [<incheckning>]" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:221 msgid "output all common ancestors" msgstr "skriv ut alla gemensamma anfäder" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:223 msgid "find ancestors for a single n-way merge" msgstr "hitta anfader för enkel n-vägssammanslagning" -#: builtin/merge-base.c:224 +#: builtin/merge-base.c:225 msgid "list revs not reachable from others" msgstr "visa revisioner som inte kan nås från andra" -#: builtin/merge-base.c:226 +#: builtin/merge-base.c:227 msgid "is the first one ancestor of the other?" msgstr "är den första anfader till den andra?" -#: builtin/merge-base.c:228 +#: builtin/merge-base.c:229 msgid "find where <commit> forked from reflog of <ref>" msgstr "se var <incheckning> grenades av från referensloggen från <ref>" @@ -10811,19 +12643,19 @@ msgstr "kunde inte bestämma referensen ”%s”" msgid "Merging %s with %s\n" msgstr "Slår ihop %s med %s\n" -#: builtin/mktree.c:65 +#: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" -#: builtin/mktree.c:153 +#: builtin/mktree.c:154 msgid "input is NUL terminated" msgstr "indata är NUL-terminerad" -#: builtin/mktree.c:154 builtin/write-tree.c:25 +#: builtin/mktree.c:155 builtin/write-tree.c:25 msgid "allow missing objects" msgstr "tillåt saknade objekt" -#: builtin/mktree.c:155 +#: builtin/mktree.c:156 msgid "allow creation of more than one tree" msgstr "tillåt skapa mer än ett träd" @@ -10831,26 +12663,26 @@ msgstr "tillåt skapa mer än ett träd" msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<flaggor>] <källa>... <mål>" -#: builtin/mv.c:83 +#: builtin/mv.c:82 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "Katalogen %s är i indexet och inte en undermodul?" -#: builtin/mv.c:85 builtin/rm.c:289 +#: builtin/mv.c:84 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta" -#: builtin/mv.c:103 +#: builtin/mv.c:102 #, c-format msgid "%.*s is in index" msgstr "%.*s är i indexet" -#: builtin/mv.c:125 +#: builtin/mv.c:124 msgid "force move/rename even if target exists" msgstr "tvinga flytta/ändra namn även om målet finns" -#: builtin/mv.c:127 +#: builtin/mv.c:126 msgid "skip move/rename errors" msgstr "hoppa över fel vid flytt/namnändring" @@ -10915,60 +12747,60 @@ 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:276 builtin/remote.c:712 builtin/repack.c:394 +#: builtin/mv.c:276 builtin/remote.c:716 builtin/repack.c:494 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" -#: builtin/name-rev.c:338 +#: builtin/name-rev.c:355 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<flaggor>] <incheckning>..." -#: builtin/name-rev.c:339 +#: builtin/name-rev.c:356 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<flaggor>] --all" -#: builtin/name-rev.c:340 +#: builtin/name-rev.c:357 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<flaggor>] --stdin" -#: builtin/name-rev.c:395 +#: builtin/name-rev.c:413 msgid "print only names (no SHA-1)" msgstr "skriv endast namn (ingen SHA-1)" -#: builtin/name-rev.c:396 +#: builtin/name-rev.c:414 msgid "only use tags to name the commits" msgstr "använd endast taggar för att namnge incheckningar" -#: builtin/name-rev.c:398 +#: builtin/name-rev.c:416 msgid "only use refs matching <pattern>" msgstr "använd endast referenser som motsvarar <mönster>" -#: builtin/name-rev.c:400 +#: builtin/name-rev.c:418 msgid "ignore refs matching <pattern>" msgstr "ignorera referenser som motsvarar <mönster>" -#: builtin/name-rev.c:402 +#: builtin/name-rev.c:420 msgid "list all commits reachable from all refs" msgstr "lista alla incheckningar som kan nås alla referenser" -#: builtin/name-rev.c:403 +#: builtin/name-rev.c:421 msgid "read from stdin" msgstr "läs från standard in" -#: builtin/name-rev.c:404 +#: builtin/name-rev.c:422 msgid "allow to print `undefined` names (default)" msgstr "tillåt att skriva \"odefinierade\" namn (standard)" -#: builtin/name-rev.c:410 +#: builtin/name-rev.c:428 msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" -#: builtin/notes.c:26 +#: builtin/notes.c:28 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]" -#: builtin/notes.c:27 +#: builtin/notes.c:29 msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" @@ -10976,12 +12808,12 @@ msgstr "" "git notes [--ref <anteckningsref>] add [-f] [--allow-empty] [-m <medd> | -F " "<fil> | (-c | -C) <objekt>] [<objekt>]" -#: builtin/notes.c:28 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" "git notes [--ref <anteckningsref>] copy [-f] <från-objekt> <till-objekt>" -#: builtin/notes.c:29 +#: builtin/notes.c:31 msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" @@ -10989,157 +12821,157 @@ msgstr "" "git notes [--ref <anteckningsref>] append [--allow-empty] [-m <medd> | -F " "<fil> | (-c | -C) <objekt>] [<objekt>]" -#: builtin/notes.c:30 +#: builtin/notes.c:32 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <anteckningsref>] edit [--allow-empty] [<objekt>]" -#: builtin/notes.c:31 +#: builtin/notes.c:33 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <anteckningsref>] show [<objekt>]" -#: builtin/notes.c:32 +#: builtin/notes.c:34 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" "git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi>] " "<anteckningsref>" -#: builtin/notes.c:33 +#: builtin/notes.c:35 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:34 +#: builtin/notes.c:36 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:35 +#: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]" -#: builtin/notes.c:36 +#: builtin/notes.c:38 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" msgstr "git notes [--ref <anteckningsref>] prune [-n] [-v]" -#: builtin/notes.c:37 +#: builtin/notes.c:39 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <anteckningsref>] get-ref" -#: builtin/notes.c:42 +#: builtin/notes.c:44 msgid "git notes [list [<object>]]" msgstr "git notes [list [<objekt>]]" -#: builtin/notes.c:47 +#: builtin/notes.c:49 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<flaggor>] [<objekt>]" -#: builtin/notes.c:52 +#: builtin/notes.c:54 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<flaggor>] <från-objekt> <till-objekt>" -#: builtin/notes.c:53 +#: builtin/notes.c:55 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<från-objekt> <till-objekt>]..." -#: builtin/notes.c:58 +#: builtin/notes.c:60 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<flaggor>] [<objekt>]" -#: builtin/notes.c:63 +#: builtin/notes.c:65 msgid "git notes edit [<object>]" msgstr "git notes edit [<objekt>]" -#: builtin/notes.c:68 +#: builtin/notes.c:70 msgid "git notes show [<object>]" msgstr "git notes show [<objekt>]" -#: builtin/notes.c:73 +#: builtin/notes.c:75 msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<flaggor>] <anteckningsref>" -#: builtin/notes.c:74 +#: builtin/notes.c:76 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<flaggor>]" -#: builtin/notes.c:75 +#: builtin/notes.c:77 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<flaggor>]" -#: builtin/notes.c:80 +#: builtin/notes.c:82 msgid "git notes remove [<object>]" msgstr "git notes remove [<objekt>]" -#: builtin/notes.c:85 +#: builtin/notes.c:87 msgid "git notes prune [<options>]" msgstr "git notes prune [<flaggor>]" -#: builtin/notes.c:90 +#: builtin/notes.c:92 msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:95 +#: builtin/notes.c:97 msgid "Write/edit the notes for the following object:" msgstr "Skriv/redigera anteckningar för följande objekt:" -#: builtin/notes.c:148 +#: builtin/notes.c:150 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "kunde inte starta \"show\" för objektet \"%s\"" -#: builtin/notes.c:152 +#: builtin/notes.c:154 msgid "could not read 'show' output" msgstr "kunde inte läsa utdata från \"show\"" -#: builtin/notes.c:160 +#: builtin/notes.c:162 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "kunde inte avsluta \"show\" för objektet \"%s\"" -#: builtin/notes.c:195 +#: builtin/notes.c:197 msgid "please supply the note contents using either -m or -F option" msgstr "ange innehåll för anteckningen med antingen -m eller -F" -#: builtin/notes.c:204 +#: builtin/notes.c:206 msgid "unable to write note object" msgstr "kunde inte skriva anteckningsobjekt" -#: builtin/notes.c:206 +#: builtin/notes.c:208 #, c-format msgid "the note contents have been left in %s" msgstr "anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:234 builtin/tag.c:506 +#: builtin/notes.c:236 builtin/tag.c:508 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/notes.c:236 builtin/tag.c:509 +#: builtin/notes.c:238 builtin/tag.c:511 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" -#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 -#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 -#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 +#: builtin/notes.c:257 builtin/notes.c:308 builtin/notes.c:310 +#: builtin/notes.c:378 builtin/notes.c:433 builtin/notes.c:519 +#: builtin/notes.c:524 builtin/notes.c:602 builtin/notes.c:664 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/notes.c:258 +#: builtin/notes.c:260 #, c-format msgid "failed to read object '%s'." msgstr "kunde inte läsa objektet \"%s\"." -#: builtin/notes.c:262 +#: builtin/notes.c:264 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "kan inte läsa anteckningsdata från icke-blob-objektet \"%s\"." -#: builtin/notes.c:302 +#: builtin/notes.c:304 #, c-format msgid "malformed input line: '%s'." msgstr "felaktig indatarad: \"%s\"." -#: builtin/notes.c:317 +#: builtin/notes.c:319 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\"" @@ -11147,47 +12979,47 @@ msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\"" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c:349 +#: builtin/notes.c:351 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "vägrar utföra \"%s\" på anteckningar i %s (utanför refs/notes/)" -#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 -#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 -#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 +#: builtin/notes.c:371 builtin/notes.c:426 builtin/notes.c:502 +#: builtin/notes.c:514 builtin/notes.c:590 builtin/notes.c:657 +#: builtin/notes.c:807 builtin/notes.c:954 builtin/notes.c:975 msgid "too many parameters" msgstr "för många parametrar" -#: builtin/notes.c:382 builtin/notes.c:668 +#: builtin/notes.c:384 builtin/notes.c:670 #, c-format msgid "no note found for object %s." msgstr "inga anteckningar hittades för objektet %s." -#: builtin/notes.c:403 builtin/notes.c:566 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "note contents as a string" msgstr "anteckningsinnehåll som sträng" -#: builtin/notes.c:406 builtin/notes.c:569 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "note contents in a file" msgstr "anteckningsinnehåll i en fil" -#: builtin/notes.c:409 builtin/notes.c:572 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "reuse and edit specified note object" msgstr "återanvänd och redigera angivet anteckningsobjekt" -#: builtin/notes.c:412 builtin/notes.c:575 +#: builtin/notes.c:414 builtin/notes.c:577 msgid "reuse specified note object" msgstr "återanvänd angivet anteckningsobjekt" -#: builtin/notes.c:415 builtin/notes.c:578 +#: builtin/notes.c:417 builtin/notes.c:580 msgid "allow storing empty note" msgstr "tillåt lagra tom anteckning" -#: builtin/notes.c:416 builtin/notes.c:487 +#: builtin/notes.c:418 builtin/notes.c:489 msgid "replace existing notes" msgstr "ersätt befintliga anteckningar" -#: builtin/notes.c:441 +#: builtin/notes.c:443 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -11196,29 +13028,29 @@ msgstr "" "Kan inte lägga till anteckningar. Hittade befintliga anteckningar för " "objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:456 builtin/notes.c:535 +#: builtin/notes.c:458 builtin/notes.c:537 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Skriver över befintliga anteckningar för objektet %s\n" -#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 +#: builtin/notes.c:469 builtin/notes.c:629 builtin/notes.c:894 #, c-format msgid "Removing note for object %s\n" msgstr "Tar bort anteckning för objektet %s\n" -#: builtin/notes.c:488 +#: builtin/notes.c:490 msgid "read objects from stdin" msgstr "läs objekt från standard in" -#: builtin/notes.c:490 +#: builtin/notes.c:492 msgid "load rewriting config for <command> (implies --stdin)" msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)" -#: builtin/notes.c:508 +#: builtin/notes.c:510 msgid "too few parameters" msgstr "för få parametrar" -#: builtin/notes.c:529 +#: builtin/notes.c:531 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -11227,12 +13059,12 @@ msgstr "" "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet " "%s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:541 +#: builtin/notes.c:543 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "anteckningar på källobjektet %s saknas. Kan inte kopiera." -#: builtin/notes.c:593 +#: builtin/notes.c:595 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -11241,52 +13073,52 @@ msgstr "" "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n" "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n" -#: builtin/notes.c:688 +#: builtin/notes.c:690 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "misslyckades ta bort referensen NOTES_MERGE_PARTIAL" -#: builtin/notes.c:690 +#: builtin/notes.c:692 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "misslyckades ta bort referensen NOTES_MERGE_REF" -#: builtin/notes.c:692 +#: builtin/notes.c:694 msgid "failed to remove 'git notes merge' worktree" msgstr "misslyckades ta bort arbetskatalogen för \"git notes merge\"" -#: builtin/notes.c:712 +#: builtin/notes.c:714 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "misslyckades läsa references NOTES_MERGE_PARTIAL" -#: builtin/notes.c:714 +#: builtin/notes.c:716 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "kunde inte hitta incheckning från NOTES_MERGE_PARTIAL." -#: builtin/notes.c:716 +#: builtin/notes.c:718 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "kunde inte tolka incheckning från NOTES_MERGE_PARTIAL." -#: builtin/notes.c:729 +#: builtin/notes.c:731 msgid "failed to resolve NOTES_MERGE_REF" msgstr "misslyckades bestämma NOTES_MERGE_REF" -#: builtin/notes.c:732 +#: builtin/notes.c:734 msgid "failed to finalize notes merge" msgstr "misslyckades färdigställa sammanslagning av anteckningar" -#: builtin/notes.c:758 +#: builtin/notes.c:760 #, c-format msgid "unknown notes merge strategy %s" msgstr "okänd sammanslagningsstrategi för anteckningar: %s" -#: builtin/notes.c:774 +#: builtin/notes.c:776 msgid "General options" msgstr "Allmänna flaggor" -#: builtin/notes.c:776 +#: builtin/notes.c:778 msgid "Merge options" msgstr "Flaggor för sammanslagning" -#: builtin/notes.c:778 +#: builtin/notes.c:780 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -11294,48 +13126,48 @@ msgstr "" "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:780 +#: builtin/notes.c:782 msgid "Committing unmerged notes" msgstr "Checkar in ej sammanslagna anteckningar" -#: builtin/notes.c:782 +#: builtin/notes.c:784 msgid "finalize notes merge by committing unmerged notes" msgstr "" "färdigställ sammanslagning av anteckningar genom att checka in ej " "sammanslagna anteckningar" -#: builtin/notes.c:784 +#: builtin/notes.c:786 msgid "Aborting notes merge resolution" msgstr "Avbryt lösning av sammanslagning av anteckningar" -#: builtin/notes.c:786 +#: builtin/notes.c:788 msgid "abort notes merge" msgstr "avbryt sammanslagning av anteckningar" -#: builtin/notes.c:797 +#: builtin/notes.c:799 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "kan inte blanda --commit, --abort eller -s/--strategy" -#: builtin/notes.c:802 +#: builtin/notes.c:804 msgid "must specify a notes ref to merge" msgstr "måste ange en antecknings-referens att slå ihop" -#: builtin/notes.c:826 +#: builtin/notes.c:828 #, c-format msgid "unknown -s/--strategy: %s" msgstr "okänd -s/--strategy: %s" -#: builtin/notes.c:863 +#: builtin/notes.c:865 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "sammanslagning av anteckningar till %s är redan igångsatt på %s" -#: builtin/notes.c:866 +#: builtin/notes.c:868 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "misslyckades lagra länk till aktuell anteckningsreferens (%s)" -#: builtin/notes.c:868 +#: builtin/notes.c:870 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -11346,319 +13178,501 @@ msgstr "" "%s och checka in resultatet med \"git notes merge --commit\", eller avbryt " "sammanslagningen med \"git notes merge --abort\".\n" -#: builtin/notes.c:890 +#: builtin/notes.c:892 #, c-format msgid "Object %s has no note\n" msgstr "Objektet %s har ingen anteckning\n" -#: builtin/notes.c:902 +#: builtin/notes.c:904 msgid "attempt to remove non-existent note is not an error" msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel" -#: builtin/notes.c:905 +#: builtin/notes.c:907 msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160 +#: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:152 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" -#: builtin/notes.c:944 +#: builtin/notes.c:946 msgid "report pruned notes" msgstr "rapportera borttagna anteckningar" -#: builtin/notes.c:986 +#: builtin/notes.c:988 msgid "notes-ref" msgstr "anteckningar-ref" -#: builtin/notes.c:987 +#: builtin/notes.c:989 msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1022 +#: builtin/notes.c:1024 #, c-format msgid "unknown subcommand: %s" msgstr "okänt underkommando: %s" -#: builtin/pack-objects.c:33 +#: builtin/pack-objects.c:48 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:34 +#: builtin/pack-objects.c:49 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:195 builtin/pack-objects.c:198 +#: builtin/pack-objects.c:414 #, c-format -msgid "deflate error (%d)" -msgstr "fel i deflate (%d)" +msgid "bad packed object CRC for %s" +msgstr "felaktig CRC för packat objekt %s" + +#: builtin/pack-objects.c:425 +#, c-format +msgid "corrupt packed object for %s" +msgstr "trasigt packat objekt för %s" + +#: builtin/pack-objects.c:556 +#, c-format +msgid "recursive delta detected for object %s" +msgstr "rekursivt delta upptäcktes för objektet %s" + +#: builtin/pack-objects.c:756 +#, c-format +msgid "ordered %u objects, expected %<PRIu32>" +msgstr "ordnade %u objekt, förväntade %<PRIu32>" -#: builtin/pack-objects.c:791 +#: builtin/pack-objects.c:769 +#, c-format +msgid "packfile is invalid: %s" +msgstr "packfil är ogiltig: %s" + +#: builtin/pack-objects.c:773 +#, c-format +msgid "unable to open packfile for reuse: %s" +msgstr "kan inte öppna packfil för återanvändning: %s" + +#: builtin/pack-objects.c:777 +msgid "unable to seek in reused packfile" +msgstr "kan inte söka i återanvänd packfil" + +#: builtin/pack-objects.c:788 +msgid "unable to read from reused packfile" +msgstr "kan inte läsa från återanvänd packfil" + +#: builtin/pack-objects.c:816 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:804 +#: builtin/pack-objects.c:829 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1084 +#: builtin/pack-objects.c:891 builtin/update-index.c:88 +#, c-format +msgid "failed to stat %s" +msgstr "misslyckades ta status på %s" + +#: builtin/pack-objects.c:944 +#, c-format +msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" +msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades" + +#: builtin/pack-objects.c:1112 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:2454 +#: builtin/pack-objects.c:1489 +#, 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:1498 +#, 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:1771 +msgid "Counting objects" +msgstr "Räknar objekt" + +#: builtin/pack-objects.c:1913 +#, c-format +msgid "unable to get size of %s" +msgstr "kan inte hämta storlek på %s" + +#: builtin/pack-objects.c:1928 +#, c-format +msgid "unable to parse object header of %s" +msgstr "kunde inte tolka objekthuvud för %s" + +#: builtin/pack-objects.c:1995 builtin/pack-objects.c:2011 +#: builtin/pack-objects.c:2021 +#, c-format +msgid "object %s cannot be read" +msgstr "objektet %s kunde inte läsas" + +#: builtin/pack-objects.c:1998 builtin/pack-objects.c:2025 +#, c-format +msgid "object %s inconsistent object length (%lu vs %lu)" +msgstr "objektet %s har inkonsistent objektlängd (%lu mot %lu)" + +#: builtin/pack-objects.c:2035 +msgid "suboptimal pack - out of memory" +msgstr "icke-optimalt pack - minnet slut" + +#: builtin/pack-objects.c:2366 +#, c-format +msgid "Delta compression using up to %d threads" +msgstr "Deltakomprimering använder upp till %d trådar" + +#: builtin/pack-objects.c:2502 +#, 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:2586 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2592 +msgid "inconsistency with delta count" +msgstr "deltaräknaren är inkonsekvent" + +#: builtin/pack-objects.c:2671 +#, c-format +msgid "" +"expected edge object ID, got garbage:\n" +" %s" +msgstr "" +"förväntade kant-objekt-id, fick skräp:\n" +" %s" + +#: builtin/pack-objects.c:2677 +#, c-format +msgid "" +"expected object ID, got garbage:\n" +" %s" +msgstr "" +"förväntade objekt-id, fick skräp:\n" +" %s" + +#: builtin/pack-objects.c:2757 msgid "invalid value for --missing" msgstr "ogiltigt värde för --missing" -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:2816 builtin/pack-objects.c:2924 +msgid "cannot open pack index" +msgstr "kan inte öppna paketfilen" + +#: builtin/pack-objects.c:2847 +#, 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:2932 +msgid "unable to force loose object" +msgstr "kan inte tvinga lösa objekt" + +#: builtin/pack-objects.c:3019 +#, c-format +msgid "not a rev '%s'" +msgstr "inte en referens \"%s\"" + +#: builtin/pack-objects.c:3022 +#, c-format +msgid "bad revision '%s'" +msgstr "felaktig revision \"%s\"" + +#: builtin/pack-objects.c:3042 +msgid "unable to add recent objects" +msgstr "kan inte lägga till nya objekt" + +#: builtin/pack-objects.c:3092 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2932 +#: builtin/pack-objects.c:3096 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2962 +#: builtin/pack-objects.c:3127 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:2964 +#: builtin/pack-objects.c:3129 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:2966 +#: builtin/pack-objects.c:3131 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2969 +#: builtin/pack-objects.c:3134 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" -#: builtin/pack-objects.c:2970 -msgid "version[,offset]" -msgstr "version[,offset]" +#: builtin/pack-objects.c:3135 +msgid "<version>[,<offset>]" +msgstr "<version>[,<offset>]" -#: builtin/pack-objects.c:2971 +#: builtin/pack-objects.c:3136 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2974 +#: builtin/pack-objects.c:3139 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:2976 +#: builtin/pack-objects.c:3141 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:2978 +#: builtin/pack-objects.c:3143 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2980 +#: builtin/pack-objects.c:3145 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:2982 +#: builtin/pack-objects.c:3147 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:2984 +#: builtin/pack-objects.c:3149 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:2986 +#: builtin/pack-objects.c:3151 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:2988 +#: builtin/pack-objects.c:3153 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:2990 +#: builtin/pack-objects.c:3155 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:3157 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:2994 +#: builtin/pack-objects.c:3159 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:2996 +#: builtin/pack-objects.c:3161 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:2998 +#: builtin/pack-objects.c:3163 msgid "limit the objects to those that are not yet packed" msgstr "begränsa objekt till de som ännu inte packats" -#: builtin/pack-objects.c:3001 +#: builtin/pack-objects.c:3166 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:3004 +#: builtin/pack-objects.c:3169 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:3007 +#: builtin/pack-objects.c:3172 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:3010 +#: builtin/pack-objects.c:3175 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:3012 +#: builtin/pack-objects.c:3177 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:3014 +#: builtin/pack-objects.c:3179 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:3016 +#: builtin/pack-objects.c:3181 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:3018 +#: builtin/pack-objects.c:3183 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:3021 +#: builtin/pack-objects.c:3186 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:3023 +#: builtin/pack-objects.c:3188 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:3025 +#: builtin/pack-objects.c:3190 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:3027 +#: builtin/pack-objects.c:3192 +msgid "ignore this pack" +msgstr "ignorera detta paket" + +#: builtin/pack-objects.c:3194 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:3029 +#: builtin/pack-objects.c:3196 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:3031 +#: builtin/pack-objects.c:3198 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:3033 +#: builtin/pack-objects.c:3200 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:3036 +#: builtin/pack-objects.c:3203 msgid "handling for missing objects" msgstr "hantering av saknade objekt" -#: builtin/pack-objects.c:3039 +#: builtin/pack-objects.c:3206 msgid "do not pack objects in promisor packfiles" msgstr "packa inte objekt i kontraktspackfiler" -#: builtin/pack-objects.c:3178 -msgid "Counting objects" -msgstr "Räknar objekt" +#: builtin/pack-objects.c:3230 +#, 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:3235 +#, 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:3291 +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:3293 +msgid "minimum pack size limit is 1 MiB" +msgstr "minsta packstorlek är 1 MiB" + +#: builtin/pack-objects.c:3298 +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:3301 +msgid "--keep-unreachable and --unpack-unreachable are incompatible" +msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt" + +#: builtin/pack-objects.c:3307 +msgid "cannot use --filter without --stdout" +msgstr "kan inte använda --filter utan --stdout" + +#: builtin/pack-objects.c:3363 +msgid "Enumerating objects" +msgstr "Räknar upp objekt" -#: builtin/pack-refs.c:6 +#: builtin/pack-objects.c:3382 +#, c-format +msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +msgstr "" +"Totalt %<PRIu32> (delta %<PRIu32>), återanvände %<PRIu32> (delta %<PRIu32>)" + +#: builtin/pack-refs.c:7 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<flaggor>]" -#: builtin/pack-refs.c:14 +#: builtin/pack-refs.c:15 msgid "pack everything" msgstr "packa allt" -#: builtin/pack-refs.c:15 +#: builtin/pack-refs.c:16 msgid "prune loose refs (default)" msgstr "ta bort lösa referenser (standard)" -#: builtin/prune-packed.c:8 +#: builtin/prune-packed.c:9 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" -#: builtin/prune-packed.c:41 +#: builtin/prune-packed.c:42 msgid "Removing duplicate objects" msgstr "Tar bort duplicerade objekt" -#: builtin/prune.c:11 +#: builtin/prune.c:12 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]" -#: builtin/prune.c:107 +#: builtin/prune.c:109 msgid "report pruned objects" msgstr "rapportera borttagna objekt" -#: builtin/prune.c:110 +#: builtin/prune.c:112 msgid "expire objects older than <time>" msgstr "låt tid gå ut för objekt äldre än <tid>" -#: builtin/prune.c:112 +#: builtin/prune.c:114 msgid "limit traversal to objects outside promisor packfiles" msgstr "begränsa vandring av objekt utanför kontraktspackfiler." -#: builtin/prune.c:126 +#: builtin/prune.c:128 msgid "cannot prune in a precious-objects repo" msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv" -#: builtin/pull.c:54 builtin/pull.c:56 +#: builtin/pull.c:59 builtin/pull.c:61 #, c-format msgid "Invalid value for %s: %s" msgstr "Felaktigt värde för %s: %s" -#: builtin/pull.c:76 +#: builtin/pull.c:81 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/pull.c:127 +#: builtin/pull.c:132 msgid "control for recursive fetching of submodules" msgstr "styrning för rekursiv hämtning av undermoduler" -#: builtin/pull.c:131 +#: builtin/pull.c:136 msgid "Options related to merging" msgstr "Alternativ gällande sammanslagning" -#: builtin/pull.c:134 +#: builtin/pull.c:139 msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" -#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121 +#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:122 msgid "allow fast-forward" msgstr "tillåt snabbspolning" -#: builtin/pull.c:170 +#: builtin/pull.c:175 msgid "automatically stash/stash pop before and after rebase" msgstr "utför automatiskt stash/stash pop före och efter ombasering" -#: builtin/pull.c:186 +#: builtin/pull.c:191 msgid "Options related to fetching" msgstr "Alternativ gällande hämtningar" -#: builtin/pull.c:204 +#: builtin/pull.c:209 msgid "number of submodules pulled in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/pull.c:299 +#: builtin/pull.c:304 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Felaktigt värde för pull.ff: %s" -#: builtin/pull.c:415 +#: builtin/pull.c:420 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -11666,14 +13680,14 @@ msgstr "" "Det finns ingen kandidat för ombasering bland referenserna du precis har " "hämtat." -#: builtin/pull.c:417 +#: builtin/pull.c:422 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:418 +#: builtin/pull.c:423 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -11681,7 +13695,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:421 +#: builtin/pull.c:426 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -11692,42 +13706,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:426 git-parse-remote.sh:73 +#: builtin/pull.c:431 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:428 builtin/pull.c:443 git-parse-remote.sh:79 +#: builtin/pull.c:433 builtin/pull.c:448 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:430 builtin/pull.c:445 git-parse-remote.sh:82 +#: builtin/pull.c:435 builtin/pull.c:450 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:431 builtin/pull.c:446 +#: builtin/pull.c:436 builtin/pull.c:451 msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." -#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448 +#: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<fjärr>" -#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477 +#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:576 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<gren>" -#: builtin/pull.c:441 git-parse-remote.sh:75 +#: builtin/pull.c:446 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:450 git-parse-remote.sh:95 +#: builtin/pull.c:455 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:455 +#: builtin/pull.c:460 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -11736,27 +13750,27 @@ msgstr "" "Dina inställningar anger sammanslagning med referensen \"%s\"\n" "från fjärren, men någon sådan referens togs inte emot." -#: builtin/pull.c:819 +#: builtin/pull.c:829 msgid "ignoring --verify-signatures for rebase" msgstr "ignorera --verify-signatures för ombasering" -#: builtin/pull.c:867 +#: builtin/pull.c:877 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash är endast giltig med --rebase." -#: builtin/pull.c:875 +#: builtin/pull.c:885 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:878 +#: builtin/pull.c:888 msgid "pull with rebase" msgstr "pull med ombasering" -#: builtin/pull.c:879 +#: builtin/pull.c:889 msgid "please commit or stash them." msgstr "checka in eller använd \"stash\" på dem." -#: builtin/pull.c:904 +#: builtin/pull.c:914 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11767,7 +13781,7 @@ msgstr "" "snabbspolar din arbetskatalog från\n" "incheckningen %s." -#: builtin/pull.c:909 +#: builtin/pull.c:919 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11784,31 +13798,31 @@ msgstr "" "$ git reset --hard\n" "för att återgå." -#: builtin/pull.c:924 +#: builtin/pull.c:934 msgid "Cannot merge multiple branches into empty head." msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: builtin/pull.c:928 +#: builtin/pull.c:938 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpå flera grenar." -#: builtin/pull.c:935 +#: builtin/pull.c:945 msgid "cannot rebase with locally recorded submodule modifications" msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" -#: builtin/push.c:17 +#: builtin/push.c:19 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/push.c:92 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "taggförkortning utan <tagg>" -#: builtin/push.c:102 +#: builtin/push.c:121 msgid "--delete only accepts plain target ref names" msgstr "--delete godtar endast enkla målreferensnamn" -#: builtin/push.c:146 +#: builtin/push.c:165 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -11817,7 +13831,7 @@ msgstr "" "För att välja ett av alternativen permanent, se push.default i \"git help " "config\"." -#: builtin/push.c:149 +#: builtin/push.c:168 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -11842,7 +13856,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:164 +#: builtin/push.c:183 #, c-format msgid "" "You are not currently on a branch.\n" @@ -11857,7 +13871,7 @@ msgstr "" "\n" " git push %s HEAD:<namn-på-fjärrgren>\n" -#: builtin/push.c:178 +#: builtin/push.c:197 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -11870,12 +13884,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:186 +#: builtin/push.c:205 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända." -#: builtin/push.c:189 +#: builtin/push.c:208 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -11886,14 +13900,14 @@ msgstr "" "aktuella grenen \"%s\", utan att tala om för mig vad som\n" "skall sändas för att uppdatera fjärrgrenen." -#: builtin/push.c:248 +#: builtin/push.c:267 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Du angav inga referensspecifikationer att sända, och push.default är " "\"nothing\"." -#: builtin/push.c:255 +#: builtin/push.c:274 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -11905,7 +13919,7 @@ msgstr "" "\"git pull ....\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:261 +#: builtin/push.c:280 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -11917,7 +13931,7 @@ msgstr "" "\"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:267 +#: builtin/push.c:286 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -11931,11 +13945,11 @@ msgstr "" "(t.ex. \"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer." -#: builtin/push.c:274 +#: builtin/push.c:293 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren." -#: builtin/push.c:277 +#: builtin/push.c:296 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -11946,22 +13960,22 @@ msgstr "" "pekar på något som inte är en incheckning, utan att använda flaggan\n" "\"--force\".\n" -#: builtin/push.c:337 +#: builtin/push.c:357 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:341 +#: builtin/push.c:361 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:372 +#: builtin/push.c:395 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:373 +#: builtin/push.c:396 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -11982,117 +13996,141 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:391 -msgid "--all and --tags are incompatible" -msgstr "--all och --tags är inkompatibla" - -#: builtin/push.c:392 -msgid "--all can't be combined with refspecs" -msgstr "--all kan inte kombineras med referensspecifikationer" - -#: builtin/push.c:397 -msgid "--mirror and --tags are incompatible" -msgstr "--mirror och --tags är inkompatibla" - -#: builtin/push.c:398 -msgid "--mirror can't be combined with refspecs" -msgstr "--mirror kan inte kombineras med referensspecifikationer" - -#: builtin/push.c:403 -msgid "--all and --mirror are incompatible" -msgstr "--all och --mirror är inkompatibla" - -#: builtin/push.c:535 +#: builtin/push.c:551 msgid "repository" msgstr "arkiv" -#: builtin/push.c:536 builtin/send-pack.c:163 +#: builtin/push.c:552 builtin/send-pack.c:164 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:537 builtin/send-pack.c:165 +#: builtin/push.c:553 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:539 +#: builtin/push.c:555 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:540 +#: builtin/push.c:556 msgid "push tags (can't be used with --all or --mirror)" msgstr "sänd taggar (kan inte användas med --all eller --mirror)" -#: builtin/push.c:543 builtin/send-pack.c:166 +#: builtin/push.c:559 builtin/send-pack.c:167 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:545 builtin/send-pack.c:180 -msgid "refname>:<expect" -msgstr "refnamn>:<förvänta" +#: builtin/push.c:561 builtin/send-pack.c:181 +msgid "<refname>:<expect>" +msgstr "<refnamn>:<förvänta>" -#: builtin/push.c:546 builtin/send-pack.c:181 +#: builtin/push.c:562 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "kräv att ref:s tidigare värde är detta" -#: builtin/push.c:549 +#: builtin/push.c:565 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:551 builtin/send-pack.c:174 +#: builtin/push.c:567 builtin/send-pack.c:175 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160 -#: builtin/send-pack.c:161 +#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161 +#: builtin/send-pack.c:162 msgid "receive pack program" msgstr "program för att ta emot paket" -#: builtin/push.c:554 +#: builtin/push.c:570 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:557 +#: builtin/push.c:573 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:559 +#: builtin/push.c:575 msgid "bypass pre-push hook" msgstr "förbigå pre-push-krok" -#: builtin/push.c:560 +#: builtin/push.c:576 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:563 builtin/send-pack.c:168 +#: builtin/push.c:579 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "GPG-signera insändningen" -#: builtin/push.c:565 builtin/send-pack.c:175 +#: builtin/push.c:581 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "begär atomiska transaktioner på fjärrsidan" -#: builtin/push.c:566 builtin/send-pack.c:171 -msgid "server-specific" -msgstr "serverspecifik" - -#: builtin/push.c:566 builtin/send-pack.c:172 -msgid "option to transmit" -msgstr "" -"inget att checka in\n" -"flagga att sända" - -#: builtin/push.c:583 +#: builtin/push.c:599 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är inkompatibel med --all, --mirror och --tags" -#: builtin/push.c:585 +#: builtin/push.c:601 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" #: builtin/push.c:604 +msgid "--all and --tags are incompatible" +msgstr "--all och --tags är inkompatibla" + +#: builtin/push.c:606 +msgid "--all can't be combined with refspecs" +msgstr "--all kan inte kombineras med referensspecifikationer" + +#: builtin/push.c:610 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror och --tags är inkompatibla" + +#: builtin/push.c:612 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror kan inte kombineras med referensspecifikationer" + +#: builtin/push.c:615 +msgid "--all and --mirror are incompatible" +msgstr "--all och --mirror är inkompatibla" + +#: builtin/push.c:634 msgid "push options must not have new line characters" msgstr "push-flaggor kan inte innehålla radbrytning" +#: builtin/range-diff.c:8 +msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" +msgstr "" +"git range-diff [<flaggor>] <gammal-bas>..<gammal-ända> <ny-bas>..<ny-ända>" + +#: builtin/range-diff.c:9 +msgid "git range-diff [<options>] <old-tip>...<new-tip>" +msgstr "git range-diff [<flaggor>] <gammal-bas>..<ny-ända>" + +#: builtin/range-diff.c:10 +msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" +msgstr "git range-diff [<flaggor>] <bas> <gammal-ända> <ny-ända>" + +#: builtin/range-diff.c:26 +msgid "Percentage by which creation is weighted" +msgstr "Procent som skapelse vägs med" + +#: builtin/range-diff.c:28 +msgid "use simple diff colors" +msgstr "använd enkla diff-färger" + +#: builtin/range-diff.c:75 builtin/range-diff.c:79 +#, c-format +msgid "no .. in range: '%s'" +msgstr ".. saknas i intervall: \"%s\"" + +#: builtin/range-diff.c:89 +msgid "single arg format must be symmetric range" +msgstr "ensamt argument måste vara symmetriskt intervall" + +#: builtin/range-diff.c:104 +msgid "need two commit ranges" +msgstr "behöver två incheckningsintervall" + #: builtin/read-tree.c:40 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " @@ -12103,67 +14141,67 @@ msgstr "" "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<fil>] (--empty | <träd-igt1> [<träd-igt2> [<träd-igt3>]])" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c:120 msgid "write resulting index to <file>" msgstr "skriv resulterande index till <fil>" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:123 msgid "only empty the index" msgstr "töm bara indexet" -#: builtin/read-tree.c:126 +#: builtin/read-tree.c:125 msgid "Merging" msgstr "Sammanslagning" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:127 msgid "perform a merge in addition to a read" msgstr "utför en sammanslagning i tillägg till en läsning" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:129 msgid "3-way merge if no file level merging required" msgstr "3-vägssammanslagning om sammanslagning på filnivå ej krävs" -#: builtin/read-tree.c:132 +#: builtin/read-tree.c:131 msgid "3-way merge in presence of adds and removes" msgstr "3-vägssammanslagning när det finns tillägg och borttagningar" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:133 msgid "same as -m, but discard unmerged entries" msgstr "som -m, men kasta bort ej sammanslagna poster" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:134 msgid "<subdirectory>/" msgstr "<underkatalog>/" -#: builtin/read-tree.c:136 +#: builtin/read-tree.c:135 msgid "read the tree into the index under <subdirectory>/" msgstr "läs in trädet i indexet under <underkatalog>/" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:138 msgid "update working tree with merge result" msgstr "uppdatera arbetskatalogen med resultatet från sammanslagningen" -#: builtin/read-tree.c:141 +#: builtin/read-tree.c:140 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:142 +#: builtin/read-tree.c:141 msgid "allow explicitly ignored files to be overwritten" msgstr "tillåt explicit ignorerade filer att skrivas över" -#: builtin/read-tree.c:145 +#: builtin/read-tree.c:144 msgid "don't check the working tree after merging" msgstr "kontrollera inte arbetskatalogen efter sammanslagning" -#: builtin/read-tree.c:146 +#: builtin/read-tree.c:145 msgid "don't update the index or the work tree" msgstr "uppdatera inte indexet eller arbetskatalogen" -#: builtin/read-tree.c:148 +#: builtin/read-tree.c:147 msgid "skip applying sparse checkout filter" msgstr "hoppa över att applicera filter för gles utcheckning" -#: builtin/read-tree.c:150 +#: builtin/read-tree.c:149 msgid "debug unpack-trees" msgstr "felsök unpack-trees" @@ -12175,51 +14213,63 @@ msgstr "git rebase--helper [<flaggor>]" msgid "keep empty commits" msgstr "behåll tomma incheckningar" -#: builtin/rebase--helper.c:26 builtin/revert.c:123 +#: builtin/rebase--helper.c:26 builtin/revert.c:124 msgid "allow commits with empty messages" msgstr "tillåt incheckningar med tomt meddelande" #: builtin/rebase--helper.c:27 +msgid "rebase merge commits" +msgstr "ombasera sammanslagningar" + +#: builtin/rebase--helper.c:29 +msgid "keep original branch points of cousins" +msgstr "behåll ursprungliga förgreningspunkter för kusiner" + +#: builtin/rebase--helper.c:30 msgid "continue rebase" msgstr "fortsätt ombasering" -#: builtin/rebase--helper.c:29 +#: builtin/rebase--helper.c:32 msgid "abort rebase" msgstr "avbryt ombasering" -#: builtin/rebase--helper.c:32 +#: builtin/rebase--helper.c:35 msgid "make rebase script" msgstr "skapa ombaseringsskript" -#: builtin/rebase--helper.c:34 +#: builtin/rebase--helper.c:37 msgid "shorten commit ids in the todo list" msgstr "förkorta inchecknings-id i todo-listan" -#: builtin/rebase--helper.c:36 +#: builtin/rebase--helper.c:39 msgid "expand commit ids in the todo list" msgstr "utöka inchecknings-id i todo-listan" -#: builtin/rebase--helper.c:38 +#: builtin/rebase--helper.c:41 msgid "check the todo list" msgstr "kontrollera todo-listan" -#: builtin/rebase--helper.c:40 +#: builtin/rebase--helper.c:43 msgid "skip unnecessary picks" msgstr "hoppa över onödiga \"pick\"-kommandon" -#: builtin/rebase--helper.c:42 +#: builtin/rebase--helper.c:45 msgid "rearrange fixup/squash lines" msgstr "ordna om fixup-/squash-rader" -#: builtin/rebase--helper.c:44 +#: builtin/rebase--helper.c:47 msgid "insert exec commands in todo list" msgstr "lägg in exec-kommandon i todo-listan" -#: builtin/receive-pack.c:30 +#: builtin/rebase--helper.c:68 +msgid "--[no-]rebase-cousins has no effect without --rebase-merges" +msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges" + +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-katalog>" -#: builtin/receive-pack.c:841 +#: builtin/receive-pack.c:830 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" @@ -12249,7 +14299,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:861 +#: builtin/receive-pack.c:850 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" @@ -12270,24 +14320,24 @@ msgstr "" "\n" "För att undvika detta meddelande kan du sätta det till \"refuse\"." -#: builtin/receive-pack.c:1934 +#: builtin/receive-pack.c:1923 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:1948 +#: builtin/receive-pack.c:1937 msgid "You must specify a directory." msgstr "Du måste ange en katalog." -#: builtin/reflog.c:532 builtin/reflog.c:537 +#: builtin/reflog.c:536 builtin/reflog.c:541 #, c-format msgid "'%s' is not a valid timestamp" msgstr "\"%s\" är inte en giltig tidsstämpel" -#: builtin/remote.c:13 +#: builtin/remote.c:15 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:14 +#: builtin/remote.c:16 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -12295,82 +14345,82 @@ msgstr "" "git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <namn> <url>" -#: builtin/remote.c:15 builtin/remote.c:35 +#: builtin/remote.c:17 builtin/remote.c:37 msgid "git remote rename <old> <new>" msgstr "git remote rename <gammal> <ny>" -#: builtin/remote.c:16 builtin/remote.c:40 +#: builtin/remote.c:18 builtin/remote.c:42 msgid "git remote remove <name>" msgstr "git remote remove <namn>" -#: builtin/remote.c:17 builtin/remote.c:45 +#: builtin/remote.c:19 builtin/remote.c:47 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)" -#: builtin/remote.c:18 +#: builtin/remote.c:20 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <namn>" -#: builtin/remote.c:19 +#: builtin/remote.c:21 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <namn>" -#: builtin/remote.c:20 +#: builtin/remote.c:22 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<grupp> | <fjärr>)...]" -#: builtin/remote.c:21 +#: builtin/remote.c:23 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <namn> <gren>..." -#: builtin/remote.c:22 builtin/remote.c:71 +#: builtin/remote.c:24 builtin/remote.c:73 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <namn>" -#: builtin/remote.c:23 builtin/remote.c:76 +#: builtin/remote.c:25 builtin/remote.c:78 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]" -#: builtin/remote.c:24 builtin/remote.c:77 +#: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <namn> <nyurl>" -#: builtin/remote.c:25 builtin/remote.c:78 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <namn> <url>" -#: builtin/remote.c:30 +#: builtin/remote.c:32 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<flaggor>] <namn> <url>" -#: builtin/remote.c:50 +#: builtin/remote.c:52 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <namn> <gren>..." -#: builtin/remote.c:51 +#: builtin/remote.c:53 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <namn> <gren>..." -#: builtin/remote.c:56 +#: builtin/remote.c:58 msgid "git remote show [<options>] <name>" msgstr "git remote show [<flaggor>] <namn>" -#: builtin/remote.c:61 +#: builtin/remote.c:63 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<flaggor>] <namn>" -#: builtin/remote.c:66 +#: builtin/remote.c:68 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..." -#: builtin/remote.c:95 +#: builtin/remote.c:97 #, c-format msgid "Updating %s" msgstr "Uppdaterar %s" -#: builtin/remote.c:127 +#: builtin/remote.c:129 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -12378,86 +14428,82 @@ msgstr "" "--mirror är farlig och föråldrad; använd\n" "\t --mirror=fetch eller --mirror=push istället" -#: builtin/remote.c:144 +#: builtin/remote.c:146 #, c-format msgid "unknown mirror argument: %s" msgstr "okänt argument till mirror: %s" -#: builtin/remote.c:160 +#: builtin/remote.c:162 msgid "fetch the remote branches" msgstr "hämta fjärrgrenarna" -#: builtin/remote.c:162 +#: builtin/remote.c:164 msgid "import all tags and associated objects when fetching" msgstr "importera alla taggar och associerade objekt vid hämtning" -#: builtin/remote.c:165 +#: builtin/remote.c:167 msgid "or do not fetch any tag at all (--no-tags)" msgstr "eller hämta inte några taggar alls (--no-tags)" -#: builtin/remote.c:167 +#: builtin/remote.c:169 msgid "branch(es) to track" msgstr "gren(ar) att spåra" -#: builtin/remote.c:168 +#: builtin/remote.c:170 msgid "master branch" msgstr "huvudgren" -#: builtin/remote.c:169 -msgid "push|fetch" -msgstr "push|fetch" - -#: builtin/remote.c:170 +#: builtin/remote.c:172 msgid "set up remote as a mirror to push to or fetch from" msgstr "ställ in arkiv som spegel att sända eller ta emot från" -#: builtin/remote.c:182 +#: builtin/remote.c:184 msgid "specifying a master branch makes no sense with --mirror" msgstr "att ange en master-gren ger ingen mening med --mirror" -#: builtin/remote.c:184 +#: builtin/remote.c:186 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar" -#: builtin/remote.c:191 builtin/remote.c:631 +#: builtin/remote.c:193 builtin/remote.c:635 #, c-format msgid "remote %s already exists." msgstr "fjärrarkivet %s finns redan." -#: builtin/remote.c:195 builtin/remote.c:635 +#: builtin/remote.c:197 builtin/remote.c:639 #, c-format msgid "'%s' is not a valid remote name" msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" -#: builtin/remote.c:235 +#: builtin/remote.c:237 #, c-format msgid "Could not setup master '%s'" msgstr "Kunde inte skapa master \"%s\"" -#: builtin/remote.c:337 +#: builtin/remote.c:343 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Kunde inte hämta mappning för referensspecifikation %s" -#: builtin/remote.c:438 builtin/remote.c:446 +#: builtin/remote.c:442 builtin/remote.c:450 msgid "(matching)" msgstr "(matchande)" -#: builtin/remote.c:450 +#: builtin/remote.c:454 msgid "(delete)" msgstr "(ta bort)" -#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858 +#: builtin/remote.c:628 builtin/remote.c:764 builtin/remote.c:863 #, c-format msgid "No such remote: %s" msgstr "Inget sådant fjärrarkiv: %s" -#: builtin/remote.c:641 +#: builtin/remote.c:645 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\"" -#: builtin/remote.c:661 +#: builtin/remote.c:665 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -12468,17 +14514,17 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nödvändigt." -#: builtin/remote.c:697 +#: builtin/remote.c:701 #, c-format msgid "deleting '%s' failed" msgstr "misslyckades ta bort \"%s\"" -#: builtin/remote.c:731 +#: builtin/remote.c:735 #, c-format msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:796 +#: builtin/remote.c:801 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -12492,113 +14538,118 @@ msgstr[1] "" "Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n" "för att ta bort dem, använd:" -#: builtin/remote.c:810 +#: builtin/remote.c:815 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:911 +#: builtin/remote.c:916 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ny (nästa hämtning sparar i remotes/%s)" -#: builtin/remote.c:914 +#: builtin/remote.c:919 msgid " tracked" msgstr " spårad" -#: builtin/remote.c:916 +#: builtin/remote.c:921 msgid " stale (use 'git remote prune' to remove)" msgstr " förlegad (använd \"git remote prune\" för att ta bort)" -#: builtin/remote.c:918 +#: builtin/remote.c:923 msgid " ???" msgstr " ???" -#: builtin/remote.c:959 +#: builtin/remote.c:964 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren" -#: builtin/remote.c:967 +#: builtin/remote.c:973 #, c-format msgid "rebases interactively onto remote %s" msgstr "ombaseras interaktivt på fjärren %s" -#: builtin/remote.c:968 +#: builtin/remote.c:975 +#, c-format +msgid "rebases interactively (with merges) onto remote %s" +msgstr "ombaseras interaktivt (med sammanslagningar) på fjärren %s" + +#: builtin/remote.c:978 #, c-format msgid "rebases onto remote %s" msgstr "ombaseras på fjärren %s" -#: builtin/remote.c:971 +#: builtin/remote.c:982 #, c-format msgid " merges with remote %s" msgstr " sammanslås med fjärren %s" -#: builtin/remote.c:974 +#: builtin/remote.c:985 #, c-format msgid "merges with remote %s" msgstr "sammanslås med fjärren %s" -#: builtin/remote.c:977 +#: builtin/remote.c:988 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s och med fjärren %s\n" -#: builtin/remote.c:1020 +#: builtin/remote.c:1031 msgid "create" msgstr "skapa" -#: builtin/remote.c:1023 +#: builtin/remote.c:1034 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1027 +#: builtin/remote.c:1038 msgid "up to date" msgstr "àjour" -#: builtin/remote.c:1030 +#: builtin/remote.c:1041 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1033 +#: builtin/remote.c:1044 msgid "local out of date" msgstr "lokal föråldrad" -#: builtin/remote.c:1040 +#: builtin/remote.c:1051 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1043 +#: builtin/remote.c:1054 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sänder till %-*s (%s)" -#: builtin/remote.c:1047 +#: builtin/remote.c:1058 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1050 +#: builtin/remote.c:1061 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" -#: builtin/remote.c:1118 +#: builtin/remote.c:1129 msgid "do not query remotes" msgstr "fråga inte fjärrar" -#: builtin/remote.c:1145 +#: builtin/remote.c:1156 #, c-format msgid "* remote %s" msgstr "* fjärr %s" -#: builtin/remote.c:1146 +#: builtin/remote.c:1157 #, c-format msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302 +#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313 msgid "(no URL)" msgstr "(ingen URL)" @@ -12606,193 +14657,193 @@ msgstr "(ingen URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1161 builtin/remote.c:1163 +#: builtin/remote.c:1172 builtin/remote.c:1174 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169 +#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1165 +#: builtin/remote.c:1176 msgid "(not queried)" msgstr "(inte förfrågad)" -#: builtin/remote.c:1167 +#: builtin/remote.c:1178 msgid "(unknown)" msgstr "(okänd)" -#: builtin/remote.c:1171 +#: builtin/remote.c:1182 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n" -#: builtin/remote.c:1183 +#: builtin/remote.c:1194 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Fjärrgren:%s" msgstr[1] " Fjärrgrenar:%s" -#: builtin/remote.c:1186 builtin/remote.c:1212 +#: builtin/remote.c:1197 builtin/remote.c:1223 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1195 +#: builtin/remote.c:1206 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Lokal gren konfigurerad för \"git pull\":" msgstr[1] " Lokala grenar konfigurerade för \"git pull\":" -#: builtin/remote.c:1203 +#: builtin/remote.c:1214 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1209 +#: builtin/remote.c:1220 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:" msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:" -#: builtin/remote.c:1230 +#: builtin/remote.c:1241 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" -#: builtin/remote.c:1232 +#: builtin/remote.c:1243 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1247 +#: builtin/remote.c:1258 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1249 +#: builtin/remote.c:1260 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:" -#: builtin/remote.c:1259 +#: builtin/remote.c:1270 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1267 +#: builtin/remote.c:1278 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1269 +#: builtin/remote.c:1280 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1287 +#: builtin/remote.c:1298 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1288 +#: builtin/remote.c:1299 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1298 +#: builtin/remote.c:1309 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1310 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1326 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1318 +#: builtin/remote.c:1329 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1363 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548 +#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" -#: builtin/remote.c:1442 +#: builtin/remote.c:1453 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1449 +#: builtin/remote.c:1460 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1466 +#: builtin/remote.c:1477 msgid "query push URLs rather than fetch URLs" msgstr "fråga sänd-URL:er istället för hämta-URL:er" -#: builtin/remote.c:1468 +#: builtin/remote.c:1479 msgid "return all URLs" msgstr "returnera alla URL:er" -#: builtin/remote.c:1496 +#: builtin/remote.c:1507 #, c-format msgid "no URLs configured for remote '%s'" msgstr "ingen URL:er angivna för fjärren \"%s\"" -#: builtin/remote.c:1522 +#: builtin/remote.c:1533 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1524 +#: builtin/remote.c:1535 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1526 +#: builtin/remote.c:1537 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1533 +#: builtin/remote.c:1544 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1572 +#: builtin/remote.c:1583 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1580 +#: builtin/remote.c:1591 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1582 +#: builtin/remote.c:1593 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" -#: builtin/remote.c:1598 +#: builtin/remote.c:1609 msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; måste skrivas före ett underkommando" -#: builtin/remote.c:1629 +#: builtin/remote.c:1640 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" -#: builtin/repack.c:18 +#: builtin/repack.c:20 msgid "git repack [<options>]" msgstr "git repack [<flaggor>]" -#: builtin/repack.c:23 +#: builtin/repack.c:25 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -12801,127 +14852,234 @@ msgstr "" "Använd --no-write-bitmap-index eller inaktivera inställningen\n" "pack.writebitmaps" -#: builtin/repack.c:170 +#: builtin/repack.c:287 msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" -#: builtin/repack.c:172 +#: builtin/repack.c:289 msgid "same as -a, and turn unreachable objects loose" msgstr "samma som -a, och gör onåbara objekt lösa" -#: builtin/repack.c:175 +#: builtin/repack.c:292 msgid "remove redundant packs, and run git-prune-packed" msgstr "ta bort överflödiga paket, och kör git-prune-packed" -#: builtin/repack.c:177 +#: builtin/repack.c:294 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "sänd --no-reuse-delta till git-pack-objects" -#: builtin/repack.c:179 +#: builtin/repack.c:296 msgid "pass --no-reuse-object to git-pack-objects" msgstr "sänd --no-reuse-object till git-pack-objects" -#: builtin/repack.c:181 +#: builtin/repack.c:298 msgid "do not run git-update-server-info" msgstr "kör inte git-update-server-info" -#: builtin/repack.c:184 +#: builtin/repack.c:301 msgid "pass --local to git-pack-objects" msgstr "sänd --local till git-pack-objects" -#: builtin/repack.c:186 +#: builtin/repack.c:303 msgid "write bitmap index" msgstr "skriv bitkartindex" -#: builtin/repack.c:187 +#: builtin/repack.c:304 msgid "approxidate" msgstr "cirkadatum" -#: builtin/repack.c:188 +#: builtin/repack.c:305 msgid "with -A, do not loosen objects older than this" msgstr "med -A, lös inte upp objekt äldre än detta" -#: builtin/repack.c:190 +#: builtin/repack.c:307 msgid "with -a, repack unreachable objects" msgstr "med -a, packa om onåbara objekt" -#: builtin/repack.c:192 +#: builtin/repack.c:309 msgid "size of the window used for delta compression" msgstr "storlek på fönster använt för deltakomprimering" -#: builtin/repack.c:193 builtin/repack.c:199 +#: builtin/repack.c:310 builtin/repack.c:316 msgid "bytes" msgstr "byte" -#: builtin/repack.c:194 +#: builtin/repack.c:311 msgid "same as the above, but limit memory size instead of entries count" msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal" -#: builtin/repack.c:196 +#: builtin/repack.c:313 msgid "limits the maximum delta depth" msgstr "begränsa maximalt deltadjup" -#: builtin/repack.c:198 +#: builtin/repack.c:315 msgid "limits the maximum number of threads" msgstr "begränsar maximalt antal trådar" -#: builtin/repack.c:200 +#: builtin/repack.c:317 msgid "maximum size of each packfile" msgstr "maximal storlek på varje paketfil" -#: builtin/repack.c:202 +#: builtin/repack.c:319 msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:212 +#: builtin/repack.c:321 +msgid "do not repack this pack" +msgstr "packa inte om detta paket" + +#: builtin/repack.c:331 msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" -#: builtin/repack.c:216 +#: builtin/repack.c:335 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable och -A kan inte användas samtidigt" -#: builtin/repack.c:410 builtin/worktree.c:148 +#: builtin/repack.c:510 builtin/worktree.c:140 #, c-format msgid "failed to remove '%s'" msgstr "misslyckades ta bort \"%s\"" -#: builtin/replace.c:20 +#: builtin/replace.c:22 msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <objekt> <ersättning>" -#: builtin/replace.c:21 +#: builtin/replace.c:23 msgid "git replace [-f] --edit <object>" msgstr "git replace [-f] --edit <objekt>" -#: builtin/replace.c:22 +#: builtin/replace.c:24 msgid "git replace [-f] --graft <commit> [<parent>...]" msgstr "git replace [-f] --graft <incheckning> [<förälder>...]" -#: builtin/replace.c:23 +#: builtin/replace.c:25 +msgid "git replace [-f] --convert-graft-file" +msgstr "git replace [-f] --convert-graft-file" + +#: builtin/replace.c:26 msgid "git replace -d <object>..." msgstr "git replace -d <objekt>..." -#: builtin/replace.c:24 +#: builtin/replace.c:27 msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<format>] [-l [<mönster>]]" -#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397 +#: builtin/replace.c:57 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 +#, c-format +msgid "" +"invalid replace format '%s'\n" +"valid formats are 'short', 'medium' and 'long'" +msgstr "" +"ogiltigt ersättningsformat \"%s\"\n" +"giltiga format är \"short\", \"medium\" och \"long\"" + +#: builtin/replace.c:121 +#, c-format +msgid "replace ref '%s' not found" +msgstr "ersättningsreferensen \"%s\" hittades inte" + +#: builtin/replace.c:137 +#, c-format +msgid "Deleted replace ref '%s'" +msgstr "Tog bort ersättningsreferensen \"%s\"" + +#: builtin/replace.c:149 +#, c-format +msgid "'%s' is not a valid ref name" +msgstr "\"%s\" är inte ett giltigt referensnamn" + +#: builtin/replace.c:154 +#, c-format +msgid "replace ref '%s' already exists" +msgstr "ersättningsreferensen \"%s\" finns redan" + +#: builtin/replace.c:174 +#, c-format +msgid "" +"Objects must be of the same type.\n" +"'%s' points to a replaced object of type '%s'\n" +"while '%s' points to a replacement object of type '%s'." +msgstr "" +"Objekt måste vara av samma typ.\n" +"\"%s\" pekar på ett ersatt objekt med typen \"%s\"\n" +"medan \"%s\" pekar på ett ersättningsobjekt av typen \"%s\"." + +#: builtin/replace.c:225 +#, c-format +msgid "unable to open %s for writing" +msgstr "kan inte öppna %s för skrivning" + +#: builtin/replace.c:238 +msgid "cat-file reported failure" +msgstr "cat-file rapporterade misslyckande" + +#: builtin/replace.c:254 +#, c-format +msgid "unable to open %s for reading" +msgstr "kan inte öppna %s för läsning" + +#: builtin/replace.c:268 +msgid "unable to spawn mktree" +msgstr "kan inte starta mktree" + +#: builtin/replace.c:272 +msgid "unable to read from mktree" +msgstr "kan inte läsa från mktree" + +#: builtin/replace.c:281 +msgid "mktree reported failure" +msgstr "mktree rapporterade misslyckande" + +#: builtin/replace.c:285 +msgid "mktree did not return an object name" +msgstr "mktree returnerade inte ett objektnamn" + +#: builtin/replace.c:294 +#, c-format +msgid "unable to fstat %s" +msgstr "kan inte utföra \"fstat\" på %s" + +#: builtin/replace.c:299 +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 +#, c-format +msgid "not a valid object name: '%s'" +msgstr "objektnamnet är inte giltigt: \"%s\"" + +#: builtin/replace.c:322 +#, c-format +msgid "unable to get object type for %s" +msgstr "kan inte läsa objekttyp för %s" + +#: builtin/replace.c:338 +msgid "editing object file failed" +msgstr "misslyckades redigera objektfilen" + +#: builtin/replace.c:347 #, c-format -msgid "Not a valid object name: '%s'" -msgstr "Objektnamnet är inte giltigt: \"%s\"" +msgid "new object is the same as the old one: '%s'" +msgstr "nytt objekt är samma som det gamla: \"%s\"" -#: builtin/replace.c:361 +#: builtin/replace.c:407 #, c-format msgid "bad mergetag in commit '%s'" msgstr "felaktig sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:363 +#: builtin/replace.c:409 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "felformad sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:374 +#: builtin/replace.c:421 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -12930,48 +15088,107 @@ msgstr "" "den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s" "\" som har förkastats; använd --edit istället för --graft" -#: builtin/replace.c:407 +#: builtin/replace.c:460 #, c-format -msgid "the original commit '%s' has a gpg signature." -msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur." +msgid "the original commit '%s' has a gpg signature" +msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur" -#: builtin/replace.c:408 +#: builtin/replace.c:461 msgid "the signature will be removed in the replacement commit!" msgstr "signaturen kommer att tas bort i ersättningsincheckningen!" -#: builtin/replace.c:414 +#: builtin/replace.c:471 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "kunde inte skriva ersättningsincheckning för: \"%s\"" -#: builtin/replace.c:438 +#: builtin/replace.c:479 +#, c-format +msgid "graft for '%s' unnecessary" +msgstr "ympning för \"%s\" behövs inte" + +#: builtin/replace.c:482 +#, 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:514 +#, c-format +msgid "" +"could not convert the following graft(s):\n" +"%s" +msgstr "" +"kunde inte konvertera följande ympning(ar):\n" +"%s" + +#: builtin/replace.c:535 msgid "list replace refs" msgstr "visa ersättningsreferenser" -#: builtin/replace.c:439 +#: builtin/replace.c:536 msgid "delete replace refs" msgstr "ta bort ersättningsreferenser" -#: builtin/replace.c:440 +#: builtin/replace.c:537 msgid "edit existing object" msgstr "redigera befintligt objekt" -#: builtin/replace.c:441 +#: builtin/replace.c:538 msgid "change a commit's parents" msgstr "ändra en inchecknings föräldrar" -#: builtin/replace.c:442 +#: builtin/replace.c:539 +msgid "convert existing graft file" +msgstr "konvertera befintlig ympningsfil" + +#: builtin/replace.c:540 msgid "replace the ref if it exists" msgstr "ersätt referensen om den finns" -#: builtin/replace.c:444 +#: builtin/replace.c:542 msgid "do not pretty-print contents for --edit" msgstr "använd inte snygg visning av innehåll för --edit" -#: builtin/replace.c:445 +#: builtin/replace.c:543 msgid "use this format" msgstr "använd detta format" +#: builtin/replace.c:556 +msgid "--format cannot be used when not listing" +msgstr "--format kan inte användas utanför listning" + +#: builtin/replace.c:564 +msgid "-f only makes sense when writing a replacement" +msgstr "-f kan endast användas vid skrivning av ersättning" + +#: builtin/replace.c:568 +msgid "--raw only makes sense with --edit" +msgstr "--raw kan bara användas med --edit" + +#: builtin/replace.c:574 +msgid "-d needs at least one argument" +msgstr "-d behöver minst ett argument" + +#: builtin/replace.c:580 +msgid "bad number of arguments" +msgstr "fel antal argument" + +#: builtin/replace.c:586 +msgid "-e needs exactly one argument" +msgstr "-e tar exakt ett argument" + +#: builtin/replace.c:592 +msgid "-g needs at least one argument" +msgstr "-g tar minst ett argument" + +#: builtin/replace.c:598 +msgid "--convert-graft-file takes no argument" +msgstr "--convert-graft-file tar inga argument" + +#: builtin/replace.c:604 +msgid "only one pattern can be given with -l" +msgstr "endast ett mönster kan anges med -l" + #: builtin/rerere.c:13 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget <path>... | status | remaining | diff | gc]" @@ -13020,12 +15237,12 @@ msgstr "Du har inte en giltig HEAD." #: builtin/reset.c:80 msgid "Failed to find tree of HEAD." -msgstr "Kunde inte hitta träder för HEAD." +msgstr "Kunde inte hitta trädet för HEAD." #: builtin/reset.c:86 #, c-format msgid "Failed to find tree of %s." -msgstr "Kunde inte hitta träder för %s." +msgstr "Kunde inte hitta trädet för %s." #: builtin/reset.c:111 #, c-format @@ -13107,44 +15324,44 @@ msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-list.c:397 +#: builtin/rev-list.c:399 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "kan inte kombinera --exclude-promisor-objects och --missing" -#: builtin/rev-list.c:455 +#: builtin/rev-list.c:457 msgid "object filtering requires --objects" msgstr "objektfiltrering kräver --objects" -#: builtin/rev-list.c:458 +#: builtin/rev-list.c:460 #, c-format msgid "invalid sparse value '%s'" msgstr "ogiltigt värde för sparse: \"%s\"" -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:501 msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" -#: builtin/rev-list.c:502 +#: builtin/rev-list.c:504 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering" -#: builtin/rev-parse.c:402 +#: builtin/rev-parse.c:406 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]" -#: builtin/rev-parse.c:407 +#: builtin/rev-parse.c:411 msgid "keep the `--` passed as an arg" msgstr "behåll \"--\" sänt som argument" -#: builtin/rev-parse.c:409 +#: builtin/rev-parse.c:413 msgid "stop parsing after the first non-option argument" msgstr "sluta tolka efter första argument som inte är flagga" -#: builtin/rev-parse.c:412 +#: builtin/rev-parse.c:416 msgid "output in stuck long form" msgstr "utdata fast i lång form" -#: builtin/rev-parse.c:545 +#: builtin/rev-parse.c:549 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -13159,84 +15376,84 @@ msgstr "" "Kör \"git rev-parse --parseopt -h\" för mer information om den första " "varianten." -#: builtin/revert.c:23 +#: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<flaggor>] <incheckning-igt>..." -#: builtin/revert.c:24 +#: builtin/revert.c:25 msgid "git revert <subcommand>" msgstr "git revert <underkommando>" -#: builtin/revert.c:29 +#: builtin/revert.c:30 msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "git cherry-pick [<flaggor>] <incheckning-igt>..." -#: builtin/revert.c:30 +#: builtin/revert.c:31 msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <underkommando>" -#: builtin/revert.c:90 +#: builtin/revert.c:91 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s kan inte användas med %s" -#: builtin/revert.c:99 +#: builtin/revert.c:100 msgid "end revert or cherry-pick sequence" msgstr "avsluta revert- eller cherry-pick-sekvens" -#: builtin/revert.c:100 +#: builtin/revert.c:101 msgid "resume revert or cherry-pick sequence" msgstr "återuppta revert- eller cherry-pick-sekvens" -#: builtin/revert.c:101 +#: builtin/revert.c:102 msgid "cancel revert or cherry-pick sequence" msgstr "avbryt revert- eller cherry-pick-sekvens" -#: builtin/revert.c:102 +#: builtin/revert.c:103 msgid "don't automatically commit" msgstr "checka inte in automatiskt" -#: builtin/revert.c:103 +#: builtin/revert.c:104 msgid "edit the commit message" msgstr "redigera incheckningsmeddelandet" -#: builtin/revert.c:106 +#: builtin/revert.c:107 msgid "parent-number" msgstr "nummer-på-förälder" -#: builtin/revert.c:107 +#: builtin/revert.c:108 msgid "select mainline parent" msgstr "välj förälder för huvudlinje" -#: builtin/revert.c:109 +#: builtin/revert.c:110 msgid "merge strategy" msgstr "sammanslagningsstrategi" -#: builtin/revert.c:110 +#: builtin/revert.c:111 msgid "option" msgstr "alternativ" -#: builtin/revert.c:111 +#: builtin/revert.c:112 msgid "option for merge strategy" msgstr "alternativ för sammanslagningsstrategi" -#: builtin/revert.c:120 +#: builtin/revert.c:121 msgid "append commit name" msgstr "lägg till incheckningsnamn" -#: builtin/revert.c:122 +#: builtin/revert.c:123 msgid "preserve initially empty commits" msgstr "behåll incheckningar som börjar som tomma" -#: builtin/revert.c:124 +#: builtin/revert.c:125 msgid "keep redundant, empty commits" msgstr "behåll redundanta, tomma incheckningar" -#: builtin/revert.c:214 +#: builtin/revert.c:219 msgid "revert failed" msgstr "\"revert\" misslyckades" -#: builtin/revert.c:227 +#: builtin/revert.c:232 msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" @@ -13284,42 +15501,47 @@ msgid_plural "the following files have local modifications:" msgstr[0] "följande fil har lokala ändringar:" msgstr[1] "följande filer har lokala ändringar:" -#: builtin/rm.c:243 +#: builtin/rm.c:241 msgid "do not list removed files" msgstr "lista inte borttagna filer" -#: builtin/rm.c:244 +#: builtin/rm.c:242 msgid "only remove from the index" msgstr "ta bara bort från indexet" -#: builtin/rm.c:245 +#: builtin/rm.c:243 msgid "override the up-to-date check" msgstr "överstyr àjour-testet" -#: builtin/rm.c:246 +#: builtin/rm.c:244 msgid "allow recursive removal" msgstr "tillåt rekursiv borttagning" -#: builtin/rm.c:248 +#: builtin/rm.c:246 msgid "exit with a zero status even if nothing matched" msgstr "avsluta med nollstatus även om inget träffades" -#: builtin/rm.c:307 +#: builtin/rm.c:288 +msgid "please stage your changes to .gitmodules or stash them to proceed" +msgstr "" +"löa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta" + +#: builtin/rm.c:306 #, c-format msgid "not removing '%s' recursively without -r" msgstr "tar inte bort \"%s\" rekursivt utan -r" -#: builtin/rm.c:346 +#: builtin/rm.c:345 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: kan inte ta bort %s" -#: builtin/rm.c:369 +#: builtin/rm.c:368 #, c-format msgid "could not remove '%s'" msgstr "kunde inte ta bort \"%s\"" -#: builtin/send-pack.c:19 +#: builtin/send-pack.c:20 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " @@ -13331,51 +15553,71 @@ msgstr "" "[<ref>...]\n" " --all och explicit angiven <ref> är ömsesidigt uteslutande." -#: builtin/send-pack.c:162 +#: builtin/send-pack.c:163 msgid "remote name" msgstr "fjärrnamn" -#: builtin/send-pack.c:176 +#: builtin/send-pack.c:177 msgid "use stateless RPC protocol" msgstr "använd tillståndslöst RPC-protokoll" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:178 msgid "read refs from stdin" msgstr "läs referenser från standard in" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:179 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>...]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" -#: builtin/shortlog.c:263 +#: builtin/shortlog.c:15 +msgid "git log --pretty=short | git shortlog [<options>]" +msgstr "git log --pretty=short | git shortlog [<flaggor>]" + +#: builtin/shortlog.c:264 msgid "Group by committer rather than author" msgstr "Gruppera efter incheckare istället för författare" -#: builtin/shortlog.c:265 +#: builtin/shortlog.c:266 msgid "sort output according to the number of commits per author" msgstr "sortera utdata enligt antal incheckningar per författare" -#: builtin/shortlog.c:267 +#: builtin/shortlog.c:268 msgid "Suppress commit descriptions, only provides commit count" msgstr "Undertryck beskrivningar, visa bara antal incheckningar" -#: builtin/shortlog.c:269 +#: builtin/shortlog.c:270 msgid "Show the email address of each author" msgstr "Visa e-postadress för varje författare" -#: builtin/shortlog.c:270 -msgid "w[,i1[,i2]]" -msgstr "w[,i1[,i2]]" - #: builtin/shortlog.c:271 +msgid "<w>[,<i1>[,<i2>]]" +msgstr "<w>[,<i1>[,<i2>]]" + +#: builtin/shortlog.c:272 msgid "Linewrap output" msgstr "Radbryt utdata" -#: builtin/show-branch.c:12 +#: builtin/shortlog.c:299 +msgid "too many arguments given outside repository" +msgstr "för många flaggor givna utanför arkivet" + +#: builtin/show-branch.c:13 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -13387,131 +15629,131 @@ msgstr "" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]" -#: builtin/show-branch.c:16 +#: builtin/show-branch.c:17 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]" -#: builtin/show-branch.c:376 +#: builtin/show-branch.c:395 #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "ignorerar %s; kan inte hantera mer än %d referens" msgstr[1] "ignorerar %s; kan inte hantera mer än %d referenser" -#: builtin/show-branch.c:530 +#: builtin/show-branch.c:549 #, c-format msgid "no matching refs with %s" msgstr "inga motsvarande referenser med %s" -#: builtin/show-branch.c:626 +#: builtin/show-branch.c:645 msgid "show remote-tracking and local branches" msgstr "visa fjärrspårande och lokala grenar" -#: builtin/show-branch.c:628 +#: builtin/show-branch.c:647 msgid "show remote-tracking branches" msgstr "visa fjärrspårande grenar" -#: builtin/show-branch.c:630 +#: builtin/show-branch.c:649 msgid "color '*!+-' corresponding to the branch" msgstr "färga \"*!+-\" enligt grenen" -#: builtin/show-branch.c:632 +#: builtin/show-branch.c:651 msgid "show <n> more commits after the common ancestor" msgstr "visa <n> ytterligare incheckningar efter gemensam anfader" -#: builtin/show-branch.c:634 +#: builtin/show-branch.c:653 msgid "synonym to more=-1" msgstr "synonym till more=-1" -#: builtin/show-branch.c:635 +#: builtin/show-branch.c:654 msgid "suppress naming strings" msgstr "undertyck namnsträngar" -#: builtin/show-branch.c:637 +#: builtin/show-branch.c:656 msgid "include the current branch" msgstr "inkludera aktuell gren" -#: builtin/show-branch.c:639 +#: builtin/show-branch.c:658 msgid "name commits with their object names" msgstr "namnge incheckningar med deras objektnamn" -#: builtin/show-branch.c:641 +#: builtin/show-branch.c:660 msgid "show possible merge bases" msgstr "visa möjliga sammanslagningsbaser" -#: builtin/show-branch.c:643 +#: builtin/show-branch.c:662 msgid "show refs unreachable from any other ref" msgstr "visa referenser som inte kan nås från någon annan referens" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:664 msgid "show commits in topological order" msgstr "visa incheckningar i topologisk ordning" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:667 msgid "show only commits not on the first branch" msgstr "visa endast incheckningar inte på den första grenen" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:669 msgid "show merges reachable from only one tip" msgstr "visa sammanslagningar som endast kan nås från en spets" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:671 msgid "topologically sort, maintaining date order where possible" msgstr "sortera topologiskt, behåll datumordning när möjligt" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:674 msgid "<n>[,<base>]" msgstr "<n>[,<bas>]" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:675 msgid "show <n> most recent ref-log entries starting at base" msgstr "visa <n> nyaste refloggposter med början på bas" -#: builtin/show-branch.c:690 +#: builtin/show-branch.c:711 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "" "--reflog är inkompatibel med --all, --remotes, --independent eller --merge-" "base" -#: builtin/show-branch.c:714 +#: builtin/show-branch.c:735 msgid "no branches given, and HEAD is not valid" msgstr "inga grenar angavs, och HEAD är inte giltigt" -#: builtin/show-branch.c:717 +#: builtin/show-branch.c:738 msgid "--reflog option needs one branch name" msgstr "--reflog behöver ett namn på en gren" -#: builtin/show-branch.c:720 +#: builtin/show-branch.c:741 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "maximalt %d poster kan visas samtidigt." msgstr[1] "maximalt %d poster kan visas samtidigt." -#: builtin/show-branch.c:724 +#: builtin/show-branch.c:745 #, c-format msgid "no such ref %s" msgstr "ingen sådan referens %s" -#: builtin/show-branch.c:808 +#: builtin/show-branch.c:829 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "kan inte hantera mer än %d revision." msgstr[1] "kan inte hantera mer än %d revisioner." -#: builtin/show-branch.c:812 +#: builtin/show-branch.c:833 #, c-format msgid "'%s' is not a valid ref." msgstr "\"%s\" är inte en giltig referens." -#: builtin/show-branch.c:815 +#: builtin/show-branch.c:836 #, c-format msgid "cannot find commit %s (%s)" msgstr "hittar inte incheckning %s (%s)" -#: builtin/show-ref.c:10 +#: builtin/show-ref.c:11 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" @@ -13519,39 +15761,39 @@ msgstr "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mönster>...]" -#: builtin/show-ref.c:11 +#: builtin/show-ref.c:12 msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<mönster>]" -#: builtin/show-ref.c:159 +#: builtin/show-ref.c:160 msgid "only show tags (can be combined with heads)" msgstr "visa endast taggar (kan kombineras med huvuden)" -#: builtin/show-ref.c:160 +#: builtin/show-ref.c:161 msgid "only show heads (can be combined with tags)" msgstr "visa endast huvuden (kan kombineras med taggar)" -#: builtin/show-ref.c:161 +#: builtin/show-ref.c:162 msgid "stricter reference checking, requires exact ref path" msgstr "striktare referenskontroll, kräver exakt referenssökväg" -#: builtin/show-ref.c:164 builtin/show-ref.c:166 +#: builtin/show-ref.c:165 builtin/show-ref.c:167 msgid "show the HEAD reference, even if it would be filtered out" msgstr "visa HEAD-refrens, även när den skulle filtreras ut" -#: builtin/show-ref.c:168 +#: builtin/show-ref.c:169 msgid "dereference tags into object IDs" msgstr "avreferera taggar till objekt-id" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:171 msgid "only show SHA1 hash using <n> digits" msgstr "visa SHA1-hash endast med <n> siffror" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:175 msgid "do not print results to stdout (useful with --verify)" msgstr "visa inte resultat på standard ut (användbart med --verify)" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:177 msgid "show refs from stdin that aren't in local repository" msgstr "visa referenser från standard in som inte finns i lokalt arkiv" @@ -13571,39 +15813,77 @@ 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:35 builtin/submodule--helper.c:1669 +#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1833 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678 +#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1842 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" -#: builtin/submodule--helper.c:59 +#: builtin/submodule--helper.c:61 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote tar inga argument" -#: builtin/submodule--helper.c:96 +#: builtin/submodule--helper.c:99 #, c-format msgid "cannot strip one component off url '%s'" msgstr "kan inte ta bort en komponent från url:en \"%s\"" -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198 +#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1356 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" -#: builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:412 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483 +#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:606 +#: builtin/submodule--helper.c:629 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules" -#: builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:521 +#, c-format +msgid "Entering '%s'\n" +msgstr "Går in i \"%s\"\n" + +#: builtin/submodule--helper.c:524 +#, c-format +msgid "" +"run_command returned non-zero status for %s\n" +"." +msgstr "" +"run_command returnerade icke-nollstatus för %s\n" +"." + +#: builtin/submodule--helper.c:545 +#, c-format +msgid "" +"run_command returned non-zero status while recursing in the nested " +"submodules of %s\n" +"." +msgstr "" +"run_command returnerade icke-nollstatus vid rekursering in i nästlade " +"undermoduler för %s\n" +"." + +#: builtin/submodule--helper.c:561 +msgid "Suppress output of entering each submodule command" +msgstr "Dölj utdata från för varje undermodulskommando som startas" + +#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1040 +msgid "Recurse into nested submodules" +msgstr "Rekursera in i nästlade undermoduler" + +#: builtin/submodule--helper.c:568 +msgid "git submodule--helper foreach [--quiet] [--recursive] <command>" +msgstr "git submodule--helper sync [--quiet] [--recursive] [<kommando>]" + +#: builtin/submodule--helper.c:644 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " @@ -13612,54 +15892,54 @@ msgstr "" "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sn eget " "officiella uppström." -#: builtin/submodule--helper.c:509 +#: builtin/submodule--helper.c:655 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Misslyckades registrera url för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:513 +#: builtin/submodule--helper.c:659 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n" -#: builtin/submodule--helper.c:523 +#: builtin/submodule--helper.c:669 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n" -#: builtin/submodule--helper.c:530 +#: builtin/submodule--helper.c:676 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:552 +#: builtin/submodule--helper.c:698 msgid "Suppress output for initializing a submodule" msgstr "Dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:557 +#: builtin/submodule--helper.c:703 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<sökväg>]" -#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747 +#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:901 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\"" -#: builtin/submodule--helper.c:660 +#: builtin/submodule--helper.c:814 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "kunde inte bestämma HEAD:s incheckning i undermodulen \"%s\"" -#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856 +#: builtin/submodule--helper.c:841 builtin/submodule--helper.c:1010 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "misslyckades rekursera in i undermodulen \"%s\"" -#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021 +#: builtin/submodule--helper.c:865 builtin/submodule--helper.c:1176 msgid "Suppress submodule status output" msgstr "Hindra statusutskrift för undermodul" -#: builtin/submodule--helper.c:712 +#: builtin/submodule--helper.c:866 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -13667,51 +15947,47 @@ msgstr "" "Visa incheckning från indexet istället för den som lagrats i undermodulens " "HEAD" -#: builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:867 msgid "recurse into nested submodules" msgstr "rekursera in i nästlade undermoduler" -#: builtin/submodule--helper.c:718 +#: builtin/submodule--helper.c:872 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]" -#: builtin/submodule--helper.c:742 +#: builtin/submodule--helper.c:896 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sökväg>" -#: builtin/submodule--helper.c:806 +#: builtin/submodule--helper.c:960 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synkroniserar undermodul-url för \"%s\"\n" -#: builtin/submodule--helper.c:812 +#: builtin/submodule--helper.c:966 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "misslyckades registrera url för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:826 +#: builtin/submodule--helper.c:980 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "misslyckades hämta standardfjärr för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:837 +#: builtin/submodule--helper.c:991 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "misslyckades uppdatera fjärr för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:885 +#: builtin/submodule--helper.c:1038 msgid "Suppress output of synchronizing submodule url" msgstr "Dölj utdata från synkroniering av undermodul-url" -#: builtin/submodule--helper.c:887 -msgid "Recurse into nested submodules" -msgstr "Rekursera in i nästlade undermoduler" - -#: builtin/submodule--helper.c:892 +#: builtin/submodule--helper.c:1045 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]" -#: builtin/submodule--helper.c:946 +#: builtin/submodule--helper.c:1099 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -13720,7 +15996,7 @@ msgstr "" "Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog (använd \"rm -rf" "\" om du verkligen vill ta bort den och all dess historik)" -#: builtin/submodule--helper.c:958 +#: builtin/submodule--helper.c:1111 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -13729,81 +16005,81 @@ msgstr "" "Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort " "dem" -#: builtin/submodule--helper.c:966 +#: builtin/submodule--helper.c:1119 #, c-format msgid "Cleared directory '%s'\n" msgstr "Rensade katalogen \"%s\"\n" -#: builtin/submodule--helper.c:968 +#: builtin/submodule--helper.c:1121 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:1132 #, c-format msgid "could not create empty submodule directory %s" msgstr "kunde inte skapa tom undermodulskatalog %s" -#: builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:1148 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n" -#: builtin/submodule--helper.c:1022 +#: builtin/submodule--helper.c:1177 msgid "Remove submodule working trees even if they contain local changes" msgstr "" "Ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar" -#: builtin/submodule--helper.c:1023 +#: builtin/submodule--helper.c:1178 msgid "Unregister all submodules" msgstr "Avregistrera alla undermoduler" -#: builtin/submodule--helper.c:1028 +#: builtin/submodule--helper.c:1183 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]" -#: builtin/submodule--helper.c:1042 +#: builtin/submodule--helper.c:1197 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler" -#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136 +#: builtin/submodule--helper.c:1290 builtin/submodule--helper.c:1293 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s" -#: builtin/submodule--helper.c:1172 +#: builtin/submodule--helper.c:1329 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte" -#: builtin/submodule--helper.c:1179 +#: builtin/submodule--helper.c:1336 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte" -#: builtin/submodule--helper.c:1201 +#: builtin/submodule--helper.c:1359 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen skall klonas till" -#: builtin/submodule--helper.c:1204 +#: builtin/submodule--helper.c:1362 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1365 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:1213 +#: builtin/submodule--helper.c:1373 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587 +#: builtin/submodule--helper.c:1376 builtin/submodule--helper.c:1751 msgid "force cloning progress" msgstr "tvinga kloningsförlopp" -#: builtin/submodule--helper.c:1221 +#: builtin/submodule--helper.c:1381 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -13811,82 +16087,82 @@ msgstr "" "git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference " "<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>" -#: builtin/submodule--helper.c:1252 +#: builtin/submodule--helper.c:1412 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsökvägen ”%s”" -#: builtin/submodule--helper.c:1267 +#: builtin/submodule--helper.c:1426 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" -#: builtin/submodule--helper.c:1332 +#: builtin/submodule--helper.c:1492 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:1336 +#: builtin/submodule--helper.c:1496 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:1365 +#: builtin/submodule--helper.c:1525 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:1394 +#: builtin/submodule--helper.c:1554 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" -#: builtin/submodule--helper.c:1527 +#: builtin/submodule--helper.c:1689 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" -#: builtin/submodule--helper.c:1538 +#: builtin/submodule--helper.c:1700 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Misslyckades klona \"%s\" för andra gången, avbryter" -#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788 +#: builtin/submodule--helper.c:1730 builtin/submodule--helper.c:1953 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:1571 +#: builtin/submodule--helper.c:1733 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:1575 +#: builtin/submodule--helper.c:1737 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:1579 +#: builtin/submodule--helper.c:1743 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:1582 +#: builtin/submodule--helper.c:1746 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:1584 +#: builtin/submodule--helper.c:1748 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:1585 +#: builtin/submodule--helper.c:1749 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:1592 +#: builtin/submodule--helper.c:1756 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:1605 +#: builtin/submodule--helper.c:1769 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:1673 +#: builtin/submodule--helper.c:1837 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -13895,20 +16171,20 @@ msgstr "" "Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men " "huvudprojektet är inte på någon gren" -#: builtin/submodule--helper.c:1789 +#: builtin/submodule--helper.c:1954 msgid "recurse into submodules" msgstr "rekursera ner i undermoduler" -#: builtin/submodule--helper.c:1795 +#: builtin/submodule--helper.c:1960 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<sökväg>...]" -#: builtin/submodule--helper.c:1857 +#: builtin/submodule--helper.c:2071 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" -#: builtin/submodule--helper.c:1863 +#: builtin/submodule--helper.c:2077 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -13934,15 +16210,15 @@ msgstr "ta bort symbolisk referens" msgid "shorten ref output" msgstr "förkorta ref-utdata" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 msgid "reason" msgstr "skäl" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 msgid "reason of the update" msgstr "skäl till uppdateringen" -#: builtin/tag.c:24 +#: builtin/tag.c:25 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" @@ -13950,11 +16226,11 @@ msgstr "" "git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>] <taggnamn> " "[<huvud>]" -#: builtin/tag.c:25 +#: builtin/tag.c:26 msgid "git tag -d <tagname>..." msgstr "git tag -d <taggnamn>..." -#: builtin/tag.c:26 +#: builtin/tag.c:27 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" @@ -13964,21 +16240,21 @@ msgstr "" "<incheckning>] [--points-at <objekt>]\n" "\t\t[--format=<format>] [--[no-]merged [<incheckning>]] [<mönster>...]" -#: builtin/tag.c:28 +#: builtin/tag.c:29 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<format>] <taggnamn>..." -#: builtin/tag.c:86 +#: builtin/tag.c:87 #, c-format msgid "tag '%s' not found." msgstr "taggen \"%s\" hittades inte." -#: builtin/tag.c:102 +#: builtin/tag.c:103 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tog bort tagg \"%s\" (var %s)\n" -#: builtin/tag.c:131 +#: builtin/tag.c:133 #, c-format msgid "" "\n" @@ -13991,7 +16267,7 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/tag.c:135 +#: builtin/tag.c:137 #, c-format msgid "" "\n" @@ -14006,151 +16282,151 @@ msgstr "" "Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n" "du vill.\n" -#: builtin/tag.c:189 +#: builtin/tag.c:191 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:191 +#: builtin/tag.c:193 msgid "unable to write tag file" msgstr "kunde inte skriva tagg-filen" -#: builtin/tag.c:216 +#: builtin/tag.c:218 msgid "bad object type." msgstr "felaktig objekttyp." -#: builtin/tag.c:265 +#: builtin/tag.c:267 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:272 +#: builtin/tag.c:274 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:381 +#: builtin/tag.c:383 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:383 +#: builtin/tag.c:385 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:385 +#: builtin/tag.c:387 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:386 +#: builtin/tag.c:388 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:388 +#: builtin/tag.c:390 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:390 +#: builtin/tag.c:392 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:392 +#: builtin/tag.c:394 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:394 +#: builtin/tag.c:396 msgid "force edit of tag message" msgstr "tvinga redigering av incheckningsmeddelande" -#: builtin/tag.c:395 +#: builtin/tag.c:397 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:399 +#: builtin/tag.c:401 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:400 +#: builtin/tag.c:402 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:401 builtin/update-ref.c:368 +#: builtin/tag.c:403 builtin/update-ref.c:369 msgid "create a reflog" msgstr "skapa en reflog" -#: builtin/tag.c:403 +#: builtin/tag.c:405 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:404 +#: builtin/tag.c:406 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:405 builtin/tag.c:407 +#: builtin/tag.c:407 builtin/tag.c:409 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:406 builtin/tag.c:408 +#: builtin/tag.c:408 builtin/tag.c:410 msgid "print only tags that don't contain the commit" msgstr "visa endast taggar som inte innehåller incheckningen" -#: builtin/tag.c:409 +#: builtin/tag.c:411 msgid "print only tags that are merged" msgstr "visa endast taggar som slagits samman" -#: builtin/tag.c:410 +#: builtin/tag.c:412 msgid "print only tags that are not merged" msgstr "visa endast taggar som ej slagits samman" -#: builtin/tag.c:415 +#: builtin/tag.c:417 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:459 +#: builtin/tag.c:461 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" -#: builtin/tag.c:481 +#: builtin/tag.c:483 msgid "-n option is only allowed in list mode" msgstr "Flaggan -n är endast tillåten i listläge" -#: builtin/tag.c:483 +#: builtin/tag.c:485 msgid "--contains option is only allowed in list mode" msgstr "Flaggan --contains är endast tillåten i listläge" -#: builtin/tag.c:485 +#: builtin/tag.c:487 msgid "--no-contains option is only allowed in list mode" msgstr "Flaggan --no-contains är endast tillåten i listläge" -#: builtin/tag.c:487 +#: builtin/tag.c:489 msgid "--points-at option is only allowed in list mode" msgstr "Flaggan --points-at är endast tillåten i listläge" -#: builtin/tag.c:489 +#: builtin/tag.c:491 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:500 +#: builtin/tag.c:502 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:519 +#: builtin/tag.c:521 msgid "too many params" msgstr "för många parametrar" -#: builtin/tag.c:525 +#: builtin/tag.c:527 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:530 +#: builtin/tag.c:532 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:561 +#: builtin/tag.c:563 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" -#: builtin/unpack-objects.c:498 +#: builtin/unpack-objects.c:500 msgid "Unpacking objects" msgstr "Packar upp objekt" @@ -14159,11 +16435,6 @@ msgstr "Packar upp objekt" msgid "failed to create directory %s" msgstr "misslyckades skapa katalogen %s" -#: builtin/update-index.c:88 -#, c-format -msgid "failed to stat %s" -msgstr "misslyckades ta status på %s" - #: builtin/update-index.c:98 #, c-format msgid "failed to create file %s" @@ -14215,143 +16486,143 @@ msgstr "stat-informationen för en katalog ändras inte när en katalog tas bort msgid " OK" msgstr " OK" -#: builtin/update-index.c:579 +#: builtin/update-index.c:588 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<flaggor>] [--] [<fil>...]" -#: builtin/update-index.c:936 +#: builtin/update-index.c:944 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är àjour" -#: builtin/update-index.c:939 +#: builtin/update-index.c:947 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:942 +#: builtin/update-index.c:950 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:944 +#: builtin/update-index.c:952 msgid "let files replace directories and vice-versa" msgstr "låt filer ersätta kataloger och omvänt" -#: builtin/update-index.c:946 +#: builtin/update-index.c:954 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:948 +#: builtin/update-index.c:956 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" -#: builtin/update-index.c:951 +#: builtin/update-index.c:959 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:955 +#: builtin/update-index.c:963 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:959 +#: builtin/update-index.c:967 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:960 +#: builtin/update-index.c:968 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:969 +#: builtin/update-index.c:977 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:972 +#: builtin/update-index.c:980 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:975 +#: builtin/update-index.c:983 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:978 +#: builtin/update-index.c:986 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:981 +#: builtin/update-index.c:989 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:983 +#: builtin/update-index.c:991 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:985 +#: builtin/update-index.c:993 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:987 +#: builtin/update-index.c:995 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:991 +#: builtin/update-index.c:999 msgid "add entries from standard input to the index" msgstr "lägg poster från standard in till indexet" -#: builtin/update-index.c:995 +#: builtin/update-index.c:1003 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:999 +#: builtin/update-index.c:1007 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: builtin/update-index.c:1003 +#: builtin/update-index.c:1011 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1014 msgid "report actions to standard output" msgstr "rapportera åtgärder på standard ut" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1016 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1020 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1022 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" -#: builtin/update-index.c:1016 +#: builtin/update-index.c:1024 msgid "enable/disable untracked cache" msgstr "aktivera/inaktivera ospårad cache" -#: builtin/update-index.c:1018 +#: builtin/update-index.c:1026 msgid "test if the filesystem supports untracked cache" msgstr "testa om filsystemet stöder ospårad cache" -#: builtin/update-index.c:1020 +#: builtin/update-index.c:1028 msgid "enable untracked cache without testing the filesystem" msgstr "aktivera ospårad cache utan att testa filsystemet" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1030 msgid "write out the index even if is not flagged as changed" msgstr "skriv ut indexet även om det inte angivits som ändrat" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1032 msgid "enable or disable file system monitor" msgstr "aktivera eller inaktivera filsystemsövervakning" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1034 msgid "mark files as fsmonitor valid" msgstr "markera filer som \"fsmonitor valid\"" -#: builtin/update-index.c:1029 +#: builtin/update-index.c:1037 msgid "clear fsmonitor valid bit" msgstr "töm \"fsmonitor valid\"-bit" -#: builtin/update-index.c:1127 +#: builtin/update-index.c:1136 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -14359,7 +16630,7 @@ msgstr "" "core.splitIndex är satt till false; ta bort eller ändra det om du verkligen " "vill aktivera delat index" -#: builtin/update-index.c:1136 +#: builtin/update-index.c:1145 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -14367,7 +16638,7 @@ msgstr "" "core.splitIndex är satt till true; ta bort eller ändra det om du verkligen " "vill inaktivera delat index" -#: builtin/update-index.c:1147 +#: builtin/update-index.c:1156 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -14375,11 +16646,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:1151 +#: builtin/update-index.c:1160 msgid "Untracked cache disabled" msgstr "Ospårad cache är inaktiverad" -#: builtin/update-index.c:1159 +#: builtin/update-index.c:1168 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -14387,26 +16658,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:1163 +#: builtin/update-index.c:1172 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Ospårad cache är aktiverad för \"%s\"" -#: builtin/update-index.c:1171 +#: builtin/update-index.c:1180 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "core.fsmonitor inte satt; sätt om du verkligen vill aktivera fsmonitor" -#: builtin/update-index.c:1175 +#: builtin/update-index.c:1184 msgid "fsmonitor enabled" msgstr "fsmonitor aktiverat" -#: builtin/update-index.c:1178 +#: builtin/update-index.c:1187 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor är satt; ta bort om du verkligen vill inaktivera fsmonitor" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1191 msgid "fsmonitor disabled" msgstr "fsmonitor inaktiverat" @@ -14422,19 +16693,19 @@ msgstr "git update-ref [<flaggor>] <refnamn> <gammaltvärde> [<nyttvärde>]" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<flaggor>] --stdin [-z]" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:364 msgid "delete the reference" msgstr "ta bort referensen" -#: builtin/update-ref.c:365 +#: builtin/update-ref.c:366 msgid "update <refname> not the one it points to" msgstr "uppdatera <refnamn> inte det den pekar på" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:367 msgid "stdin has NUL-terminated arguments" msgstr "standard in har NUL-terminerade argument" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:368 msgid "read updates from stdin" msgstr "läs uppdateringar från standard in" @@ -14446,15 +16717,31 @@ msgstr "git update-server-info [--force]" msgid "update the info files from scratch" msgstr "uppdatera informationsfilerna från grunden" -#: builtin/verify-commit.c:18 +#: builtin/upload-pack.c:11 +msgid "git upload-pack [<options>] <dir>" +msgstr "git upload-pack [<flaggor>] <katalog>" + +#: builtin/upload-pack.c:25 +msgid "exit immediately after initial ref advertisement" +msgstr "avsluta omedelbart efter inledande kungörelse av referenser" + +#: builtin/upload-pack.c:27 +msgid "do not try <directory>/.git/ if <directory> is no Git directory" +msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog" + +#: builtin/upload-pack.c:29 +msgid "interrupt transfer after <n> seconds of inactivity" +msgstr "avbryt överföringen efter <n> sekunders inaktivitet" + +#: builtin/verify-commit.c:20 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <incheckning>..." -#: builtin/verify-commit.c:73 +#: builtin/verify-commit.c:76 msgid "print commit contents" msgstr "visa innehåll för incheckning" -#: builtin/verify-commit.c:74 builtin/verify-tag.c:38 +#: builtin/verify-commit.c:77 builtin/verify-tag.c:38 msgid "print raw gpg status output" msgstr "visa råa gpg-statusdata" @@ -14506,22 +16793,22 @@ msgstr "git worktree remove [<flaggor>] <arbetskatalog>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <sökväg>" -#: builtin/worktree.c:60 +#: builtin/worktree.c:59 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Tar bort worktrees/%s: inte en giltig katalog" -#: builtin/worktree.c:66 +#: builtin/worktree.c:65 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte" -#: builtin/worktree.c:71 builtin/worktree.c:80 +#: builtin/worktree.c:70 builtin/worktree.c:79 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)" -#: builtin/worktree.c:90 +#: builtin/worktree.c:89 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -14530,177 +16817,192 @@ msgstr "" "Tar bort worktrees/%s: kort läsning (förväntade %<PRIuMAX> byte, läste " "%<PRIuMAX>)" -#: builtin/worktree.c:98 +#: builtin/worktree.c:97 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" -#: builtin/worktree.c:114 +#: builtin/worktree.c:106 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats" -#: builtin/worktree.c:161 +#: builtin/worktree.c:153 msgid "report pruned working trees" msgstr "rapportera borttagna arbetskataloger" -#: builtin/worktree.c:163 +#: builtin/worktree.c:155 msgid "expire working trees older than <time>" msgstr "låt tid gå ut för arbetskataloger äldre än <tid>" -#: builtin/worktree.c:238 +#: builtin/worktree.c:230 #, c-format msgid "'%s' already exists" msgstr "\"%s\" finns redan" -#: builtin/worktree.c:269 +#: builtin/worktree.c:261 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:308 +#: builtin/worktree.c:380 builtin/worktree.c:386 #, c-format -msgid "Preparing %s (identifier %s)" -msgstr "Förbereder %s (identifieraren %s)" +msgid "Preparing worktree (new branch '%s')" +msgstr "Förbereder arbetskatalog (ny gren \"%s\")" -#: builtin/worktree.c:385 +#: builtin/worktree.c:382 +#, 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:391 +#, c-format +msgid "Preparing worktree (checking out '%s')" +msgstr "Förbereder arbetskatalog (checkar ut \"%s\")" + +#: builtin/worktree.c:397 +#, c-format +msgid "Preparing worktree (detached HEAD %s)" +msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)" + +#: builtin/worktree.c:438 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:388 +#: builtin/worktree.c:441 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:390 +#: builtin/worktree.c:443 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:392 +#: builtin/worktree.c:445 msgid "populate the new working tree" msgstr "befolka den nya arbetskatalogen" -#: builtin/worktree.c:393 +#: builtin/worktree.c:446 msgid "keep the new working tree locked" msgstr "låt arbetskatalogen förbli låst" -#: builtin/worktree.c:395 +#: builtin/worktree.c:449 msgid "set up tracking mode (see git-branch(1))" msgstr "ställ in spårningsläge (se git-branch(1))" -#: builtin/worktree.c:398 +#: builtin/worktree.c:452 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:406 +#: builtin/worktree.c:460 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" -#: builtin/worktree.c:471 +#: builtin/worktree.c:521 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:571 +#: builtin/worktree.c:621 msgid "reason for locking" msgstr "orsak till lås" -#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670 -#: builtin/worktree.c:809 +#: builtin/worktree.c:633 builtin/worktree.c:666 builtin/worktree.c:720 +#: builtin/worktree.c:860 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:585 builtin/worktree.c:618 +#: builtin/worktree.c:635 builtin/worktree.c:668 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:590 +#: builtin/worktree.c:640 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:592 +#: builtin/worktree.c:642 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:620 +#: builtin/worktree.c:670 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" -#: builtin/worktree.c:645 +#: builtin/worktree.c:695 msgid "working trees containing submodules cannot be moved or removed" msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort" -#: builtin/worktree.c:672 builtin/worktree.c:811 +#: builtin/worktree.c:722 builtin/worktree.c:862 #, c-format msgid "'%s' is a main working tree" msgstr "\"%s\" är inte en huvudarbetskatalog" -#: builtin/worktree.c:677 +#: builtin/worktree.c:727 #, c-format msgid "could not figure out destination name from '%s'" msgstr "kunde inte lista ut målnamn från \"%s\"" -#: builtin/worktree.c:683 +#: builtin/worktree.c:733 #, c-format msgid "target '%s' already exists" msgstr "målet \"%s\" finns redan" -#: builtin/worktree.c:690 +#: builtin/worktree.c:740 #, c-format msgid "cannot move a locked working tree, lock reason: %s" msgstr "kan inte flytta en låst arbetskatalog, orsak till lås: %s" -#: builtin/worktree.c:692 +#: builtin/worktree.c:742 msgid "cannot move a locked working tree" msgstr "kan inte flytta en låst arbetskatalog" -#: builtin/worktree.c:695 +#: builtin/worktree.c:745 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s" -#: builtin/worktree.c:700 +#: builtin/worktree.c:750 #, c-format msgid "failed to move '%s' to '%s'" msgstr "misslyckades flytta \"%s\" till \"%s\"" -#: builtin/worktree.c:748 +#: builtin/worktree.c:798 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "misslyckades köra \"git status\" på \"%s\"" -#: builtin/worktree.c:752 +#: builtin/worktree.c:802 #, 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:757 +#: builtin/worktree.c:807 #, 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:768 builtin/worktree.c:782 +#: builtin/worktree.c:818 builtin/worktree.c:832 #, c-format msgid "failed to delete '%s'" msgstr "misslyckades ta bort \"%s\"" -#: builtin/worktree.c:794 +#: builtin/worktree.c:844 msgid "force removing even if the worktree is dirty" msgstr "tvinga ta bort även om arbetskatalogen är smutsig" -#: builtin/worktree.c:815 +#: builtin/worktree.c:866 #, c-format msgid "cannot remove a locked working tree, lock reason: %s" msgstr "kan inte ta bort en låst arbetskatalog, orsak till låset: %s" -#: builtin/worktree.c:817 +#: builtin/worktree.c:868 msgid "cannot remove a locked working tree" msgstr "kan inte ta bort en låst arbetskatalog" -#: builtin/worktree.c:820 +#: builtin/worktree.c:871 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s" @@ -14717,30 +17019,10 @@ msgstr "<prefix>/" msgid "write tree object for a subdirectory <prefix>" msgstr "visa trädobjekt för underkatalogen <prefix>" -#: builtin/write-tree.c:31 +#: builtin/write-tree.c:30 msgid "only useful for debugging" msgstr "endast användbart vid felsökning" -#: upload-pack.c:27 -msgid "git upload-pack [<options>] <dir>" -msgstr "git upload-pack [<flaggor>] <katalog>" - -#: upload-pack.c:1070 -msgid "quit after a single request/response exchange" -msgstr "avsluta omedelbart efter första anrop/svar-utväxling" - -#: upload-pack.c:1072 -msgid "exit immediately after initial ref advertisement" -msgstr "avsluta omedelbart efter inledande kungörelse av referenser" - -#: upload-pack.c:1074 -msgid "do not try <directory>/.git/ if <directory> is no Git directory" -msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog" - -#: upload-pack.c:1076 -msgid "interrupt transfer after <n> seconds of inactivity" -msgstr "avbryt överföringen efter <n> sekunders inaktivitet" - #: credential-cache--daemon.c:222 #, c-format msgid "" @@ -14758,22 +17040,24 @@ msgstr "" msgid "print debugging messages to stderr" msgstr "skriv felsökningsmeddelanden på standard fel" -#: git.c:8 +#: git.c:27 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" +"bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" " <command> [<args>]" msgstr "" "git [--version] [--help] [-C <sökväg>] [-c <namn>=<värde>]\n" " [--exec-path[=<sökväg>]] [--html-path] [--man-path] [--info-" "path]\n" -" [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" +"bare]\n" " [--git-dir=<sökväg>] [--work-tree=<sökväg>] [--namespace=<namn>]\n" " <kommando> [<flaggor>]" -#: git.c:15 +#: git.c:34 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" @@ -14783,66 +17067,66 @@ 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:95 +#: git.c:173 #, c-format msgid "no directory given for --git-dir\n" msgstr "ingen katalog angavs för --git-dir\n" -#: git.c:109 +#: git.c:187 #, c-format msgid "no namespace given for --namespace\n" msgstr "ingen namnrymd angavs för --namespace\n" -#: git.c:123 +#: git.c:201 #, c-format msgid "no directory given for --work-tree\n" msgstr "ingen katalog angavs för --work-tree\n" -#: git.c:137 +#: git.c:215 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "inget prefix angavs för --super-prefix\n" -#: git.c:159 +#: git.c:237 #, c-format msgid "-c expects a configuration string\n" msgstr "-c förväntar en konfigurationssträng\n" -#: git.c:197 +#: git.c:275 #, c-format msgid "no directory given for -C\n" msgstr "ingen katalog angavs för -C\n" -#: git.c:212 +#: git.c:300 #, c-format msgid "unknown option: %s\n" msgstr "okänd flagga: %s\n" -#: git.c:687 +#: git.c:770 #, 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:699 +#: git.c:782 #, c-format msgid "failed to run command '%s': %s\n" msgstr "misslyckades köra kommandot \"%s\": %s\n" -#: http.c:342 +#: http.c:348 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "http.postbuffer har negativt värde; använder förvalet %d" -#: http.c:363 +#: http.c:369 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Delegerad styrning stöds inte av cURL < 7.22.0" -#: http.c:372 +#: http.c:378 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0" -#: http.c:1857 +#: http.c:1854 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14853,7 +17137,7 @@ msgstr "" " bad om: %s\n" " omdirigering: %s" -#: remote-curl.c:345 +#: remote-curl.c:401 #, c-format msgid "redirecting to %s" msgstr "omdirigerar till %s" @@ -14866,129 +17150,660 @@ msgstr "argument" msgid "object filtering" msgstr "objektfiltrering" -#: common-cmds.h:9 -msgid "start a working area (see also: git help tutorial)" -msgstr "starta arbetskatalog (se också: git help tutorial)" +#: parse-options.h:157 +msgid "expiry-date" +msgstr "giltig-till" -#: common-cmds.h:10 -msgid "work on the current change (see also: git help everyday)" -msgstr "jobba med aktuell förändring (se också: git help everyday)" +#: parse-options.h:172 +msgid "no-op (backward compatibility)" +msgstr "ingen funktion (bakåtkompatibilitet)" -#: common-cmds.h:11 -msgid "examine the history and state (see also: git help revisions)" -msgstr "utforska historiken och tillståndet (se också: git help revisions)" +#: parse-options.h:251 +msgid "be more verbose" +msgstr "var mer pratsam" -#: common-cmds.h:12 -msgid "grow, mark and tweak your common history" -msgstr "utöka, markera och justera din gemensamma historik" +#: parse-options.h:253 +msgid "be more quiet" +msgstr "var mer tyst" -#: common-cmds.h:13 -msgid "collaborate (see also: git help workflows)" -msgstr "samarbeta (se också: git help workflows)" +#: parse-options.h:259 +msgid "use <n> digits to display SHA-1s" +msgstr "använd <n> siffror för att visa SHA-1:or" -#: common-cmds.h:17 +#: command-list.h:50 msgid "Add file contents to the index" msgstr "Lägg filinnehåll till indexet" -#: common-cmds.h:18 +#: command-list.h:51 +msgid "Apply a series of patches from a mailbox" +msgstr "Tillämpa en serie patchar från en brevlåda" + +#: command-list.h:52 +msgid "Annotate file lines with commit information" +msgstr "Kommentera filrader med incheckningsinformation" + +#: command-list.h:53 +msgid "Apply a patch to files and/or to the index" +msgstr "Tillämpa en patch på filer och/eller indexet" + +#: command-list.h:54 +msgid "Import an Arch repository into Git" +msgstr "Importera ett Arch-arkiv till Git" + +#: command-list.h:55 +msgid "Create an archive of files from a named tree" +msgstr "Skapa ett arkiv över filer från ett namngivet träd" + +#: command-list.h:56 msgid "Use binary search to find the commit that introduced a bug" msgstr "Använd binärsökning för att hitta ändringen som introducerade ett fel" -#: common-cmds.h:19 +#: command-list.h:57 +msgid "Show what revision and author last modified each line of a file" +msgstr "Visa version och författare som sist modifierade varje rad i en fil" + +#: command-list.h:58 msgid "List, create, or delete branches" msgstr "Visa, skapa eller ta bort grenar" -#: common-cmds.h:20 +#: command-list.h:59 +msgid "Move objects and refs by archive" +msgstr "Flytta objekt och referenser efter arkiv" + +#: command-list.h:60 +msgid "Provide content or type and size information for repository objects" +msgstr "" +"Visa innehåller eller typ- och storleksinformation för objekt i arkivet." + +#: command-list.h:61 +msgid "Display gitattributes information" +msgstr "Visa information från gitattributes" + +#: command-list.h:62 +msgid "Debug gitignore / exclude files" +msgstr "Felsök gitignore / exkluderings-filer" + +#: command-list.h:63 +msgid "Show canonical names and email addresses of contacts" +msgstr "Visa kanoniska namn och e-postadresser för kontakter" + +#: command-list.h:64 msgid "Switch branches or restore working tree files" msgstr "Byt till en ny gren eller återställ filer i arbetskatalogen" -#: common-cmds.h:21 +#: command-list.h:65 +msgid "Copy files from the index to the working tree" +msgstr "Kopiera filer från indexet till arbetskatalogen" + +#: command-list.h:66 +msgid "Ensures that a reference name is well formed" +msgstr "Se till att referensen är välformad" + +#: command-list.h:67 +msgid "Find commits yet to be applied to upstream" +msgstr "Hitta incheckningar som ännu inte applicerats uppströms" + +#: command-list.h:68 +msgid "Apply the changes introduced by some existing commits" +msgstr "Applicera ändringarna introducerade av befintliga incheckningar" + +#: command-list.h:69 +msgid "Graphical alternative to git-commit" +msgstr "Grafiskt alternativ till git-commit" + +#: command-list.h:70 +msgid "Remove untracked files from the working tree" +msgstr "Ta bort ospårade filer från arbetskatalogen" + +#: command-list.h:71 msgid "Clone a repository into a new directory" msgstr "Klona ett arkiv till en ny katalog" -#: common-cmds.h:22 +#: command-list.h:72 +msgid "Display data in columns" +msgstr "Visa data i kolumner" + +#: command-list.h:73 msgid "Record changes to the repository" msgstr "Protokollför ändringar i arkivet" -#: common-cmds.h:23 +#: command-list.h:74 +msgid "Write and verify Git commit graph files" +msgstr "Skriv och verifiera Git-incheckningsgraffiler" + +#: command-list.h:75 +msgid "Create a new commit object" +msgstr "Skapa ett nytt incheckningsobjekt" + +#: command-list.h:76 +msgid "Get and set repository or global options" +msgstr "Läs och skriv alternativ för arkiv eller globalt" + +#: command-list.h:77 +msgid "Count unpacked number of objects and their disk consumption" +msgstr "Räkna antal opackade objekt och mängd diskutrymme" + +#: command-list.h:78 +msgid "Retrieve and store user credentials" +msgstr "Hämta och spara användarreferenser" + +#: command-list.h:79 +msgid "Helper to temporarily store passwords in memory" +msgstr "Hjälpprogram för att tillfälligt lagra lösenord i minnet" + +#: command-list.h:80 +msgid "Helper to store credentials on disk" +msgstr "Hjälpprogram för att lagra användarreferenser på disk" + +#: command-list.h:81 +msgid "Export a single commit to a CVS checkout" +msgstr "Exportera en enkel incheckning i en CVS-utcheckning" + +#: command-list.h:82 +msgid "Salvage your data out of another SCM people love to hate" +msgstr "Rädda dina data ut ur andra SCM folk älskar att hata" + +#: command-list.h:83 +msgid "A CVS server emulator for Git" +msgstr "En CVS-serveremulator för Git" + +#: command-list.h:84 +msgid "A really simple server for Git repositories" +msgstr "En riktigt enkel server för Git-arkiv" + +#: command-list.h:85 +msgid "Give an object a human readable name based on an available ref" +msgstr "Ge ett objekt användarläsbara namn baserade på en tillgänglig referens" + +#: command-list.h:86 msgid "Show changes between commits, commit and working tree, etc" msgstr "Visa ändringar mellan incheckningar, med arbetskatalogen, osv" -#: common-cmds.h:24 +#: command-list.h:87 +msgid "Compares files in the working tree and the index" +msgstr "Jämför filer i arbetskatalogen och indexet" + +#: command-list.h:88 +msgid "Compare a tree to the working tree or index" +msgstr "Jämför en träd med arbetskatalogen eller indexet" + +#: command-list.h:89 +msgid "Compares the content and mode of blobs found via two tree objects" +msgstr "Visar innehåll och läge för blob:ar som hittats via två trädobjekt" + +#: command-list.h:90 +msgid "Show changes using common diff tools" +msgstr "Visa ändringar med vanliga diff-verktyg" + +#: command-list.h:91 +msgid "Git data exporter" +msgstr "Exporterare för Git-data" + +#: command-list.h:92 +msgid "Backend for fast Git data importers" +msgstr "Bakända för snabba Git-dataimporterare" + +#: command-list.h:93 msgid "Download objects and refs from another repository" msgstr "Hämta objekt och referenser från annat arkiv" -#: common-cmds.h:25 +#: command-list.h:94 +msgid "Receive missing objects from another repository" +msgstr "Ta emot saknade objekt från annat arkiv" + +#: command-list.h:95 +msgid "Rewrite branches" +msgstr "Skriv om grenar" + +#: command-list.h:96 +msgid "Produce a merge commit message" +msgstr "Skapa incheckningsmeddelande för en sammanslagning" + +#: command-list.h:97 +msgid "Output information on each ref" +msgstr "Visa information för varje referens" + +#: command-list.h:98 +msgid "Prepare patches for e-mail submission" +msgstr "Förbered patchar för insändning via e-post" + +#: command-list.h:99 +msgid "Verifies the connectivity and validity of the objects in the database" +msgstr "Bekräftar konnektivitet och validitet för objektet i databasen" + +#: command-list.h:100 +msgid "Cleanup unnecessary files and optimize the local repository" +msgstr "Städa onödiga filer och optimera det lokala arkivet" + +#: command-list.h:101 +msgid "Extract commit ID from an archive created using git-archive" +msgstr "Hämta inchecknings-ID från ett arkiv skapat med git-archive" + +#: command-list.h:102 msgid "Print lines matching a pattern" msgstr "Visa rader som motsvarar mönster" -#: common-cmds.h:26 +#: command-list.h:103 +msgid "A portable graphical interface to Git" +msgstr "Ett portabelt grafiskt gränssnitt för Git" + +#: command-list.h:104 +msgid "Compute object ID and optionally creates a blob from a file" +msgstr "Beräkna objekt-ID och möjligen skapa en blob från en fil" + +#: command-list.h:105 +msgid "Display help information about Git" +msgstr "Visa hjälpinformation om Git" + +#: command-list.h:106 +msgid "Server side implementation of Git over HTTP" +msgstr "Serversideimplementation av Git över HTTP" + +#: command-list.h:107 +msgid "Download from a remote Git repository via HTTP" +msgstr "Hämta objekt och referenser från annat Git-arkiv över HTTP" + +#: command-list.h:108 +msgid "Push objects over HTTP/DAV to another repository" +msgstr "Sänd objekt över HTTP/DAV till ett annat arkiv" + +#: command-list.h:109 +msgid "Send a collection of patches from stdin to an IMAP folder" +msgstr "Sänd en samling patchar från stdin till en IMAP-mapp" + +#: command-list.h:110 +msgid "Build pack index file for an existing packed archive" +msgstr "SKapa pack-indexfiler för ett befintligt packat arkiv" + +#: command-list.h:111 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Skapa tomt Git-arkiv eller ominitiera ett befintligt" -#: common-cmds.h:27 +#: command-list.h:112 +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" +msgstr "" +"lägg till eller tolka strukturerad information i incheckningsmeddelanden" + +#: command-list.h:114 +msgid "The Git repository browser" +msgstr "Bläddraren för Git-arkiv" + +#: command-list.h:115 msgid "Show commit logs" msgstr "Visa incheckningsloggar" -#: common-cmds.h:28 +#: command-list.h:116 +msgid "Show information about files in the index and the working tree" +msgstr "Visa information om filer i indexet och arbetskatalogen" + +#: command-list.h:117 +msgid "List references in a remote repository" +msgstr "Lista referenser i ett fjärrarkiv" + +#: command-list.h:118 +msgid "List the contents of a tree object" +msgstr "Visa innehållet i ett trädobjekt" + +#: command-list.h:119 +msgid "Extracts patch and authorship from a single e-mail message" +msgstr "Hämta patch och ägarskap från ett enkelt e-postmeddelande" + +#: command-list.h:120 +msgid "Simple UNIX mbox splitter program" +msgstr "Enkelt program för att dela en UNIX mbox" + +#: command-list.h:121 msgid "Join two or more development histories together" msgstr "Slå ihop två eller flera utvecklingshistorier" -#: common-cmds.h:29 +#: command-list.h:122 +msgid "Find as good common ancestors as possible for a merge" +msgstr "Hitta en så bra anfader som möjligt för sammanslagning" + +#: command-list.h:123 +msgid "Run a three-way file merge" +msgstr "Kör en trevägs-filsammanslagning" + +#: command-list.h:124 +msgid "Run a merge for files needing merging" +msgstr "Kör en sammanslagning för filer som behöver det" + +#: command-list.h:125 +msgid "The standard helper program to use with git-merge-index" +msgstr "Förvalt hjälpprogram att använda tillsammans med git-merge-index" + +#: command-list.h:126 +msgid "Run merge conflict resolution tools to resolve merge conflicts" +msgstr "Kör verktyg för lösning av sammanslagningskonflikter" + +#: command-list.h:127 +msgid "Show three-way merge without touching index" +msgstr "Visa trevägssammanslagning utan att röra indexet" + +#: command-list.h:128 +msgid "Creates a tag object" +msgstr "Skapar ett taggobjekt" + +#: command-list.h:129 +msgid "Build a tree-object from ls-tree formatted text" +msgstr "Bygg ett trädobjekt från ls-tree-formaterad text" + +#: command-list.h:130 msgid "Move or rename a file, a directory, or a symlink" msgstr "Flytta eller byt namn på en fil, katalog eller symbolisk länk" -#: common-cmds.h:30 +#: command-list.h:131 +msgid "Find symbolic names for given revs" +msgstr "Hitta symboliska namn för givna referenser" + +#: command-list.h:132 +msgid "Add or inspect object notes" +msgstr "Lägg till eller inspektera objektanteckningar" + +#: command-list.h:133 +msgid "Import from and submit to Perforce repositories" +msgstr "Importera från eller sänd till Perforce-arkiv" + +#: command-list.h:134 +msgid "Create a packed archive of objects" +msgstr "Skapa ett packat arkiv med objekt" + +#: command-list.h:135 +msgid "Find redundant pack files" +msgstr "Hitta redundanta pack-filer" + +#: command-list.h:136 +msgid "Pack heads and tags for efficient repository access" +msgstr "Packa huvuden och taggar för effektiv arkivåtkomst" + +#: command-list.h:137 +msgid "Routines to help parsing remote repository access parameters" +msgstr "" +"Rutiner för att göra det lättare att tolka åtkomstparametrar för fjärrarkiv" + +#: command-list.h:138 +msgid "Compute unique ID for a patch" +msgstr "Beräkna unik ID för en patch" + +#: command-list.h:139 +msgid "Prune all unreachable objects from the object database" +msgstr "Ta bort alla onåbara objekt från objektdatabasen" + +#: command-list.h:140 +msgid "Remove extra objects that are already in pack files" +msgstr "Ta bort extraobjekt som redan finns i pack-filerna" + +#: command-list.h:141 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Hämta från och integrera med annat arkiv eller en lokal gren" -#: common-cmds.h:31 +#: command-list.h:142 msgid "Update remote refs along with associated objects" msgstr "Uppdatera fjärr-referenser och tillhörande objekt" -#: common-cmds.h:32 +#: command-list.h:143 +msgid "Applies a quilt patchset onto the current branch" +msgstr "Tillämpar en quilt-patchuppsättning på aktiv gren" + +#: command-list.h:144 +msgid "Compare two commit ranges (e.g. two versions of a branch)" +msgstr "Jämför två incheckningsintervall (dvs. två versioner av en gren)" + +#: command-list.h:145 +msgid "Reads tree information into the index" +msgstr "Läser trädinformation in i indexet" + +#: command-list.h:146 msgid "Reapply commits on top of another base tip" msgstr "Applicera incheckningar på nytt ovanpå en annan bastopp" -#: common-cmds.h:33 +#: command-list.h:147 +msgid "Receive what is pushed into the repository" +msgstr "Ta emot det som sänds till arkivet" + +#: command-list.h:148 +msgid "Manage reflog information" +msgstr "Hantera referenslogg-information" + +#: command-list.h:149 +msgid "Manage set of tracked repositories" +msgstr "Hantera uppsättningen spårade arkiv" + +#: command-list.h:150 +msgid "Pack unpacked objects in a repository" +msgstr "Packa opackade objekt i ett arkiv" + +#: command-list.h:151 +msgid "Create, list, delete refs to replace objects" +msgstr "Skapa, visa, ta bort referenser för att ersätta objekt" + +#: command-list.h:152 +msgid "Generates a summary of pending changes" +msgstr "Skapar en sammanfattning av väntande ändringar" + +#: command-list.h:153 +msgid "Reuse recorded resolution of conflicted merges" +msgstr "Återanvänd sparad lösning av sammanslagningskonflikter" + +#: command-list.h:154 msgid "Reset current HEAD to the specified state" msgstr "Återställ aktuell HEAD till angivet tillstånd" -#: common-cmds.h:34 +#: command-list.h:155 +msgid "Revert some existing commits" +msgstr "Återställ några befintliga incheckningar" + +#: command-list.h:156 +msgid "Lists commit objects in reverse chronological order" +msgstr "Visa incheckningsobjekt i omvänd kronologisk ordning" + +#: command-list.h:157 +msgid "Pick out and massage parameters" +msgstr "Plocka ut och massera parametrar" + +#: command-list.h:158 msgid "Remove files from the working tree and from the index" msgstr "Ta bort filer från arbetskatalogen och från indexet" -#: common-cmds.h:35 +#: command-list.h:159 +msgid "Send a collection of patches as emails" +msgstr "Sänd en uppsättning patchar som e-post" + +#: command-list.h:160 +msgid "Push objects over Git protocol to another repository" +msgstr "Sänd objekt över Git-protokollet till annat arkiv" + +#: command-list.h:161 +msgid "Restricted login shell for Git-only SSH access" +msgstr "Begränsat inloggningsskal för SSH-åtkomst till bara Git" + +#: command-list.h:162 +msgid "Summarize 'git log' output" +msgstr "Summera \"git log\"-utdata" + +#: command-list.h:163 msgid "Show various types of objects" msgstr "Visa olika sorters objekt" -#: common-cmds.h:36 +#: command-list.h:164 +msgid "Show branches and their commits" +msgstr "Visa grenar och deras incheckningar" + +#: command-list.h:165 +msgid "Show packed archive index" +msgstr "Skapa packat arkivindex" + +#: command-list.h:166 +msgid "List references in a local repository" +msgstr "Visa referenser i ett lokalt arkiv" + +#: command-list.h:167 +msgid "Git's i18n setup code for shell scripts" +msgstr "Git:s i18n-startkod för skalskript" + +#: command-list.h:168 +msgid "Common Git shell script setup code" +msgstr "Gemensam skriptstartkod för Git" + +#: command-list.h:169 +msgid "Stash the changes in a dirty working directory away" +msgstr "Spara undan ändringar i en lortig arbetskatalog" + +#: command-list.h:170 +msgid "Add file contents to the staging area" +msgstr "Lägg filinnehållet till indexet" + +#: command-list.h:171 msgid "Show the working tree status" msgstr "Visa status för arbetskatalogen" -#: common-cmds.h:37 +#: command-list.h:172 +msgid "Remove unnecessary whitespace" +msgstr "Ta bort onödiga blanksteg" + +#: command-list.h:173 +msgid "Initialize, update or inspect submodules" +msgstr "Initiera, uppdatera eller inspektera undermoduler" + +#: command-list.h:174 +msgid "Bidirectional operation between a Subversion repository and Git" +msgstr "Dubbelriktad verkan mellan ett Subversion-arkiv och Git" + +#: command-list.h:175 +msgid "Read, modify and delete symbolic refs" +msgstr "Läs, modifiera eller ta bort symbolisk referens" + +#: command-list.h:176 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt" -#: parse-options.h:157 -msgid "expiry-date" -msgstr "giltig-till" +#: command-list.h:177 +msgid "Creates a temporary file with a blob's contents" +msgstr "Skapar temporära filer med innehållet från en blob" -#: parse-options.h:172 -msgid "no-op (backward compatibility)" -msgstr "ingen funktion (bakåtkompatibilitet)" +#: command-list.h:178 +msgid "Unpack objects from a packed archive" +msgstr "Packa upp objekt från ett pakat arkiv" -#: parse-options.h:250 -msgid "be more verbose" -msgstr "var mer pratsam" +#: command-list.h:179 +msgid "Register file contents in the working tree to the index" +msgstr "Registrera filinnehållet från arbetskatalogen i indexet" -#: parse-options.h:252 -msgid "be more quiet" -msgstr "var mer tyst" +#: command-list.h:180 +msgid "Update the object name stored in a ref safely" +msgstr "Uppdatera objektnamnet i en referens på ett säkert sätt" -#: parse-options.h:258 -msgid "use <n> digits to display SHA-1s" -msgstr "använd <n> siffror för att visa SHA-1:or" +#: command-list.h:181 +msgid "Update auxiliary info file to help dumb servers" +msgstr "Uppdatera tilläggsinfofil för att hjälpa dumma servrar" + +#: command-list.h:182 +msgid "Send archive back to git-archive" +msgstr "Sänd arkivet tillbaka till git-archive" + +#: command-list.h:183 +msgid "Send objects packed back to git-fetch-pack" +msgstr "Sänd packade objekt tillbaka till git-fetch-pack" + +#: command-list.h:184 +msgid "Show a Git logical variable" +msgstr "Visa en logisk Git-variabel" + +#: command-list.h:185 +msgid "Check the GPG signature of commits" +msgstr "Kontrollera GPG-signaturer för incheckningar" + +#: command-list.h:186 +msgid "Validate packed Git archive files" +msgstr "Bekräfta packade Git-arkivfiler" + +#: command-list.h:187 +msgid "Check the GPG signature of tags" +msgstr "Kontrollera GPG-signaturer i taggar" + +#: command-list.h:188 +msgid "Git web interface (web frontend to Git repositories)" +msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)" + +#: command-list.h:189 +msgid "Show logs with difference each commit introduces" +msgstr "Visa loggar med differenser varje incheckning introducerar" + +#: command-list.h:190 +msgid "Manage multiple working trees" +msgstr "Hantera ytterligare arbetskataloger" + +#: command-list.h:191 +msgid "Create a tree object from the current index" +msgstr "Skapa ett trädobjekt från aktuellt index" + +#: command-list.h:192 +msgid "Defining attributes per path" +msgstr "Definierar attribut per sökväg" + +#: command-list.h:193 +msgid "Git command-line interface and conventions" +msgstr "Gits kommandoradsgränssnitt och -konventioner" + +#: command-list.h:194 +msgid "A Git core tutorial for developers" +msgstr "Grundläggande Git-handledning för utvecklare" + +#: command-list.h:195 +msgid "Git for CVS users" +msgstr "Git för CVS-användare" + +#: command-list.h:196 +msgid "Tweaking diff output" +msgstr "Justrea diff-utdata" + +#: command-list.h:197 +msgid "A useful minimum set of commands for Everyday Git" +msgstr "Ett användbart minsta uppsättning kommandon för vardags-Git" + +#: command-list.h:198 +msgid "A Git Glossary" +msgstr "En Git-ordlista" + +#: command-list.h:199 +msgid "Hooks used by Git" +msgstr "Krokar som används av Git" + +#: command-list.h:200 +msgid "Specifies intentionally untracked files to ignore" +msgstr "Ange avsiktligen ospårade filer att ignorera" + +#: command-list.h:201 +msgid "Defining submodule properties" +msgstr "Ange egenskaper för undermoduler" + +#: command-list.h:202 +msgid "Git namespaces" +msgstr "Git-namnrymder" + +#: command-list.h:203 +msgid "Git Repository Layout" +msgstr "Gits arkivlayout" + +#: command-list.h:204 +msgid "Specifying revisions and ranges for Git" +msgstr "Ange versioner och intervall i Git" + +#: command-list.h:205 +msgid "A tutorial introduction to Git: part two" +msgstr "Introduktion till Git: del två" + +#: command-list.h:206 +msgid "A tutorial introduction to Git" +msgstr "Introduktion till Git" + +#: command-list.h:207 +msgid "An overview of recommended workflows with Git" +msgstr "Översikt över rekommenderade arbetsflöden med Git" #: rerere.h:40 msgid "update the index with reused conflict resolution if possible" @@ -15223,7 +18038,7 @@ msgstr "Försök enkel sammanslagning med $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning." -#: git-rebase.sh:60 +#: git-rebase.sh:61 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -15237,41 +18052,41 @@ msgstr "" "För att avbryta och återgå till där du var före ombaseringen, kör \"git " "rebase --abort\"." -#: git-rebase.sh:163 git-rebase.sh:409 +#: git-rebase.sh:173 git-rebase.sh:454 #, sh-format msgid "Could not move back to $head_name" msgstr "Kunde inte flytta tillbaka till $head_name" -#: git-rebase.sh:174 +#: git-rebase.sh:184 msgid "Applied autostash." msgstr "Tillämpade autostash." -#: git-rebase.sh:177 +#: git-rebase.sh:187 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Kan inte spara $stash_sha1" -#: git-rebase.sh:218 +#: git-rebase.sh:236 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: git-rebase.sh:223 +#: git-rebase.sh:241 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera." -#: git-rebase.sh:370 +#: git-rebase.sh:415 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: git-rebase.sh:381 +#: git-rebase.sh:426 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering." -#: git-rebase.sh:388 +#: git-rebase.sh:433 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: git-rebase.sh:391 +#: git-rebase.sh:436 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -15279,7 +18094,7 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: git-rebase.sh:435 +#: git-rebase.sh:480 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -15300,75 +18115,91 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där." -#: git-rebase.sh:491 +#: git-rebase.sh:545 +msgid "error: cannot combine '--signoff' with '--preserve-merges'" +msgstr "fel: kan inte kombinera \"--signoff\" med \"--preserve-merges\"" + +#: git-rebase.sh:556 +msgid "error: cannot combine '--preserve_merges' with '--rebase-merges'" +msgstr "fel: kan inte kombinera \"--preserve_merges\" med \"--rebase-merges\"" + +#: git-rebase.sh:562 +msgid "error: cannot combine '--rebase_merges' with '--strategy-option'" +msgstr "fel: kan inte kombinera \"--rebase_merges\" med \"--strategy-option\"" + +#: git-rebase.sh:564 +msgid "error: cannot combine '--rebase_merges' with '--strategy'" +msgstr "fel: kan inte kombinera \"--rebase_merges\" med \"--strategy\"" + +#: git-rebase.sh:590 #, sh-format msgid "invalid upstream '$upstream_name'" msgstr "ogiltig uppström \"$upstream_name\"" -#: git-rebase.sh:515 +#: git-rebase.sh:614 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: mer än en sammanslagningsbas finns" -#: git-rebase.sh:518 git-rebase.sh:522 +#: git-rebase.sh:617 git-rebase.sh:621 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ingen sammanslagningsbas finns" -#: git-rebase.sh:527 +#: git-rebase.sh:626 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Peka på en giltig incheckning: $onto_name" -#: git-rebase.sh:553 +#: git-rebase.sh:652 #, sh-format msgid "fatal: no such branch/commit '$branch_name'" msgstr "ödesdigert: ingen sådan gren/incheckning: $branch_name" -#: git-rebase.sh:586 +#: git-rebase.sh:685 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: git-rebase.sh:591 +#: git-rebase.sh:690 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Skapade autostash: $stash_abbrev" -#: git-rebase.sh:595 +#: git-rebase.sh:694 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: git-rebase.sh:618 +#: git-rebase.sh:717 #, sh-format msgid "HEAD is up to date." msgstr "HEAD är à jour." -#: git-rebase.sh:620 +#: git-rebase.sh:719 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktuell gren $branch_name är à jour." -#: git-rebase.sh:628 +#: git-rebase.sh:727 #, sh-format msgid "HEAD is up to date, rebase forced." msgstr "HEAD är à jour, ombasering framtvingad." -#: git-rebase.sh:630 +#: git-rebase.sh:729 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad." -#: git-rebase.sh:642 +#: git-rebase.sh:741 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Ändringar från $mb till $onto:" -#: git-rebase.sh:651 +#: git-rebase.sh:750 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..." -#: git-rebase.sh:661 +#: git-rebase.sh:760 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Snabbspolade $branch_name till $onto_name." @@ -15436,109 +18267,109 @@ msgstr "Kan inte spara aktuell status" msgid "Saved working directory and index state $stash_msg" msgstr "Sparade arbetskatalogen och indexstatus $stash_msg" -#: git-stash.sh:340 +#: git-stash.sh:342 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: git-stash.sh:488 +#: git-stash.sh:490 #, sh-format msgid "unknown option: $opt" msgstr "okänd flagga: $opt" -#: git-stash.sh:501 +#: git-stash.sh:503 msgid "No stash entries found." msgstr "Inga \"stash”-poster hittades." -#: git-stash.sh:508 +#: git-stash.sh:510 #, sh-format msgid "Too many revisions specified: $REV" msgstr "För många revisioner angivna: $REV" -#: git-stash.sh:523 +#: git-stash.sh:525 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference är inte en giltig referens" -#: git-stash.sh:551 +#: git-stash.sh:553 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "\"$args\" är inte en \"stash\"-liknande incheckning" -#: git-stash.sh:562 +#: git-stash.sh:564 #, sh-format msgid "'$args' is not a stash reference" msgstr "\"$args\" är inte en \"stash\"-referens" -#: git-stash.sh:570 +#: git-stash.sh:572 msgid "unable to refresh index" msgstr "kan inte uppdatera indexet" -#: git-stash.sh:574 +#: git-stash.sh:576 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:582 +#: git-stash.sh:584 msgid "Conflicts in index. Try without --index." msgstr "Konflikter i indexet. Testa utan --index." -#: git-stash.sh:584 +#: git-stash.sh:586 msgid "Could not save index tree" msgstr "Kunde inte spara indexträd" -#: git-stash.sh:593 +#: git-stash.sh:595 msgid "Could not restore untracked files from stash entry" msgstr "Kunde inte återställa ospårade filer från stash-post" -#: git-stash.sh:618 +#: git-stash.sh:620 msgid "Cannot unstage modified files" msgstr "Kan inte ta bort ändrade filer ur kön" -#: git-stash.sh:633 +#: git-stash.sh:635 msgid "Index was not unstashed." msgstr "Indexet har inte tagits ur kön." -#: git-stash.sh:647 +#: git-stash.sh:649 msgid "The stash entry is kept in case you need it again." msgstr "Stash-posten behålls ifall du behöver den igen." -#: git-stash.sh:656 +#: git-stash.sh:658 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Kastade ${REV} ($s)" -#: git-stash.sh:657 +#: git-stash.sh:659 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-stash.sh:665 +#: git-stash.sh:667 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: git-stash.sh:744 +#: git-stash.sh:746 msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" -#: git-submodule.sh:181 +#: git-submodule.sh:188 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:191 +#: git-submodule.sh:198 #, 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:210 +#: git-submodule.sh:217 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:213 +#: git-submodule.sh:220 #, 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:219 +#: git-submodule.sh:226 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -15549,22 +18380,22 @@ msgstr "" "$sm_path\n" "Använd -f om du verkligen vill lägga till den." -#: git-submodule.sh:237 +#: git-submodule.sh:249 #, 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:239 +#: git-submodule.sh:251 #, 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:247 +#: git-submodule.sh:259 #, 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:249 +#: git-submodule.sh:261 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -15582,48 +18413,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:255 +#: git-submodule.sh:267 #, 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:267 +#: git-submodule.sh:279 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:272 +#: git-submodule.sh:284 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:281 +#: git-submodule.sh:293 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:342 -#, sh-format -msgid "Entering '$displaypath'" -msgstr "Går in i \"$displaypath\"" - -#: git-submodule.sh:362 -#, sh-format -msgid "Stopping at '$displaypath'; script returned non-zero status." -msgstr "" -"Stoppar på \"$displaypath\"; skriptet returnerade en status skild från noll." - -#: git-submodule.sh:584 +#: git-submodule.sh:565 #, 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:594 +#: git-submodule.sh:575 #, 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:599 +#: git-submodule.sh:580 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -15632,12 +18452,12 @@ msgstr "" "Kan inte hitta aktuell revision för ${remote_name}/${branch} i " "undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:617 +#: git-submodule.sh:603 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\"" -#: git-submodule.sh:623 +#: git-submodule.sh:609 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -15646,72 +18466,72 @@ msgstr "" "Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. " "Direkt hämtning av incheckningen misslyckades." -#: git-submodule.sh:630 +#: git-submodule.sh:616 #, 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:631 +#: git-submodule.sh:617 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:635 +#: git-submodule.sh:621 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:636 +#: git-submodule.sh:622 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:641 +#: git-submodule.sh:627 #, 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:642 +#: git-submodule.sh:628 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:647 +#: git-submodule.sh:633 #, 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:648 +#: git-submodule.sh:634 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" -#: git-submodule.sh:679 +#: git-submodule.sh:665 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:775 +#: git-submodule.sh:761 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" -#: git-submodule.sh:827 +#: git-submodule.sh:813 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:847 +#: git-submodule.sh:833 #, 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:850 +#: git-submodule.sh:836 #, 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:853 +#: git-submodule.sh:839 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -15723,38 +18543,48 @@ msgstr "" msgid "See git-${cmd}(1) for details." msgstr "Se git-${cmd}(1) för detaljer." -#: git-rebase--interactive.sh:140 -#, sh-format -msgid "Rebasing ($new_count/$total)" -msgstr "Ombaserar ($new_count/$total)" - -#: git-rebase--interactive.sh:156 +#: git-rebase--interactive.sh:43 msgid "" "\n" "Commands:\n" -"p, pick = use commit\n" -"r, reword = use commit, but edit the commit message\n" -"e, edit = use commit, but stop for amending\n" -"s, squash = use commit, but meld into previous commit\n" -"f, fixup = like \"squash\", but discard this commit's log message\n" -"x, exec = run command (the rest of the line) using shell\n" -"d, drop = remove commit\n" +"p, pick <commit> = use commit\n" +"r, reword <commit> = use commit, but edit the commit message\n" +"e, edit <commit> = use commit, but stop for amending\n" +"s, squash <commit> = use commit, but meld into previous commit\n" +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"x, exec <command> = run command (the rest of the line) using shell\n" +"d, drop <commit> = remove commit\n" +"l, label <label> = label current HEAD with a name\n" +"t, reset <label> = reset HEAD to a label\n" +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +". create a merge commit using the original merge commit's\n" +". message (or the oneline, if no original merge commit was\n" +". specified). Use -c <commit> to reword the commit message.\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" "\n" "Kommandon:\n" -"p, pick = använd incheckning\n" -"r, reword = använd incheckning, men redigera incheckningsmeddelandet\n" -"e, edit = använd incheckning, men stanna för tillägg\n" -"s, squash = använd incheckning, men infoga i föregående incheckning\n" -"f, fixup = som \"squash\", men förkasta incheckningsmeddelandet\n" -"x, exec = kör kommando (resten av raden) i skalet\n" -"d, drop = ta bort incheckning\n" +"p, pick <incheckning> = använd incheckning\n" +"r, reword <incheckning> = använd incheckning, men redigera " +"incheckningsmeddelandet\n" +"e, edit <incheckning> = använd incheckning, men stanna för tillägg\n" +"s, squash <incheckning> = använd incheckning, men infoga i föregående " +"incheckning\n" +"f, fixup <incheckning> = som \"squash\", men förkasta " +"incheckningsmeddelandet\n" +"x, exec <kommando> = kör kommando (resten av raden) i skalet\n" +"d, drop <incheckning> = ta bort incheckning\n" +"l, label <etikett> = ge aktuellt HEAD ett namn\n" +"t, reset <etikett> = återställ HEAD till en etikett\n" +"m, merge [-C <incheckning> | -c <incheckning>] <etikett> [# <enrads>]\n" +". skapa en sammanslagning med ursprungligt meddelande (eller\n" +". enrads, om inget incheckningsmeddelande angavs). Använd\n" +". -v <incheckning> för att skriva om meddelandet.\n" "\n" "Du kan byta ordning på raderna; de utförs uppifrån och ned.\n" -#: git-rebase--interactive.sh:171 +#: git-rebase--interactive.sh:64 git-rebase--preserve-merges.sh:173 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -15763,7 +18593,7 @@ msgstr "" "Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en " "incheckning.\n" -#: git-rebase--interactive.sh:175 +#: git-rebase--interactive.sh:68 git-rebase--preserve-merges.sh:177 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -15771,7 +18601,121 @@ msgstr "" "\n" "Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n" -#: git-rebase--interactive.sh:213 +#: git-rebase--interactive.sh:108 git-rebase--preserve-merges.sh:724 +msgid "could not detach HEAD" +msgstr "kunde inte koppla från HEAD" + +#: git-rebase--interactive.sh:147 git-rebase--preserve-merges.sh:816 +msgid "" +"\n" +"You are editing the todo file of an ongoing interactive rebase.\n" +"To continue rebase after editing, run:\n" +" git rebase --continue\n" +"\n" +msgstr "" +"\n" +"Du redigerar \"todo\"-filen för en pågående interaktiv ombasering.\n" +"För att forsätta ombasera efter redigeringen, kör:\n" +" git rebase --continue\n" +"\n" + +#: git-rebase--interactive.sh:155 git-rebase--interactive.sh:241 +#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910 +msgid "Could not execute editor" +msgstr "Kunde inte starta textredigerare" + +#: git-rebase--interactive.sh:176 git-rebase--preserve-merges.sh:845 +#, sh-format +msgid "Could not checkout $switch_to" +msgstr "Kunde inte checka ut $switch_to" + +#: git-rebase--interactive.sh:183 git-rebase--preserve-merges.sh:852 +msgid "No HEAD?" +msgstr "Inget HEAD?" + +#: git-rebase--interactive.sh:184 git-rebase--preserve-merges.sh:853 +#, sh-format +msgid "Could not create temporary $state_dir" +msgstr "Kunde inte skapa temporär $state_dir" + +#: git-rebase--interactive.sh:187 git-rebase--preserve-merges.sh:856 +msgid "Could not mark as interactive" +msgstr "Kunde inte markera som interaktiv" + +#: git-rebase--interactive.sh:219 git-rebase--preserve-merges.sh:888 +#, sh-format +msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" +msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" +msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)" +msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)" + +#: git-rebase--interactive.sh:224 +msgid "" +"\n" +"\tHowever, if you remove everything, the rebase will be aborted.\n" +"\n" +"\t" +msgstr "" +"\n" +"\tOmbaseringen kommer dock att avbrytas om du tar bort allting.\n" +"\n" +"\t" + +#: git-rebase--interactive.sh:231 git-rebase--preserve-merges.sh:900 +msgid "Note that empty commits are commented out" +msgstr "Observera att tomma incheckningar är utkommenterade" + +#: git-rebase--interactive.sh:280 +msgid "Could not generate todo list" +msgstr "Kunde inte skapa todo-lista" + +#: git-rebase--preserve-merges.sh:136 +#, sh-format +msgid "Rebasing ($new_count/$total)" +msgstr "Ombaserar ($new_count/$total)" + +#: git-rebase--preserve-merges.sh:152 +msgid "" +"\n" +"Commands:\n" +"p, pick <commit> = use commit\n" +"r, reword <commit> = use commit, but edit the commit message\n" +"e, edit <commit> = use commit, but stop for amending\n" +"s, squash <commit> = use commit, but meld into previous commit\n" +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"x, exec <commit> = run command (the rest of the line) using shell\n" +"d, drop <commit> = remove commit\n" +"l, label <label> = label current HEAD with a name\n" +"t, reset <label> = reset HEAD to a label\n" +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +". create a merge commit using the original merge commit's\n" +". message (or the oneline, if no original merge commit was\n" +". specified). Use -c <commit> to reword the commit message.\n" +"\n" +"These lines can be re-ordered; they are executed from top to bottom.\n" +msgstr "" +"\n" +"Kommandon:\n" +"p, pick <incheckning> = använd incheckning\n" +"r, reword <incheckning> = använd incheckning, men redigera " +"incheckningsmeddelandet\n" +"e, edit <incheckning> = använd incheckning, men stanna för tillägg\n" +"s, squash <incheckning> = använd incheckning, men infoga i föregående " +"incheckning\n" +"f, fixup <incheckning> = som \"squash\", men förkasta " +"incheckningsmeddelandet\n" +"x, exec <incheckning> = kör kommando (resten av raden) i skalet\n" +"d, drop <incheckning> = ta bort incheckning\n" +"l, label <etikett> = ge aktuellt HEAD ett namn\n" +"t, reset <etikett> = återställ HEAD till en etikett\n" +"m, merge [-C <incheckning> | -c <incheckning>] <etikett> [# <enrads>]\n" +". skapa en sammanslagning med ursprungligt meddelande (eller\n" +". enrads, om inget incheckningsmeddelande angavs). Använd\n" +". -v <incheckning> för att skriva om meddelandet.\n" +"\n" +"Du kan byta ordning på raderna; de utförs uppifrån och ned.\n" + +#: git-rebase--preserve-merges.sh:215 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -15790,83 +18734,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:238 +#: git-rebase--preserve-merges.sh:240 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: inte en incheckning som kan väljas" -#: git-rebase--interactive.sh:277 +#: git-rebase--preserve-merges.sh:279 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Felaktigt incheckningsnamn: $sha1" -#: git-rebase--interactive.sh:319 +#: git-rebase--preserve-merges.sh:309 msgid "Cannot write current commit's replacement sha1" msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning" -#: git-rebase--interactive.sh:371 +#: git-rebase--preserve-merges.sh:360 #, sh-format msgid "Fast-forward to $sha1" msgstr "Snabbspolade till $sha1" -#: git-rebase--interactive.sh:373 +#: git-rebase--preserve-merges.sh:362 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Kan inte snabbspola till $sha1" -#: git-rebase--interactive.sh:382 +#: git-rebase--preserve-merges.sh:371 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Kan inte flytta HEAD till $first_parent" -#: git-rebase--interactive.sh:387 +#: git-rebase--preserve-merges.sh:376 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1" -#: git-rebase--interactive.sh:405 +#: git-rebase--preserve-merges.sh:394 #, sh-format msgid "Error redoing merge $sha1" msgstr "Fel när sammanslagningen $sha1 skulle göras om" -#: git-rebase--interactive.sh:414 +#: git-rebase--preserve-merges.sh:403 #, sh-format msgid "Could not pick $sha1" msgstr "Kunde inte välja $sha1" -#: git-rebase--interactive.sh:423 +#: git-rebase--preserve-merges.sh:412 #, sh-format msgid "This is the commit message #${n}:" msgstr "Det här är incheckningsmeddelande ${n}:" -#: git-rebase--interactive.sh:428 +#: git-rebase--preserve-merges.sh:417 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Incheckningsmeddelande ${n} kommer hoppas över:" -#: git-rebase--interactive.sh:439 +#: git-rebase--preserve-merges.sh:428 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Det här är en kombination av $count incheckning." msgstr[1] "Det här är en kombination av $count incheckningar." -#: git-rebase--interactive.sh:448 +#: git-rebase--preserve-merges.sh:437 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Kan inte skriva $fixup_msg" -#: git-rebase--interactive.sh:451 +#: git-rebase--preserve-merges.sh:440 msgid "This is a combination of 2 commits." msgstr "Det här är en kombination av 2 incheckningar." -#: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535 -#: git-rebase--interactive.sh:538 +#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524 +#: git-rebase--preserve-merges.sh:527 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Kunde inte tillämpa $sha1... $rest" -#: git-rebase--interactive.sh:567 +#: git-rebase--preserve-merges.sh:556 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -15880,31 +18824,31 @@ msgstr "" "pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n" "du måste lösa problemet innan du kan skriva om incheckningsmeddelandet." -#: git-rebase--interactive.sh:582 +#: git-rebase--preserve-merges.sh:571 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Stoppade på $sha1_abbrev... $rest" -#: git-rebase--interactive.sh:597 +#: git-rebase--preserve-merges.sh:586 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning" -#: git-rebase--interactive.sh:639 +#: git-rebase--preserve-merges.sh:628 #, sh-format msgid "Executing: $rest" msgstr "Kör: $rest" -#: git-rebase--interactive.sh:647 +#: git-rebase--preserve-merges.sh:636 #, sh-format msgid "Execution failed: $rest" msgstr "Körning misslyckades: $rest" -#: git-rebase--interactive.sh:649 +#: git-rebase--preserve-merges.sh:638 msgid "and made changes to the index and/or the working tree" msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen" -#: git-rebase--interactive.sh:651 +#: git-rebase--preserve-merges.sh:640 msgid "" "You can fix the problem, and then run\n" "\n" @@ -15915,7 +18859,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:664 +#: git-rebase--preserve-merges.sh:653 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -15930,29 +18874,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:675 +#: git-rebase--preserve-merges.sh:664 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Okänt kommando: $command $sha1 $rest" -#: git-rebase--interactive.sh:676 +#: git-rebase--preserve-merges.sh:665 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Rätta det med \"git rebase --edit-todo\"." -#: git-rebase--interactive.sh:711 +#: git-rebase--preserve-merges.sh:700 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Lyckades ombasera och uppdatera $head_name." -#: git-rebase--interactive.sh:735 -msgid "could not detach HEAD" -msgstr "kunde inte koppla från HEAD" - -#: git-rebase--interactive.sh:771 +#: git-rebase--preserve-merges.sh:757 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Kunde inte ta bort CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:776 +#: git-rebase--preserve-merges.sh:762 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -15983,11 +18923,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:793 +#: git-rebase--preserve-merges.sh:779 msgid "Error trying to find the author identity to amend commit" msgstr "Fel vid försök att hitta författaridentitet för att utöka incheckning" -#: git-rebase--interactive.sh:798 +#: git-rebase--preserve-merges.sh:784 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -15995,62 +18935,11 @@ msgstr "" "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" "först och kör sedan \"git rebase --continute\" igen." -#: git-rebase--interactive.sh:803 git-rebase--interactive.sh:807 +#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793 msgid "Could not commit staged changes." msgstr "Kunde inte checka in köade ändringar." -#: git-rebase--interactive.sh:836 -msgid "" -"\n" -"You are editing the todo file of an ongoing interactive rebase.\n" -"To continue rebase after editing, run:\n" -" git rebase --continue\n" -"\n" -msgstr "" -"\n" -"Du redigerar \"todo\"-filen för en pågående interaktiv ombasering.\n" -"För att forsätta ombasera efter redigeringen, kör:\n" -" git rebase --continue\n" -"\n" - -#: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008 -msgid "Could not execute editor" -msgstr "Kunde inte starta textredigerare" - -#: git-rebase--interactive.sh:860 -#, sh-format -msgid "Could not checkout $switch_to" -msgstr "Kunde inte checka ut $switch_to" - -#: git-rebase--interactive.sh:865 -msgid "No HEAD?" -msgstr "Inget HEAD?" - -#: git-rebase--interactive.sh:866 -#, sh-format -msgid "Could not create temporary $state_dir" -msgstr "Kunde inte skapa temporär $state_dir" - -#: git-rebase--interactive.sh:869 -msgid "Could not mark as interactive" -msgstr "Kunde inte markera som interaktiv" - -#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884 -msgid "Could not init rewritten commits" -msgstr "Kunde inte initiera omskrivna incheckningar" - -#: git-rebase--interactive.sh:910 -msgid "Could not generate todo list" -msgstr "Kunde inte skapa todo-lista" - -#: git-rebase--interactive.sh:986 -#, sh-format -msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" -msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" -msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)" -msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)" - -#: git-rebase--interactive.sh:991 +#: git-rebase--preserve-merges.sh:893 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -16060,9 +18949,9 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: git-rebase--interactive.sh:998 -msgid "Note that empty commits are commented out" -msgstr "Observera att tomma incheckningar är utkommenterade" +#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947 +msgid "Could not init rewritten commits" +msgstr "Kunde inte initiera omskrivna incheckningar" #: git-sh-setup.sh:89 git-sh-setup.sh:94 #, sh-format @@ -16138,68 +19027,68 @@ msgstr "köad" msgid "unstaged" msgstr "ej köad" -#: git-add--interactive.perl:246 git-add--interactive.perl:271 +#: git-add--interactive.perl:253 git-add--interactive.perl:278 msgid "binary" msgstr "binär" -#: git-add--interactive.perl:255 git-add--interactive.perl:309 +#: git-add--interactive.perl:262 git-add--interactive.perl:316 msgid "nothing" msgstr "ingenting" -#: git-add--interactive.perl:291 git-add--interactive.perl:306 +#: git-add--interactive.perl:298 git-add--interactive.perl:313 msgid "unchanged" msgstr "oändrad" -#: git-add--interactive.perl:602 +#: git-add--interactive.perl:609 #, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "lade till %d sökväg\n" msgstr[1] "lade till %d sökvägar\n" -#: git-add--interactive.perl:605 +#: git-add--interactive.perl:612 #, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "uppdaterade %d sökväg\n" msgstr[1] "uppdaterade %d sökvägar\n" -#: git-add--interactive.perl:608 +#: git-add--interactive.perl:615 #, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "återställde %d sökväg\n" msgstr[1] "återställde %d sökvägar\n" -#: git-add--interactive.perl:611 +#: git-add--interactive.perl:618 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "rörde %d sökväg\n" msgstr[1] "rörde %d sökvägar\n" -#: git-add--interactive.perl:620 +#: git-add--interactive.perl:627 msgid "Update" msgstr "Uppdatera" -#: git-add--interactive.perl:632 +#: git-add--interactive.perl:639 msgid "Revert" msgstr "Återställ" -#: git-add--interactive.perl:655 +#: git-add--interactive.perl:662 #, perl-format msgid "note: %s is untracked now.\n" msgstr "observera: %s spåras inte längre.\n" -#: git-add--interactive.perl:666 +#: git-add--interactive.perl:673 msgid "Add untracked" msgstr "Lägg till ospårad" -#: git-add--interactive.perl:672 +#: git-add--interactive.perl:679 msgid "No untracked files.\n" msgstr "Inga ospårade filer.\n" -#: git-add--interactive.perl:1026 +#: git-add--interactive.perl:1033 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -16207,7 +19096,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "köas omedelbart." -#: git-add--interactive.perl:1029 +#: git-add--interactive.perl:1036 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -16215,7 +19104,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "läggas till i \"stash\" omedelbart." -#: git-add--interactive.perl:1032 +#: git-add--interactive.perl:1039 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -16223,7 +19112,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "tas bort från kön omedelbart." -#: git-add--interactive.perl:1035 git-add--interactive.perl:1044 +#: git-add--interactive.perl:1042 git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -16231,7 +19120,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "markeras för applicering omedelbart." -#: git-add--interactive.perl:1038 git-add--interactive.perl:1041 +#: git-add--interactive.perl:1045 git-add--interactive.perl:1048 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -16239,16 +19128,16 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "markeras för kasta omedelbart." -#: git-add--interactive.perl:1078 +#: git-add--interactive.perl:1085 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s" -#: git-add--interactive.perl:1079 +#: git-add--interactive.perl:1086 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n" -#: git-add--interactive.perl:1085 +#: git-add--interactive.perl:1092 #, perl-format msgid "" "---\n" @@ -16262,7 +19151,7 @@ msgstr "" "Rader som börjar med %s kommer att tas bort.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1093 +#: git-add--interactive.perl:1100 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -16272,7 +19161,7 @@ msgstr "" "redigera den igen. Om alla rader i ett stycke tas bort avbryts\n" "redigeringen och stycket lämnas oförändrat.\n" -#: git-add--interactive.perl:1107 +#: git-add--interactive.perl:1114 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s" @@ -16283,14 +19172,14 @@ msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: git-add--interactive.perl:1206 +#: git-add--interactive.perl:1213 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) " "[y/n]? " -#: git-add--interactive.perl:1215 +#: git-add--interactive.perl:1222 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -16304,7 +19193,7 @@ msgstr "" "a - köa stycket och alla följande i filen\n" "d - köa inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1221 +#: git-add--interactive.perl:1228 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -16318,7 +19207,7 @@ msgstr "" "a - \"stash\":a stycket och alla följande i filen\n" "d - \"stash\":a inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1227 +#: git-add--interactive.perl:1234 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -16332,7 +19221,7 @@ msgstr "" "a - ta bort stycket och alla följande i filen från kön\n" "d - ta inte bort stycket eller något av de följande i filen från kön" -#: git-add--interactive.perl:1233 +#: git-add--interactive.perl:1240 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -16346,7 +19235,7 @@ msgstr "" "a - applicera stycket och alla följande i filen\n" "d - applicera inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1239 +#: git-add--interactive.perl:1246 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -16360,7 +19249,7 @@ msgstr "" "a - förkasta stycket och alla följande i filen\n" "d - förkasta inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1245 +#: git-add--interactive.perl:1252 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -16374,7 +19263,7 @@ msgstr "" "a - förkasta stycket och alla följande i filen\n" "d - förkasta inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1251 +#: git-add--interactive.perl:1258 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -16388,7 +19277,7 @@ msgstr "" "a - applicera stycket och alla följande i filen\n" "d - applicera inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1266 +#: git-add--interactive.perl:1273 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -16410,211 +19299,211 @@ msgstr "" "e - redigera aktuellt stycke manuellt\n" "? - visa hjälp\n" -#: git-add--interactive.perl:1297 +#: git-add--interactive.perl:1304 msgid "The selected hunks do not apply to the index!\n" msgstr "Markerade stycken kan inte appliceras på indexet!\n" -#: git-add--interactive.perl:1298 +#: git-add--interactive.perl:1305 msgid "Apply them to the worktree anyway? " msgstr "Applicera dem på arbetskatalogen trots det? " -#: git-add--interactive.perl:1301 +#: git-add--interactive.perl:1308 msgid "Nothing was applied.\n" msgstr "Ingenting applicerades.\n" -#: git-add--interactive.perl:1312 +#: git-add--interactive.perl:1319 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorerar ej sammanslagen: %s\n" -#: git-add--interactive.perl:1321 +#: git-add--interactive.perl:1328 msgid "Only binary files changed.\n" msgstr "Endast binära filer ändrade.\n" -#: git-add--interactive.perl:1323 +#: git-add--interactive.perl:1330 msgid "No changes.\n" msgstr "Inga ändringar.\n" -#: git-add--interactive.perl:1331 +#: git-add--interactive.perl:1338 msgid "Patch update" msgstr "Uppdatera patch" -#: git-add--interactive.perl:1383 +#: git-add--interactive.perl:1390 #, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1384 +#: git-add--interactive.perl:1391 #, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Köa borttagning [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1385 +#: git-add--interactive.perl:1392 #, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Köa stycket [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1388 +#: git-add--interactive.perl:1395 #, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1389 +#: git-add--interactive.perl:1396 #, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1390 +#: git-add--interactive.perl:1397 #, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Stash:a stycket [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1393 +#: git-add--interactive.perl:1400 #, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Ta bort ändrat läge från kön [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1394 +#: git-add--interactive.perl:1401 #, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Ta bort borttagning från kön [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1395 +#: git-add--interactive.perl:1402 #, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Ta bort stycket från kön [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1398 +#: git-add--interactive.perl:1405 #, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "Applicera ändrat läge på indexet [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1399 +#: git-add--interactive.perl:1406 #, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Applicera borttagning på indexet [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1400 +#: git-add--interactive.perl:1407 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Applicera stycket på indexet [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1403 +#: git-add--interactive.perl:1410 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1404 +#: git-add--interactive.perl:1411 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1405 +#: git-add--interactive.perl:1412 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1408 +#: git-add--interactive.perl:1415 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1409 +#: git-add--interactive.perl:1416 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1410 +#: git-add--interactive.perl:1417 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1413 +#: git-add--interactive.perl:1420 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1414 +#: git-add--interactive.perl:1421 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1415 +#: git-add--interactive.perl:1422 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1515 +#: git-add--interactive.perl:1522 msgid "No other hunks to goto\n" msgstr "Inga andra stycken att gå till\n" -#: git-add--interactive.perl:1522 +#: git-add--interactive.perl:1529 msgid "go to which hunk (<ret> to see more)? " msgstr "gå till vilket stycke (<ret> för att se fler)? " -#: git-add--interactive.perl:1524 +#: git-add--interactive.perl:1531 msgid "go to which hunk? " msgstr "gå till vilket stycke? " -#: git-add--interactive.perl:1533 +#: git-add--interactive.perl:1540 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Ogiltigt siffervärde: \"%s\"\n" -#: git-add--interactive.perl:1538 +#: git-add--interactive.perl:1545 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Beklagar, det finns bara %d stycke.\n" msgstr[1] "Beklagar, det finns bara %d stycken.\n" -#: git-add--interactive.perl:1564 +#: git-add--interactive.perl:1571 msgid "No other hunks to search\n" msgstr "Inga andra stycken att söka efter\n" -#: git-add--interactive.perl:1568 +#: git-add--interactive.perl:1575 msgid "search for regex? " msgstr "sök efter reguljärt uttryck? " -#: git-add--interactive.perl:1581 +#: git-add--interactive.perl:1588 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1598 msgid "No hunk matches the given pattern\n" msgstr "Inga stycken motsvarar givet mönster\n" -#: git-add--interactive.perl:1603 git-add--interactive.perl:1625 +#: git-add--interactive.perl:1610 git-add--interactive.perl:1632 msgid "No previous hunk\n" msgstr "Inget föregående stycke\n" -#: git-add--interactive.perl:1612 git-add--interactive.perl:1631 +#: git-add--interactive.perl:1619 git-add--interactive.perl:1638 msgid "No next hunk\n" msgstr "Inget följande stycke\n" -#: git-add--interactive.perl:1637 +#: git-add--interactive.perl:1644 msgid "Sorry, cannot split this hunk\n" msgstr "Beklagar, kan inte dela stycket\n" -#: git-add--interactive.perl:1643 +#: git-add--interactive.perl:1650 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Dela i %d stycke.\n" msgstr[1] "Dela i %d stycken.\n" -#: git-add--interactive.perl:1653 +#: git-add--interactive.perl:1660 msgid "Sorry, cannot edit this hunk\n" msgstr "Beklagar, kan inte redigera stycket\n" -#: git-add--interactive.perl:1699 +#: git-add--interactive.perl:1706 msgid "Review diff" msgstr "Granska diff" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1718 +#: git-add--interactive.perl:1725 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -16631,18 +19520,18 @@ msgstr "" "diff - visa diff mellan HEAD och index\n" "add untracked - lägg till innehåll i ospårade filer till köade ändringar\n" -#: git-add--interactive.perl:1735 git-add--interactive.perl:1740 -#: git-add--interactive.perl:1743 git-add--interactive.perl:1750 -#: git-add--interactive.perl:1754 git-add--interactive.perl:1760 +#: git-add--interactive.perl:1742 git-add--interactive.perl:1747 +#: git-add--interactive.perl:1750 git-add--interactive.perl:1757 +#: git-add--interactive.perl:1761 git-add--interactive.perl:1767 msgid "missing --" msgstr "saknad --" -#: git-add--interactive.perl:1756 +#: git-add--interactive.perl:1763 #, perl-format msgid "unknown --patch mode: %s" msgstr "okänt läge för --patch: %s" -#: git-add--interactive.perl:1762 git-add--interactive.perl:1768 +#: git-add--interactive.perl:1769 git-add--interactive.perl:1775 #, perl-format msgid "invalid argument %s, expecting --" msgstr "felaktigt argument %s, förväntar --" @@ -16855,7 +19744,7 @@ msgstr "Vad vill du göra med adressen? (q=avsluta, d=kasta, e=redigera): " msgid "CA path \"%s\" does not exist" msgstr "CA-sökvägen \"%s\" finns inte" -#: git-send-email.perl:1395 +#: git-send-email.perl:1400 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -16879,127 +19768,127 @@ msgstr "" " meddelande, kör \"git config --global sendemail.confirm auto\".\n" "\n" -#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your +#. 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:1410 -msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " -msgstr "Sända brevet? (y=ja, n=nej, q=avsluta, a=alla): " +#: git-send-email.perl:1415 +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:1413 +#: git-send-email.perl:1418 msgid "Send this email reply required" msgstr "Svar krävs på frågan \"Sända brevet?\"" -#: git-send-email.perl:1439 +#: git-send-email.perl:1446 msgid "The required SMTP server is not properly defined." msgstr "Nödvändig SMTP-server har inte angivits korrekt." -#: git-send-email.perl:1486 +#: git-send-email.perl:1493 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Servern stöder inte SMARTTLS! %s" -#: git-send-email.perl:1491 git-send-email.perl:1495 +#: git-send-email.perl:1498 git-send-email.perl:1502 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS misslyckades! %s" -#: git-send-email.perl:1505 +#: git-send-email.perl:1511 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:1523 +#: git-send-email.perl:1529 #, perl-format msgid "Failed to send %s\n" msgstr "Misslyckades sända %s\n" -#: git-send-email.perl:1526 +#: git-send-email.perl:1532 #, perl-format msgid "Dry-Sent %s\n" msgstr "Test-Sände %s\n" -#: git-send-email.perl:1526 +#: git-send-email.perl:1532 #, perl-format msgid "Sent %s\n" msgstr "Sände %s\n" -#: git-send-email.perl:1528 +#: git-send-email.perl:1534 msgid "Dry-OK. Log says:\n" msgstr "Test-OK. Loggen säger:\n" -#: git-send-email.perl:1528 +#: git-send-email.perl:1534 msgid "OK. Log says:\n" msgstr "OK. Loggen säger:\n" -#: git-send-email.perl:1540 +#: git-send-email.perl:1546 msgid "Result: " msgstr "Resultat: " -#: git-send-email.perl:1543 +#: git-send-email.perl:1549 msgid "Result: OK\n" msgstr "Resultat: OK\n" -#: git-send-email.perl:1556 +#: git-send-email.perl:1567 #, perl-format msgid "can't open file %s" msgstr "kan inte öppna filen %s" -#: git-send-email.perl:1603 git-send-email.perl:1623 +#: git-send-email.perl:1614 git-send-email.perl:1634 #, 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:1609 +#: git-send-email.perl:1620 #, 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:1657 +#: git-send-email.perl:1673 #, 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:1682 +#: git-send-email.perl:1698 #, 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:1788 +#: git-send-email.perl:1809 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Kunde inte köra \"%s\"" -#: git-send-email.perl:1795 +#: git-send-email.perl:1816 #, 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:1799 +#: git-send-email.perl:1820 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) misslyckades stänga röret till \"%s\"" -#: git-send-email.perl:1826 +#: git-send-email.perl:1850 msgid "cannot send message as 7bit" msgstr "kan inte sända brev som sjubitars" -#: git-send-email.perl:1834 +#: git-send-email.perl:1858 msgid "invalid transfer encoding" msgstr "ogiltig överföringskondning" -#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933 +#: git-send-email.perl:1899 git-send-email.perl:1951 git-send-email.perl:1961 #, perl-format msgid "unable to open %s: %s\n" msgstr "kunde inte öppna %s: %s\n" -#: git-send-email.perl:1875 +#: git-send-email.perl:1902 #, 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:1891 +#: git-send-email.perl:1919 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" @@ -17007,11 +19896,64 @@ msgstr "" "säkerhetskopior.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1895 +#: git-send-email.perl:1923 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "Dirty index: cannot merge (dirty: %s)" +#~ msgstr "Smutsigt index: kan inte slå ihop (smutsiga: %s)" + +#~ msgid "(+/-)x" +#~ msgstr "(+/-)x" + +#~ msgid "<command>" +#~ msgstr "<kommando>" + +#~ msgid "push|fetch" +#~ msgstr "push|fetch" + +#~ msgid "w[,i1[,i2]]" +#~ msgstr "w[,i1[,i2]]" + +#~ msgid "Entering '$displaypath'" +#~ msgstr "Går in i \"$displaypath\"" + +#~ msgid "Stopping at '$displaypath'; script returned non-zero status." +#~ msgstr "" +#~ "Stoppar på \"$displaypath\"; skriptet returnerade en status skild från " +#~ "noll." + +#~ msgid "Everyday Git With 20 Commands Or So" +#~ msgstr "Git för dagligt bruk i ungefär 20 kommandon" + +#~ msgid "Could not open '%s' for writing" +#~ msgstr "Kunde inte öppna \"%s\" för skrivning" + +#~ msgid "" +#~ "unexpected 1st line of squash message:\n" +#~ "\n" +#~ "\t%.*s" +#~ msgstr "" +#~ "oväntad första rad i squash-meddelande:\n" +#~ "\n" +#~ "\t%.*s" + +#~ msgid "" +#~ "invalid 1st line of squash message:\n" +#~ "\n" +#~ "\t%.*s" +#~ msgstr "" +#~ "ogiltig första rad i squash-meddelande:\n" +#~ "\n" +#~ "\t%.*s" + +#~ msgid "BUG: returned path string doesn't match cwd?" +#~ msgstr "BUG: returnerad sökvägssträng matchar inte cwd?" + +#~ msgid "Error in object" +#~ msgstr "Fel i objekt" + #~ msgid "git fetch-pack: expected ACK/NAK, got EOF" #~ msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF" @@ -17038,9 +19980,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ "tomma strängar som sökvägsangivelser kommer bli ogiltiga i en kommande " #~ "utgåva. använd istället . om du vill träffa alla sökvägar" -#~ msgid "unable to open '%s' for writing" -#~ msgstr "kunde inte öppna \"%s\" för skrivning" - #~ msgid "could not truncate '%s'" #~ msgstr "kunde inte trunkera \"%s\"" @@ -17065,9 +20004,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "show ignored files" #~ msgstr "visa ignorerade filer" -#~ msgid "%s is not a valid '%s' object" -#~ msgstr "%s är inte ett giltigt \"%s\"-objekt" - #~ msgid "Don't know how to fetch from %s" #~ msgstr "Vet inte hur man hämtar från %s" @@ -17187,9 +20123,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "tag: tagging " #~ msgstr "tag: taggar" -#~ msgid "object of unknown type" -#~ msgstr "objekt av okänd typ" - #~ msgid "commit object" #~ msgstr "incheckningsobjekt" @@ -17199,9 +20132,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "blob object" #~ msgstr "blob-objekt" -#~ msgid "other tag object" -#~ msgstr "annat taggobjekt" - #~ msgid "" #~ "There is nothing to exclude from by :(exclude) patterns.\n" #~ "Perhaps you forgot to add either ':/' or '.' ?" @@ -17245,12 +20175,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "git merge [<options>] <msg> HEAD <commit>" #~ msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>" -#~ msgid "cannot open file '%s'" -#~ msgstr "kan inte öppna filen \"%s\"" - -#~ msgid "could not close file %s" -#~ msgstr "kunde inte stänga filen %s" - #~ msgid "tag name too long: %.*s..." #~ msgstr "taggnamnet för långt: %.*s..." @@ -17311,9 +20235,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "Could not open %s" #~ msgstr "Kunde inte öppna %s" -#~ msgid "Could not read %s." -#~ msgstr "kunde inte läsa %s." - #~ msgid "Could not format %s." #~ msgstr "Kunde inte formatera %s." @@ -17515,9 +20436,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "removing '%s' failed" #~ msgstr "misslyckades ta bort \"%s\"" -#~ msgid "program error" -#~ msgstr "programfel" - #~ msgid "Please call 'bisect_state' with at least one argument." #~ msgstr "Anropa \"bisect_state\" med minst ett argument." @@ -17571,9 +20489,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgstr "" #~ "Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta" -#~ msgid "could not verify the tag '%s'" -#~ msgstr "kunde inte bekräfta taggen \"%s\"" - #~ msgid "failed to remove: %s" #~ msgstr "misslyckades ta bort: %s" @@ -17593,9 +20508,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "improper format entered align:%s" #~ msgstr "felaktigt format angivet align:%s" -#~ msgid "Could not set core.worktree in %s" -#~ msgstr "Kunde inte sätta core.worktree i %s" - #~ msgid "" #~ "push.default is unset; its implicit value has changed in\n" #~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" @@ -17666,12 +20578,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "branch '%s' does not point at a commit" #~ msgstr "grenen \"%s\" pekar inte på en incheckning" -#~ msgid "object '%s' does not point to a commit" -#~ msgstr "objektet \"%s\" pekar på en incheckning" - -#~ msgid "some refs could not be read" -#~ msgstr "vissa referenser kunde inte läsas" - #~ msgid "print only merged branches" #~ msgstr "visa endast sammanslagna grenar" @@ -17690,9 +20596,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "insanely long template path %s" #~ msgstr "tokigt lång mallsökväg %s" -#~ msgid "insane git directory %s" -#~ msgstr "tokig git-katalog %s" - #~ msgid "false|true|preserve" #~ msgstr "false|true|preserve" @@ -17705,9 +20608,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "switch 'points-at' requires an object" #~ msgstr "flaggan \"points-at\" behöver ett objekt" -#~ msgid "sort tags" -#~ msgstr "sortera taggar" - #~ msgid "--sort and -n are incompatible" #~ msgstr "--sort och -n är inkompatibla" @@ -17775,9 +20675,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "no branch specified" #~ msgstr "inget grennamn angavs" -#~ msgid "check a branch out in a separate working directory" -#~ msgstr "checka ut en gren i separat arbetskatalog" - #~ msgid "prune .git/worktrees" #~ msgstr "rensa .git/worktrees" @@ -17979,9 +20876,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "more than %d trees given: '%s'" #~ msgstr "mer än %d träd angavs: \"%s\"" -#~ msgid "You cannot combine --no-ff with --ff-only." -#~ msgstr "Du kan inte kombinera --no-ff med --ff-only." - #~ msgid "" #~ "'%s' has changes staged in the index\n" #~ "(use --cached to keep the file, or -f to force removal)" @@ -18015,25 +20909,12 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgstr "" #~ "git shortlog [-n] [-s] [-e] [-w] [rev-flaggor] [--] [<incheckning-id>... ]" -#~ msgid "See 'git help <command>' for more information on a specific command." -#~ msgstr "" -#~ "Se \"git help <kommando>\" för mer information om ett specifikt kommando." - #~ msgid "use any ref in .git/refs" #~ msgstr "använd alla referenser i .git/refs" #~ msgid "use any tag in .git/refs/tags" #~ msgstr "använd alla taggar i .git/refs/tags" -#~ msgid "bad object %s" -#~ msgstr "felaktigt objekt %s" - -#~ msgid "bogus committer info %s" -#~ msgstr "felaktig incheckarinformation %s" - -#~ msgid "can't fdopen 'show' output fd" -#~ msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag" - #~ msgid "failed to close pipe to 'show' for object '%s'" #~ msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\"" @@ -18102,9 +20983,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "'%s': not a documentation directory." #~ msgstr "\"%s\": inte en dokumentationskatalog." -#~ msgid "-d option is no longer supported. Do not use." -#~ msgstr "Flaggan -d stöds inte lägre. Använd inte." - #~ msgid "Could not extract email from committer identity." #~ msgstr "Kunde inte extrahera e-postadress från incheckarens identitet." |