diff options
| author |  Peter Krefting <peter@softwolves.pp.se> | 2020-01-04 19:53:30 +0100 |
|---|---|---|
| committer | Peter Krefting <peter@softwolves.pp.se> | 2020-01-04 19:53:30 +0100 |
| commit | 9d48668cd51220f1d8b83c7e1aa65416520aeee6 (patch) | |
| tree | 01b7a0988d88603415692aba8b5635d965d86313 /po | |
| parent | Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master (diff) | |
| download | tgif-9d48668cd51220f1d8b83c7e1aa65416520aeee6.tar.xz | |
l10n: sv.po: Update Swedish translation (4800t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Diffstat (limited to 'po')
| -rw-r--r-- | po/sv.po | 5107 |
1 files changed, 2825 insertions, 2282 deletions
@@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010-2019 Peter Krefting <peter@softwolves.pp.se> +# Copyright (C) 2010-2020 Peter Krefting <peter@softwolves.pp.se> # This file is distributed under the same license as the Git package. -# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019. +# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020. # msgid "" msgstr "" -"Project-Id-Version: git 2.24.0\n" +"Project-Id-Version: git 2.25.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-10-28 13:19+0800\n" -"PO-Revision-Date: 2019-10-30 23:18+0100\n" +"POT-Creation-Date: 2019-12-30 08:48+0800\n" +"PO-Revision-Date: 2020-01-04 19:51+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,473 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 2.91.7\n" -#: advice.c:109 +#: add-interactive.c:347 +#, c-format +msgid "Huh (%s)?" +msgstr "Vadå (%s)?" + +#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216 +#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643 +#: builtin/rebase.c:2019 builtin/rebase.c:2063 +msgid "could not read index" +msgstr "kunde inte läsa indexet" + +#: add-interactive.c:555 git-add--interactive.perl:269 +#: git-add--interactive.perl:294 +msgid "binary" +msgstr "binär" + +#: add-interactive.c:613 git-add--interactive.perl:278 +#: git-add--interactive.perl:332 +msgid "nothing" +msgstr "ingenting" + +#: add-interactive.c:614 git-add--interactive.perl:314 +#: git-add--interactive.perl:329 +msgid "unchanged" +msgstr "oändrad" + +#: add-interactive.c:651 git-add--interactive.perl:643 +msgid "Update" +msgstr "Uppdatera" + +#: add-interactive.c:668 add-interactive.c:856 +#, c-format +msgid "could not stage '%s'" +msgstr "kunde inte köa \"%s\"" + +#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409 +#: builtin/rebase.c:895 +msgid "could not write index" +msgstr "kunde inte skriva indexet" + +#: add-interactive.c:677 git-add--interactive.perl:628 +#, c-format, 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" + +#: add-interactive.c:695 git-add--interactive.perl:678 +#, c-format, perl-format +msgid "note: %s is untracked now.\n" +msgstr "observera: %s spåras inte längre.\n" + +#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281 +#: builtin/reset.c:144 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" + +#: add-interactive.c:730 git-add--interactive.perl:655 +msgid "Revert" +msgstr "Återställ" + +#: add-interactive.c:746 +msgid "Could not parse HEAD^{tree}" +msgstr "kunde inte tolka HEAD^{tree}" + +#: add-interactive.c:784 git-add--interactive.perl:631 +#, c-format, 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" + +#: add-interactive.c:835 git-add--interactive.perl:695 +#, c-format +msgid "No untracked files.\n" +msgstr "Inga ospårade filer.\n" + +#: add-interactive.c:839 git-add--interactive.perl:689 +msgid "Add untracked" +msgstr "Lägg till ospårad" + +#: add-interactive.c:866 git-add--interactive.perl:625 +#, c-format, 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" + +#: add-interactive.c:896 +#, c-format +msgid "ignoring unmerged: %s" +msgstr "ignorerar ej sammanslagen: %s" + +#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366 +#, c-format +msgid "Only binary files changed.\n" +msgstr "Endast binära filer ändrade.\n" + +#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368 +#, c-format +msgid "No changes.\n" +msgstr "Inga ändringar.\n" + +#: add-interactive.c:914 git-add--interactive.perl:1376 +msgid "Patch update" +msgstr "Uppdatera patch" + +#: add-interactive.c:953 git-add--interactive.perl:1754 +msgid "Review diff" +msgstr "Granska diff" + +#: add-interactive.c:981 +msgid "show paths with changes" +msgstr "visa sökvägar med ändringar" + +#: add-interactive.c:983 +msgid "add working tree state to the staged set of changes" +msgstr "lägg arbetskatalogens tillstånd till köade ändringar" + +#: add-interactive.c:985 +msgid "revert staged set of changes back to the HEAD version" +msgstr "återställ köade ändringar tillbaka till HEAD-versionen" + +#: add-interactive.c:987 +msgid "pick hunks and update selectively" +msgstr "välj stycken och uppdatera selektivt" + +#: add-interactive.c:989 +msgid "view diff between HEAD and index" +msgstr "visa skillnad mellan HEAD och index" + +#: add-interactive.c:991 +msgid "add contents of untracked files to the staged set of changes" +msgstr "lägg innehåll i ospårade filer till köade ändringar" + +#: add-interactive.c:999 add-interactive.c:1048 +msgid "Prompt help:" +msgstr "Kommandoradshjälp:" + +#: add-interactive.c:1001 +msgid "select a single item" +msgstr "markera en post" + +#: add-interactive.c:1003 +msgid "select a range of items" +msgstr "markera intervall av poster" + +#: add-interactive.c:1005 +msgid "select multiple ranges" +msgstr "markera flera intervall" + +#: add-interactive.c:1007 add-interactive.c:1052 +msgid "select item based on unique prefix" +msgstr "markera post baserad på unikt prefix" + +#: add-interactive.c:1009 +msgid "unselect specified items" +msgstr "avmarkera angivna poster" + +#: add-interactive.c:1011 +msgid "choose all items" +msgstr "välj alla poster" + +#: add-interactive.c:1013 +msgid "(empty) finish selecting" +msgstr "(tomt) avsluta markering" + +#: add-interactive.c:1050 +msgid "select a numbered item" +msgstr "markera en numrerad post" + +#: add-interactive.c:1054 +msgid "(empty) select nothing" +msgstr "(tomt) markera ingenting" + +#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851 +msgid "*** Commands ***" +msgstr "*** Kommandon ***" + +#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848 +msgid "What now" +msgstr "Vad nu" + +#: add-interactive.c:1115 git-add--interactive.perl:213 +msgid "staged" +msgstr "köad" + +#: add-interactive.c:1115 git-add--interactive.perl:213 +msgid "unstaged" +msgstr "ej köad" + +#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197 +#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144 +#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382 +#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878 +#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213 +msgid "path" +msgstr "sökväg" + +#: add-interactive.c:1122 +msgid "could not refresh index" +msgstr "kunde inte uppdatera indexet" + +#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765 +#, c-format +msgid "Bye.\n" +msgstr "Hej då.\n" + +#: add-patch.c:15 +#, c-format +msgid "Stage mode change [y,n,a,q,d%s,?]? " +msgstr "Köa ändrat läge [y,n,a,q,d%s,?]? " + +#: add-patch.c:16 +#, c-format +msgid "Stage deletion [y,n,a,q,d%s,?]? " +msgstr "Köa borttagning [y,n,a,q,d%s,?]? " + +#: add-patch.c:17 +#, c-format +msgid "Stage this hunk [y,n,a,q,d%s,?]? " +msgstr "Köa stycket [y,n,a,q,d%s,?]? " + +#: add-patch.c:111 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "kunde inte tolka styckehuvudet \"%.*s\"" + +#: add-patch.c:130 add-patch.c:134 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "kunde inte tolka färgat styckehuvud \"%.*s\"" + +#: add-patch.c:176 +msgid "could not parse diff" +msgstr "kunde inte tolka diff" + +#: add-patch.c:194 +msgid "could not parse colored diff" +msgstr "kunde inte tolka färgad diff" + +#: add-patch.c:508 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" +"förväntade sammanhangsrad %d i\n" +"%.*s" + +#: add-patch.c:523 +#, c-format +msgid "" +"hunks do not overlap:\n" +"%.*s\n" +"\tdoes not end with:\n" +"%.*s" +msgstr "" +"stycken överlappar inte:\n" +"%.*s\n" +"\tavslutas inte med:\n" +"%.*s" + +#: add-patch.c:799 git-add--interactive.perl:1112 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n" + +#: add-patch.c:803 +#, c-format +msgid "" +"---\n" +"To remove '%c' lines, make them ' ' lines (context).\n" +"To remove '%c' lines, delete them.\n" +"Lines starting with %c will be removed.\n" +msgstr "" +"---\n" +"Ta bort \"%c\" rader genom att göra dem \" \"-rader (sammanhang).\n" +"Ta bort \"%c\" rader genom att radera dem.\n" +"Rader som börjar med %c kommer att tas bort.\n" + +#: add-patch.c:810 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for staging.\n" +msgstr "" +"Om patchen kan appliceras rent kommer det redigerade stycket att\n" +"köas omedelbart.\n" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: add-patch.c:818 git-add--interactive.perl:1126 +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" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"Om patchen inte kan appliceras rent kommer du få en möjlighet att\n" +"redigera den igen. Om alla rader i ett stycke tas bort avbryts\n" +"redigeringen och stycket lämnas oförändrat.\n" + +#: add-patch.c:851 +msgid "could not parse hunk header" +msgstr "kunde inte tolka styckehuvud" + +#: add-patch.c:895 add-patch.c:1294 +msgid "'git apply --cached' failed" +msgstr "\"git apply --cached\" misslyckades" + +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#. +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: add-patch.c:952 git-add--interactive.perl:1239 +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]? " + +#: add-patch.c:1009 +msgid "" +"y - stage this hunk\n" +"n - do not stage this hunk\n" +"q - quit; do not stage this hunk or any of the remaining ones\n" +"a - stage this and all the remaining hunks\n" +"d - do not stage this hunk nor any of the remaining hunks\n" +msgstr "" +"y - köa stycket\n" +"n - köa inte stycket\n" +"q - avsluta; köa inte stycket eller något av de följande\n" +"a - köa detta och alla följande stycken\n" +"d - köa inte stycket eller något av de stycken som följer\n" + +#: add-patch.c:1016 +msgid "" +"j - leave this hunk undecided, see next undecided hunk\n" +"J - leave this hunk undecided, see next hunk\n" +"k - leave this hunk undecided, see previous undecided hunk\n" +"K - leave this hunk undecided, see previous hunk\n" +"g - select a hunk to go to\n" +"/ - search for a hunk matching the given regex\n" +"s - split the current hunk into smaller hunks\n" +"e - manually edit the current hunk\n" +"? - print help\n" +msgstr "" +"j - lämna stycket obestämt, se nästa obestämda stycke\n" +"J - lämna stycket obestämt, se nästa stycke\n" +"k - lämna stycket obestämt, se föregående obestämda stycke\n" +"K - lämna stycket obestämt, se föregående stycke\n" +"g - välj ett stycke att gå till\n" +"/ - sök efter stycke som motsvarar angivet reguljärt uttryck\n" +"s - dela aktuellt stycke i mindre styckens\n" +"e - redigera aktuellt stycke manuellt\n" +"? - visa hjälp\n" + +#: add-patch.c:1137 add-patch.c:1147 +msgid "No previous hunk" +msgstr "Inget föregående stycke" + +#: add-patch.c:1142 add-patch.c:1152 +msgid "No next hunk" +msgstr "Inget följande stycke" + +#: add-patch.c:1158 +msgid "No other hunks to goto" +msgstr "Inga andra stycken att gå till" + +#: add-patch.c:1169 git-add--interactive.perl:1577 +msgid "go to which hunk (<ret> to see more)? " +msgstr "gå till vilket stycke (<ret> för att se fler)? " + +#: add-patch.c:1170 git-add--interactive.perl:1579 +msgid "go to which hunk? " +msgstr "gå till vilket stycke? " + +#: add-patch.c:1181 +#, c-format +msgid "Invalid number: '%s'" +msgstr "Ogiltigt siffervärde: \"%s\"" + +#: add-patch.c:1186 +#, c-format +msgid "Sorry, only %d hunk available." +msgid_plural "Sorry, only %d hunks available." +msgstr[0] "Beklagar, det finns bara %d stycke." +msgstr[1] "Beklagar, det finns bara %d stycken." + +#: add-patch.c:1195 +msgid "No other hunks to search" +msgstr "Inga andra stycken att söka efter" + +#: add-patch.c:1201 git-add--interactive.perl:1623 +msgid "search for regex? " +msgstr "sök efter reguljärt uttryck? " + +#: add-patch.c:1216 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "Felaktigt format på reguljärt sökuttryck %s: %s" + +#: add-patch.c:1233 +msgid "No hunk matches the given pattern" +msgstr "Inga stycken motsvarar givet mönster" + +#: add-patch.c:1240 +msgid "Sorry, cannot split this hunk" +msgstr "Beklagar, kan inte dela stycket" + +#: add-patch.c:1244 +#, c-format +msgid "Split into %d hunks." +msgstr "Dela i %d stycken." + +#: add-patch.c:1248 +msgid "Sorry, cannot edit this hunk" +msgstr "Beklagar, kan inte redigera stycket" + +#: advice.c:111 #, c-format msgid "%shint: %.*s%s\n" msgstr "%stips: %.*s%s\n" -#: advice.c:162 +#: advice.c:164 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:164 +#: advice.c:166 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:166 +#: advice.c:168 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:168 +#: advice.c:170 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:170 +#: advice.c:172 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:172 +#: advice.c:174 #, 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:180 +#: advice.c:182 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 +492,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:188 +#: advice.c:190 msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:193 builtin/merge.c:1332 +#: advice.c:195 builtin/merge.c:1332 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: advice.c:195 +#: advice.c:197 msgid "Please, commit your changes before merging." msgstr "Checka in dina ändringar innan du utför sammanslagningen." -#: advice.c:196 +#: advice.c:198 msgid "Exiting because of unfinished merge." msgstr "Avslutar på grund av ofullbordad sammanslagning." -#: advice.c:202 +#: advice.c:204 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -292,24 +718,24 @@ msgstr "kunde inte läsa symboliska länken %s" msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: apply.c:2926 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: apply.c:3047 +#: apply.c:3057 #, 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:3059 +#: apply.c:3069 #, 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:3065 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -318,25 +744,25 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: apply.c:3087 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: apply.c:3095 +#: apply.c:3105 #, 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:3142 +#: apply.c:3152 #, 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:3152 +#: apply.c:3162 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -344,426 +770,412 @@ msgstr "" "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande " "innehållet." -#: apply.c:3160 +#: apply.c:3170 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "patchen appliceras på en tom \"%s\", men den är inte tom" -#: apply.c:3178 +#: apply.c:3188 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas" -#: apply.c:3191 +#: apply.c:3201 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: apply.c:3197 +#: apply.c:3207 #, 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:3218 +#: apply.c:3228 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: apply.c:3341 +#: apply.c:3351 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280 +#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" -#: apply.c:3401 +#: apply.c:3411 #, 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:3430 apply.c:3673 +#: apply.c:3440 apply.c:3683 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: apply.c:3516 apply.c:3688 +#: apply.c:3526 apply.c:3698 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: apply.c:3525 apply.c:3696 +#: apply.c:3535 apply.c:3706 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: apply.c:3560 +#: apply.c:3570 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:3573 #, 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:3589 apply.c:3593 #, 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:3605 #, 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:3619 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Applicerade patchen på \"%s\" med konflikter.\n" -#: apply.c:3614 +#: apply.c:3624 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Tillämpade patchen på \"%s\" rent.\n" -#: apply.c:3640 +#: apply.c:3650 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: apply.c:3713 +#: apply.c:3723 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: apply.c:3715 +#: apply.c:3725 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1320 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg \"%s\"" -#: apply.c:3924 +#: apply.c:3934 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: apply.c:3927 +#: apply.c:3937 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: apply.c:3947 +#: apply.c:3957 #, 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:3952 +#: apply.c:3962 #, 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:3972 +#: apply.c:3982 #, 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:3976 +#: apply.c:3986 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: apply.c:3991 +#: apply.c:4001 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: apply.c:4083 +#: apply.c:4093 #, 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:4090 +#: apply.c:4100 #, 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:4093 +#: apply.c:4103 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller är oanvändbar (%s)." -#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" - -#: apply.c:4102 +#: apply.c:4112 #, c-format msgid "could not add %s to temporary index" msgstr "kunde inte lägga till %s till temporärt index" -#: apply.c:4112 +#: apply.c:4122 #, c-format msgid "could not write temporary index to %s" msgstr "kunde inte skriva temporärt index till %s" -#: apply.c:4250 +#: apply.c:4260 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: apply.c:4284 +#: apply.c:4294 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: apply.c:4290 +#: apply.c:4300 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: apply.c:4298 +#: apply.c:4308 #, 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:4304 apply.c:4449 +#: apply.c:4314 apply.c:4459 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: apply.c:4347 +#: apply.c:4357 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" -#: apply.c:4351 +#: apply.c:4361 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: apply.c:4421 +#: apply.c:4431 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: apply.c:4519 +#: apply.c:4529 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: apply.c:4527 +#: apply.c:4537 msgid "internal error" msgstr "internt fel" -#: apply.c:4530 +#: apply.c:4540 #, 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:4541 +#: apply.c:4551 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194 +#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" -#: apply.c:4563 +#: apply.c:4573 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: apply.c:4567 +#: apply.c:4577 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4686 +#: apply.c:4696 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4694 +#: apply.c:4704 msgid "unrecognized input" msgstr "indata känns inte igen" -#: apply.c:4714 +#: apply.c:4724 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4871 +#: apply.c:4881 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4898 +#: apply.c:4908 #, 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:4904 apply.c:4919 +#: apply.c:4914 apply.c:4929 #, 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:4912 +#: apply.c:4922 #, 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:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200 -#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273 -#: builtin/pull.c:209 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 -#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 -#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 -msgid "path" -msgstr "sökväg" - -#: apply.c:4956 +#: apply.c:4966 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:4959 +#: apply.c:4969 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:4961 builtin/am.c:2206 +#: apply.c:4971 builtin/am.c:2206 msgid "num" msgstr "antal" -#: apply.c:4962 +#: apply.c:4972 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:4965 +#: apply.c:4975 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:4967 +#: apply.c:4977 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:4971 +#: apply.c:4981 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:4973 +#: apply.c:4983 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:4975 +#: apply.c:4985 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:4977 +#: apply.c:4987 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:4979 +#: apply.c:4989 msgid "mark new files with `git add --intent-to-add`" msgstr "markera nya filer med \"git add --intent-to-add\"" -#: apply.c:4981 +#: apply.c:4991 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:4983 +#: apply.c:4993 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:4986 +#: apply.c:4996 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:4988 +#: apply.c:4998 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:4990 +#: apply.c:5000 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: apply.c:4995 +#: apply.c:5005 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98 +#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1445 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1474 msgid "action" msgstr "åtgärd" -#: apply.c:4997 +#: apply.c:5007 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:5000 apply.c:5003 +#: apply.c:5010 apply.c:5013 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:5006 +#: apply.c:5016 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:5008 +#: apply.c:5018 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:5010 +#: apply.c:5020 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:5012 +#: apply.c:5022 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22 +#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774 +#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "var pratsam" -#: apply.c:5015 +#: apply.c:5025 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:5018 +#: apply.c:5028 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:5020 builtin/am.c:2194 +#: apply.c:5030 builtin/am.c:2194 msgid "root" msgstr "rot" -#: apply.c:5021 +#: apply.c:5031 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" @@ -786,7 +1198,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" @@ -818,7 +1230,7 @@ msgstr "fmt" msgid "archive format" msgstr "arkivformat" -#: archive.c:458 builtin/log.c:1581 +#: archive.c:458 builtin/log.c:1653 msgid "prefix" msgstr "prefix" @@ -826,12 +1238,12 @@ msgstr "prefix" msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 #: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 #: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 #: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:186 +#: parse-options.h:190 msgid "file" msgstr "fil" @@ -863,8 +1275,8 @@ msgstr "komprimera bättre" msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884 msgid "repo" msgstr "arkiv" @@ -903,17 +1315,17 @@ msgstr "Okänt arkivformat \"%s\"" 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:345 +#: archive-tar.c:125 archive-zip.c:350 #, c-format msgid "cannot stream blob %s" msgstr "kan inte strömma blob:en %s" -#: archive-tar.c:266 archive-zip.c:363 +#: archive-tar.c:266 archive-zip.c:368 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "filens läge stöds ej: 0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:353 +#: archive-tar.c:293 archive-zip.c:358 #, c-format msgid "cannot read %s" msgstr "kan inte läsa %s" @@ -932,37 +1344,37 @@ msgstr "kan inte omdirigera handtag" msgid "'%s' filter reported error" msgstr "filtret \"%s\" rapporterade fel" -#: archive-zip.c:314 +#: archive-zip.c:319 #, c-format msgid "path is not valid UTF-8: %s" msgstr "sökvägen är inte giltig UTF-8: %s" -#: archive-zip.c:318 +#: archive-zip.c:323 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s" -#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 +#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: archive-zip.c:609 +#: archive-zip.c:614 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>" -#: attr.c:213 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%-*s är inte ett giltigt namn på attribut" -#: attr.c:370 +#: attr.c:369 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s inte tillåtet: %s:%d" -#: attr.c:410 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1104,9 +1516,9 @@ msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971 -#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964 -#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093 +#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991 +#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411 #: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 #: builtin/shortlog.c:192 msgid "revision walk setup failed" @@ -1282,8 +1694,8 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil" msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962 -#: builtin/commit.c:791 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108 +#: builtin/commit.c:811 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -1314,42 +1726,42 @@ 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:272 +#: bundle.c:273 msgid "unable to dup bundle descriptor" msgstr "kan inte duplicera pakethandtag" -#: bundle.c:279 +#: bundle.c:280 msgid "Could not spawn pack-objects" msgstr "Kunde inte starta pack-objects" -#: bundle.c:290 +#: bundle.c:291 msgid "pack-objects died" msgstr "pack-objects misslyckades" -#: bundle.c:332 +#: bundle.c:333 msgid "rev-list died" msgstr "rev-list dog" -#: bundle.c:381 +#: bundle.c:382 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306 +#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" -#: bundle.c:468 +#: bundle.c:469 msgid "Refusing to create empty bundle." msgstr "Vägrar skapa ett tomt paket (bundle)." -#: bundle.c:478 +#: bundle.c:479 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:503 +#: bundle.c:504 msgid "index-pack died" msgstr "index-pack dog" @@ -1358,18 +1770,18 @@ msgstr "index-pack dog" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398 +#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398 #: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" -#: commit.c:52 +#: commit.c:53 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s är inte en incheckning!" -#: commit.c:192 +#: commit.c:193 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -1389,29 +1801,29 @@ msgstr "" "Slå av detta meddelande genom att skriva\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1128 +#: commit.c:1152 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s." -#: commit.c:1131 +#: commit.c:1155 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s." -#: commit.c:1134 +#: commit.c:1158 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: commit.c:1137 +#: commit.c:1161 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n" -#: commit.c:1391 +#: commit.c:1415 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" @@ -1421,77 +1833,72 @@ 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:127 +#: commit-graph.c:130 msgid "commit-graph file is too small" msgstr "incheckningsgraffilen %s är för liten" -#: commit-graph.c:192 +#: commit-graph.c:195 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X" -#: commit-graph.c:199 +#: commit-graph.c:202 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "incheckningsgrafens version %X stämmer inte med versionen %X" -#: commit-graph.c:206 +#: commit-graph.c:209 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X" -#: commit-graph.c:229 +#: commit-graph.c:232 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" "incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara " "ofullständig" -#: commit-graph.c:240 +#: commit-graph.c:243 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen" -#: commit-graph.c:283 +#: commit-graph.c:286 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger" -#: commit-graph.c:347 +#: commit-graph.c:350 msgid "commit-graph has no base graphs chunk" msgstr "incheckningsgrafen har inga bas-graf-stycken" -#: commit-graph.c:357 +#: commit-graph.c:360 msgid "commit-graph chain does not match" msgstr "incheckningsgrafens kedja stämmer inte" -#: commit-graph.c:404 +#: commit-graph.c:407 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde" -#: commit-graph.c:430 +#: commit-graph.c:433 msgid "unable to find all commit-graph files" msgstr "kan inte hitta alla incheckingsgraffiler" -#: commit-graph.c:561 commit-graph.c:621 +#: commit-graph.c:564 commit-graph.c:624 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig" -#: commit-graph.c:582 +#: commit-graph.c:585 #, c-format msgid "could not find commit %s" msgstr "kunde inte hitta incheckningen %s" -#: commit-graph.c:855 builtin/am.c:1287 +#: commit-graph.c:858 builtin/am.c:1287 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: commit-graph.c:859 -#, c-format -msgid "unable to get tree for %s" -msgstr "kunde inte hämta trädet på %s" - #: commit-graph.c:1017 builtin/pack-objects.c:2641 #, c-format msgid "unable to get type of object %s" @@ -1558,12 +1965,12 @@ msgstr "Söker ytterligare kanter i incheckingsgraf" msgid "failed to write correct number of base graph ids" msgstr "kunde inte skriva korrekt antal bas-graf-id:n" -#: commit-graph.c:1379 midx.c:810 +#: commit-graph.c:1379 midx.c:814 #, c-format msgid "unable to create leading directories of %s" msgstr "kunde inte skapa inledande kataloger för %s" -#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" @@ -1731,7 +2138,7 @@ msgstr "nyckeln innehåller inte ett stycke: %s" msgid "key does not contain variable name: %s" msgstr "nyckeln innehåller inte variabelnamn: %s" -#: config.c:406 sequencer.c:2401 +#: config.c:406 sequencer.c:2530 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" @@ -1860,144 +2267,144 @@ msgstr "core.commentChar kan bara vara ett tecken" msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1425 +#: config.c:1430 #, c-format msgid "malformed value for %s" msgstr "felformat värde för %s" -#: config.c:1451 +#: config.c:1456 #, c-format msgid "malformed value for %s: %s" msgstr "felformat värde för %s: %s" -#: config.c:1452 +#: config.c:1457 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:1513 builtin/pack-objects.c:3394 +#: config.c:1518 builtin/pack-objects.c:3394 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1634 +#: config.c:1639 #, c-format msgid "unable to load config blob object '%s'" msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\"" -#: config.c:1637 +#: config.c:1642 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referensen \"%s\" pekar inte på en blob" -#: config.c:1654 +#: config.c:1659 #, c-format msgid "unable to resolve config blob '%s'" msgstr "kan inte slå upp konfigurerings-bloben \"%s\"" -#: config.c:1684 +#: config.c:1689 #, c-format msgid "failed to parse %s" msgstr "kunde inte tolka %s" -#: config.c:1740 +#: config.c:1745 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:2091 +#: config.c:2096 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2261 +#: config.c:2266 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:2306 +#: config.c:2311 #, 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:2352 +#: config.c:2357 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2354 +#: config.c:2359 #, 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:2435 +#: config.c:2440 #, c-format msgid "invalid section name '%s'" msgstr "felaktigt sektionsnamn \"%s\"" -#: config.c:2467 +#: config.c:2472 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2496 +#: config.c:2501 #, c-format msgid "failed to write new configuration file %s" msgstr "kan inte skriva nya konfigurationsfilen \"%s\"" -#: config.c:2748 config.c:3072 +#: config.c:2753 config.c:3077 #, c-format msgid "could not lock config file %s" msgstr "kunde inte låsa konfigurationsfilen %s" -#: config.c:2759 +#: config.c:2764 #, c-format msgid "opening %s" msgstr "öppnar %s" -#: config.c:2794 builtin/config.c:328 +#: config.c:2799 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "ogiltigt mönster: %s" -#: config.c:2819 +#: config.c:2824 #, c-format msgid "invalid config file %s" msgstr "ogiltig konfigurationsfil: \"%s\"" -#: config.c:2832 config.c:3085 +#: config.c:2837 config.c:3090 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:2843 +#: config.c:2848 #, c-format msgid "unable to mmap '%s'" msgstr "kunde inte utföra mmap på \"%s\"" -#: config.c:2852 config.c:3090 +#: config.c:2857 config.c:3095 #, c-format msgid "chmod on %s failed" msgstr "chmod misslyckades på %s" -#: config.c:2937 config.c:3187 +#: config.c:2942 config.c:3192 #, c-format msgid "could not write config file %s" msgstr "kunde inte skriva konfigurationsfilen %s" -#: config.c:2971 +#: config.c:2976 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:2973 builtin/remote.c:782 +#: config.c:2978 builtin/remote.c:781 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" -#: config.c:3063 +#: config.c:3068 #, c-format msgid "invalid section name: %s" msgstr "felaktigt namn på stycke: %s" -#: config.c:3230 +#: config.c:3235 #, c-format msgid "missing value for '%s'" msgstr "värde saknas för \"%s\"" @@ -2163,19 +2570,19 @@ msgstr "kunde inte grena (fork)" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" -#: connected.c:100 +#: connected.c:101 msgid "Could not run 'git rev-list'" msgstr "Kunde inte köra \"git rev-list\"" -#: connected.c:120 +#: connected.c:121 msgid "failed write to rev-list" msgstr "kunde inte skriva till rev-list" -#: connected.c:127 +#: connected.c:128 msgid "failed to close rev-list's stdin" msgstr "kunde inte stänga rev-list:s standard in" @@ -2212,26 +2619,26 @@ msgstr "" "LF kommer att ersättas av CRLF i %s.\n" "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog" -#: convert.c:280 +#: convert.c:284 #, 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 +#: convert.c:291 #, c-format msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" -"tree-encoding." +"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 " +"Filen \"%s\" innehåller byte order mark (BOM). Använd UTF-%.*s som " "teckenkodning i arbetskatalogen." -#: convert.c:305 +#: convert.c:304 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "BOM krävs om \"%s\" kodas som %s" -#: convert.c:307 +#: convert.c:306 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" @@ -2240,51 +2647,51 @@ msgstr "" "Filen \"%s\" saknar byte order mark (BOM). Använd UTF-%sBE eller UTF-%sLE " "(beroende på byteordning) som teckenkodning i arbetskatalogen." -#: convert.c:425 convert.c:496 +#: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "misslyckades omkoda \"%s\" från %s till %s" -#: convert.c:468 +#: convert.c:462 #, 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 +#: convert.c:668 #, 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 +#: convert.c:688 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "kunde inte skicka indata till externt filter \"%s\"" -#: convert.c:701 +#: convert.c:695 #, c-format msgid "external filter '%s' failed %d" msgstr "externt filter \"%s\" misslyckades %d" -#: convert.c:736 convert.c:739 +#: convert.c:730 convert.c:733 #, c-format msgid "read from external filter '%s' failed" msgstr "läsning från externt filter \"%s\" misslyckades" -#: convert.c:742 convert.c:797 +#: convert.c:736 convert.c:791 #, c-format msgid "external filter '%s' failed" msgstr "externt filter \"%s\" misslyckades" -#: convert.c:845 +#: convert.c:839 msgid "unexpected filter type" msgstr "oväntad filtertyp" -#: convert.c:856 +#: convert.c:850 msgid "path name too long for external filter" msgstr "sökvägen för lång för externt filter" -#: convert.c:930 +#: convert.c:924 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2293,16 +2700,16 @@ msgstr "" "externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar " "inte har filtrerats" -#: convert.c:1229 +#: convert.c:1223 msgid "true/false are no valid working-tree-encodings" msgstr "true/false är inte giltig teckenkodning för arbetskatalogen" -#: convert.c:1417 convert.c:1451 +#: convert.c:1411 convert.c:1445 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: \"clean\"-filtret \"%s\" misslyckades" -#: convert.c:1495 +#: convert.c:1489 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades" @@ -2470,35 +2877,35 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:4218 +#: diff.c:4202 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:4563 +#: diff.c:4547 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" -#: diff.c:4566 +#: diff.c:4550 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S och --find-object är ömsesidigt uteslutande" -#: diff.c:4644 +#: diff.c:4628 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:4692 +#: diff.c:4676 #, c-format msgid "invalid --stat value: %s" msgstr "ogiltigt värde för --stat: %s" -#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225 +#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 #: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "%s förväntar ett numeriskt värde" -#: diff.c:4729 +#: diff.c:4713 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2507,42 +2914,42 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:4814 +#: diff.c:4798 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s" -#: diff.c:4838 +#: diff.c:4822 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "okänt värde efter ws-error-highlight=%.*s" -#: diff.c:4852 +#: diff.c:4836 #, c-format msgid "unable to resolve '%s'" msgstr "kunde inte slå upp \"%s\"" -#: diff.c:4902 diff.c:4908 +#: diff.c:4886 diff.c:4892 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s förväntar formen <n>/<m>" -#: diff.c:4920 +#: diff.c:4904 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s förväntar ett tecken, fick \"%s\"" -#: diff.c:4941 +#: diff.c:4925 #, c-format msgid "bad --color-moved argument: %s" msgstr "felaktigt argument till --color-moved: %s" -#: diff.c:4960 +#: diff.c:4944 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "ogiltigt läge %s\" i --color-moved-ws" -#: diff.c:5000 +#: diff.c:4984 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -2550,149 +2957,149 @@ msgstr "" "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och " "\"histogram\"" -#: diff.c:5036 diff.c:5056 +#: diff.c:5020 diff.c:5040 #, c-format msgid "invalid argument to %s" msgstr "ogiltigt argument för %s" -#: diff.c:5194 +#: diff.c:5178 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:5250 +#: diff.c:5234 #, c-format msgid "bad --word-diff argument: %s" msgstr "felaktigt argument --word-diff: %s" -#: diff.c:5273 +#: diff.c:5257 msgid "Diff output format options" msgstr "Formatflaggor för diff-utdata" -#: diff.c:5275 diff.c:5281 +#: diff.c:5259 diff.c:5265 msgid "generate patch" msgstr "skapar patch" -#: diff.c:5278 builtin/log.c:172 +#: diff.c:5262 builtin/log.c:173 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: diff.c:5283 diff.c:5397 diff.c:5404 +#: diff.c:5267 diff.c:5381 diff.c:5388 msgid "<n>" msgstr "<n>" -#: diff.c:5284 diff.c:5287 +#: diff.c:5268 diff.c:5271 msgid "generate diffs with <n> lines context" msgstr "skapa diffar med <n> rader sammanhang" -#: diff.c:5289 +#: diff.c:5273 msgid "generate the diff in raw format" msgstr "generera diff i råformat" -#: diff.c:5292 +#: diff.c:5276 msgid "synonym for '-p --raw'" msgstr "synonym till \"-p --raw\"" -#: diff.c:5296 +#: diff.c:5280 msgid "synonym for '-p --stat'" msgstr "synonym till \"-p --stat\"" -#: diff.c:5300 +#: diff.c:5284 msgid "machine friendly --stat" msgstr "maskinläsbar --stat" -#: diff.c:5303 +#: diff.c:5287 msgid "output only the last line of --stat" msgstr "skriv bara ut den sista raden för --stat" -#: diff.c:5305 diff.c:5313 +#: diff.c:5289 diff.c:5297 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5306 +#: diff.c:5290 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "skriv ut distributionen av relativa mängder ändringar för varje underkatalog" -#: diff.c:5310 +#: diff.c:5294 msgid "synonym for --dirstat=cumulative" msgstr "synonym för --dirstat=cumulative" -#: diff.c:5314 +#: diff.c:5298 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonym för --dirstat=filer,param1,param2..." -#: diff.c:5318 +#: diff.c:5302 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel" -#: diff.c:5321 +#: diff.c:5305 msgid "condensed summary such as creations, renames and mode changes" msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen" -#: diff.c:5324 +#: diff.c:5308 msgid "show only names of changed files" msgstr "visa endast namnen på ändrade filer" -#: diff.c:5327 +#: diff.c:5311 msgid "show only names and status of changed files" msgstr "visa endast namn och status för ändrade filer" -#: diff.c:5329 +#: diff.c:5313 msgid "<width>[,<name-width>[,<count>]]" msgstr "<bredd>[,<namn-bredd>[,<antal>]]" -#: diff.c:5330 +#: diff.c:5314 msgid "generate diffstat" msgstr "skapa diffstat" -#: diff.c:5332 diff.c:5335 diff.c:5338 +#: diff.c:5316 diff.c:5319 diff.c:5322 msgid "<width>" msgstr "<bredd>" -#: diff.c:5333 +#: diff.c:5317 msgid "generate diffstat with a given width" msgstr "generera en diffstat med given bredd" -#: diff.c:5336 +#: diff.c:5320 msgid "generate diffstat with a given name width" msgstr "generera en diffstat med given namnbredd" -#: diff.c:5339 +#: diff.c:5323 msgid "generate diffstat with a given graph width" msgstr "generera en diffstat med given grafbredd" -#: diff.c:5341 +#: diff.c:5325 msgid "<count>" msgstr "<antal>" -#: diff.c:5342 +#: diff.c:5326 msgid "generate diffstat with limited lines" msgstr "generera diffstat med begränsade rader" -#: diff.c:5345 +#: diff.c:5329 msgid "generate compact summary in diffstat" msgstr "skapa kompakt översikt i diffstat" -#: diff.c:5348 +#: diff.c:5332 msgid "output a binary diff that can be applied" msgstr "skapa en binärdiff som kan appliceras" -#: diff.c:5351 +#: diff.c:5335 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "visa fullständiga objektnamn i \"index\"-rader för läget både före och efter" -#: diff.c:5353 +#: diff.c:5337 msgid "show colored diff" msgstr "visa färgad diff" -#: diff.c:5354 +#: diff.c:5338 msgid "<kind>" msgstr "<typ>" -#: diff.c:5355 +#: diff.c:5339 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -2700,7 +3107,7 @@ msgstr "" "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller " "\"new\" (nya) rader i diffen" -#: diff.c:5358 +#: diff.c:5342 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2708,87 +3115,87 @@ msgstr "" "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw " "eller --numstat" -#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473 +#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 msgid "<prefix>" msgstr "<prefix>" -#: diff.c:5362 +#: diff.c:5346 msgid "show the given source prefix instead of \"a/\"" msgstr "visa givet källprefix istället för \"a/\"" -#: diff.c:5365 +#: diff.c:5349 msgid "show the given destination prefix instead of \"b/\"" msgstr "visa givet målprefix istället för \"b/\"" -#: diff.c:5368 +#: diff.c:5352 msgid "prepend an additional prefix to every line of output" msgstr "lägg till ytterligare prefix på alla rader i utdata" -#: diff.c:5371 +#: diff.c:5355 msgid "do not show any source or destination prefix" msgstr "visa inte käll- eller målprefix" -#: diff.c:5374 +#: diff.c:5358 msgid "show context between diff hunks up to the specified number of lines" msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader" -#: diff.c:5378 diff.c:5383 diff.c:5388 +#: diff.c:5362 diff.c:5367 diff.c:5372 msgid "<char>" msgstr "<tecken>" -#: diff.c:5379 +#: diff.c:5363 msgid "specify the character to indicate a new line instead of '+'" msgstr "ange tecken för att ange ny rad istället för \"+\"" -#: diff.c:5384 +#: diff.c:5368 msgid "specify the character to indicate an old line instead of '-'" msgstr "ange tecken för att ange gammal rad istället för \"-\"" -#: diff.c:5389 +#: diff.c:5373 msgid "specify the character to indicate a context instead of ' '" msgstr "ange tecken för att ange sammanhang istället för \" \"" -#: diff.c:5392 +#: diff.c:5376 msgid "Diff rename options" msgstr "Diff-namnbytesflaggor" -#: diff.c:5393 +#: diff.c:5377 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5394 +#: diff.c:5378 msgid "break complete rewrite changes into pairs of delete and create" msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par" -#: diff.c:5398 +#: diff.c:5382 msgid "detect renames" msgstr "detektera namnändringar" -#: diff.c:5402 +#: diff.c:5386 msgid "omit the preimage for deletes" msgstr "ta bort för-version för borttagningar" -#: diff.c:5405 +#: diff.c:5389 msgid "detect copies" msgstr "detektera kopior" -#: diff.c:5409 +#: diff.c:5393 msgid "use unmodified files as source to find copies" msgstr "använd oförändrade som källa för att hitta kopior" -#: diff.c:5411 +#: diff.c:5395 msgid "disable rename detection" msgstr "inaktivera detektering av namnbyten" -#: diff.c:5414 +#: diff.c:5398 msgid "use empty blobs as rename source" msgstr "använd tomma blob:ar som namnändringskälla" -#: diff.c:5416 +#: diff.c:5400 msgid "continue listing the history of a file beyond renames" msgstr "fortsätt lista historiken för en fil bortom namnändringar" -#: diff.c:5419 +#: diff.c:5403 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -2796,159 +3203,159 @@ msgstr "" "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver " "given gräns" -#: diff.c:5421 +#: diff.c:5405 msgid "Diff algorithm options" msgstr "Alternativ för diff-algoritm" -#: diff.c:5423 +#: diff.c:5407 msgid "produce the smallest possible diff" msgstr "skapa minsta möjliga diff" -#: diff.c:5426 +#: diff.c:5410 msgid "ignore whitespace when comparing lines" msgstr "ignorera blanktecken vid radjämförelse" -#: diff.c:5429 +#: diff.c:5413 msgid "ignore changes in amount of whitespace" msgstr "ignorera ändringar i antal blanktecken vid radjämförelse" -#: diff.c:5432 +#: diff.c:5416 msgid "ignore changes in whitespace at EOL" msgstr "ignorera blanktecken vid radslut" -#: diff.c:5435 +#: diff.c:5419 msgid "ignore carrier-return at the end of line" msgstr "ignorera CR-tecken vid radslut" -#: diff.c:5438 +#: diff.c:5422 msgid "ignore changes whose lines are all blank" msgstr "ignorera ändringar i rader som är helt blanka" -#: diff.c:5441 +#: diff.c:5425 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "heuristik för att flytta diff-gränser för lättare läsning" -#: diff.c:5444 +#: diff.c:5428 msgid "generate diff using the \"patience diff\" algorithm" msgstr "skapa diffar med algoritmen \"patience diff\"" -#: diff.c:5448 +#: diff.c:5432 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "skapa diffar med algoritmen \"histogram diff\"" -#: diff.c:5450 +#: diff.c:5434 msgid "<algorithm>" msgstr "<algoritm>" -#: diff.c:5451 +#: diff.c:5435 msgid "choose a diff algorithm" msgstr "välj en diff-algoritm" -#: diff.c:5453 +#: diff.c:5437 msgid "<text>" msgstr "<text>" -#: diff.c:5454 +#: diff.c:5438 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "skapa diffar med algoritmen \"anchored diff\"" -#: diff.c:5456 diff.c:5465 diff.c:5468 +#: diff.c:5440 diff.c:5449 diff.c:5452 msgid "<mode>" msgstr "<läge>" -#: diff.c:5457 +#: diff.c:5441 msgid "show word diff, using <mode> to delimit changed words" msgstr "visa orddiff, där <läge> avgränsar ändrade ord" -#: diff.c:5459 diff.c:5462 diff.c:5507 +#: diff.c:5443 diff.c:5446 diff.c:5491 msgid "<regex>" msgstr "<reguttr>" -#: diff.c:5460 +#: diff.c:5444 msgid "use <regex> to decide what a word is" msgstr "använd <reguttr> för att bestämma vad som är ett ord" -#: diff.c:5463 +#: diff.c:5447 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>" -#: diff.c:5466 +#: diff.c:5450 msgid "moved lines of code are colored differently" msgstr "flyttade kodrader färgas på annat sätt" -#: diff.c:5469 +#: diff.c:5453 msgid "how white spaces are ignored in --color-moved" msgstr "hur blanktecken ignoreras i --color-moved" -#: diff.c:5472 +#: diff.c:5456 msgid "Other diff options" msgstr "Andra diff-flaggor" -#: diff.c:5474 +#: diff.c:5458 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "vid start från underkatalog, uteslut ändringar utanför och visa relativa " "sökvägar" -#: diff.c:5478 +#: diff.c:5462 msgid "treat all files as text" msgstr "hantera alla filer som text" -#: diff.c:5480 +#: diff.c:5464 msgid "swap two inputs, reverse the diff" msgstr "växla två indatafiler, vänd diffen" -#: diff.c:5482 +#: diff.c:5466 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "avsluta med 1 vid ändringar, annars 0" -#: diff.c:5484 +#: diff.c:5468 msgid "disable all output of the program" msgstr "slå av alla utdata från programmet" -#: diff.c:5486 +#: diff.c:5470 msgid "allow an external diff helper to be executed" msgstr "tillåt köra en extern diff-hjälpare" -#: diff.c:5488 +#: diff.c:5472 msgid "run external text conversion filters when comparing binary files" msgstr "kör externt textkonverteringsfiler när binärfiler jämförs" -#: diff.c:5490 +#: diff.c:5474 msgid "<when>" msgstr "<när>" -#: diff.c:5491 +#: diff.c:5475 msgid "ignore changes to submodules in the diff generation" msgstr "ignorera ändringar i undermoduler när diffen skapas" -#: diff.c:5494 +#: diff.c:5478 msgid "<format>" msgstr "<format>" -#: diff.c:5495 +#: diff.c:5479 msgid "specify how differences in submodules are shown" msgstr "ange hur ändringar i undermoduler visas" -#: diff.c:5499 +#: diff.c:5483 msgid "hide 'git add -N' entries from the index" msgstr "dölj \"git add -N\"-poster från indexet" -#: diff.c:5502 +#: diff.c:5486 msgid "treat 'git add -N' entries as real in the index" msgstr "tolka \"git add -N\"-poster som äkta i indexet" -#: diff.c:5504 +#: diff.c:5488 msgid "<string>" msgstr "<sträng>" -#: diff.c:5505 +#: diff.c:5489 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng" -#: diff.c:5508 +#: diff.c:5492 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -2956,94 +3363,115 @@ msgstr "" "se efter ändringar som ändrar antalet förekomster av angivet reguljärt " "uttryck" -#: diff.c:5511 +#: diff.c:5495 msgid "show all changes in the changeset with -S or -G" msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G" -#: diff.c:5514 +#: diff.c:5498 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck" -#: diff.c:5517 +#: diff.c:5501 msgid "control the order in which files appear in the output" msgstr "styr ordningen i vilken filer visas i utdata" -#: diff.c:5518 +#: diff.c:5502 msgid "<object-id>" msgstr "<objekt-id>" -#: diff.c:5519 +#: diff.c:5503 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt" -#: diff.c:5521 +#: diff.c:5505 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5522 +#: diff.c:5506 msgid "select files by diff type" msgstr "välj filter efter diff-typ" -#: diff.c:5524 +#: diff.c:5508 msgid "<file>" msgstr "<fil>" -#: diff.c:5525 +#: diff.c:5509 msgid "Output to a specific file" msgstr "Skriv utdata till en specifik fil" -#: diff.c:6180 +#: diff.c:6164 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:6183 +#: diff.c:6167 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:6186 +#: diff.c:6170 #, 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:549 +#: dir.c:554 #, 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:938 +#: dir.c:664 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "okänt mönster: %s" + +#: dir.c:682 dir.c:696 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "okänt negativt mönster: %s" + +#: dir.c:714 +#, c-format +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" +msgstr "" +"din \"sparse-checkout\"-fil kan ha problem: mönstret \"%s\" förekommer flera " +"gånger" + +#: dir.c:724 +msgid "disabling cone pattern matching" +msgstr "inaktiverar konmönstermatchning" + +#: dir.c:1101 #, c-format msgid "cannot use %s as an exclude file" msgstr "kan inte använda %s som exkluderingsfil" -#: dir.c:1877 +#: dir.c:2078 #, c-format msgid "could not open directory '%s'" msgstr "kunde inte öppna katalogen \"%s\"" -#: dir.c:2128 +#: dir.c:2415 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:2252 +#: dir.c:2539 msgid "untracked cache is disabled on this system or location" msgstr "ospårad cache är inaktiverad på systemet eller platsen" -#: dir.c:3056 +#: dir.c:3343 #, c-format msgid "index file corrupt in repo %s" msgstr "indexfilen trasig i arkivet %s" -#: dir.c:3101 dir.c:3106 +#: dir.c:3388 dir.c:3393 #, c-format msgid "could not create directories for %s" msgstr "kunde inte skapa kataloger för %s" -#: dir.c:3135 +#: dir.c:3422 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" @@ -3062,12 +3490,12 @@ msgstr "Filtrerar innehåll" msgid "could not stat file '%s'" msgstr "kunde inte ta status på filen \"%s\"" -#: environment.c:148 +#: environment.c:149 #, c-format msgid "bad git namespace path \"%s\"" msgstr "felaktig git-namnrymdssökväg \"%s\"" -#: environment.c:330 +#: environment.c:331 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "kunde inte ställa in GIT_DIR till \"%s\"" @@ -3102,32 +3530,32 @@ msgstr "kunde inte skriva till fjärren" msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc kräver \"multi_ack_detailed\"" -#: fetch-pack.c:356 fetch-pack.c:1280 +#: fetch-pack.c:356 fetch-pack.c:1340 #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" -#: fetch-pack.c:362 fetch-pack.c:1286 +#: fetch-pack.c:362 fetch-pack.c:1346 #, c-format msgid "invalid unshallow line: %s" msgstr "ogiltig \"unshallow\"-rad: %s" -#: fetch-pack.c:364 fetch-pack.c:1288 +#: fetch-pack.c:364 fetch-pack.c:1348 #, c-format msgid "object not found: %s" msgstr "objektet hittades inte: %s" -#: fetch-pack.c:367 fetch-pack.c:1291 +#: fetch-pack.c:367 fetch-pack.c:1351 #, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" -#: fetch-pack.c:369 fetch-pack.c:1293 +#: fetch-pack.c:369 fetch-pack.c:1353 #, c-format msgid "no shallow found: %s" msgstr "ingen \"shallow\" hittades: %s" -#: fetch-pack.c:372 fetch-pack.c:1297 +#: fetch-pack.c:372 fetch-pack.c:1357 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "förväntade shallow/unshallow, fick %s" @@ -3146,7 +3574,7 @@ msgstr "ogiltig incheckning %s" msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:475 progress.c:312 +#: fetch-pack.c:475 progress.c:323 msgid "done" msgstr "klart" @@ -3160,163 +3588,163 @@ msgstr "fick %s (%d) %s" msgid "Marking %s as complete" msgstr "Markerar %s som komplett" -#: fetch-pack.c:742 +#: fetch-pack.c:754 #, c-format msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:781 +#: fetch-pack.c:818 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:789 +#: fetch-pack.c:826 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:857 +#: fetch-pack.c:900 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-patch: kunde inte grena av %s" -#: fetch-pack.c:873 +#: fetch-pack.c:916 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:875 +#: fetch-pack.c:918 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:907 +#: fetch-pack.c:965 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927 -#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943 -#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959 -#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981 +#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 +#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 +#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 +#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 #, c-format msgid "Server supports %s" msgstr "Servern stöder %s" -#: fetch-pack.c:914 +#: fetch-pack.c:972 msgid "Server does not support shallow clients" msgstr "Servern stöder inte klienter med grunda arkiv" -#: fetch-pack.c:974 +#: fetch-pack.c:1032 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:979 +#: fetch-pack.c:1037 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:983 +#: fetch-pack.c:1041 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:1000 +#: fetch-pack.c:1058 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:1012 fetch-pack.c:1468 +#: fetch-pack.c:1070 fetch-pack.c:1536 msgid "git fetch-pack: fetch failed." msgstr "git fetch-patch: hämtning misslyckades." -#: fetch-pack.c:1150 +#: fetch-pack.c:1209 msgid "Server does not support shallow requests" msgstr "Servern stöder inte grunda förfrågningar" -#: fetch-pack.c:1157 +#: fetch-pack.c:1216 msgid "Server supports filter" msgstr "Servern stöder filter" -#: fetch-pack.c:1180 +#: fetch-pack.c:1239 msgid "unable to write request to remote" msgstr "kunde inte skriva anrop till fjärren" -#: fetch-pack.c:1198 +#: fetch-pack.c:1257 #, c-format msgid "error reading section header '%s'" msgstr "fel vid läsning av styckehuvudet \"%s\"" -#: fetch-pack.c:1204 +#: fetch-pack.c:1263 #, c-format msgid "expected '%s', received '%s'" msgstr "förväntade \"%s\", tog emot \"%s\"" -#: fetch-pack.c:1243 +#: fetch-pack.c:1303 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "förväntade bekräftelserad: \"%s\"" -#: fetch-pack.c:1248 +#: fetch-pack.c:1308 #, c-format msgid "error processing acks: %d" msgstr "fel vid hantering av bekräftelser: %d" -#: fetch-pack.c:1258 +#: fetch-pack.c:1318 msgid "expected packfile to be sent after 'ready'" msgstr "väntade att paketfil skulle sändas efter \"ready\"" -#: fetch-pack.c:1260 +#: fetch-pack.c:1320 msgid "expected no other sections to be sent after no 'ready'" msgstr "" "väntade inte att några ytterligare sektioner skulle sändas efter \"ready\"" -#: fetch-pack.c:1302 +#: fetch-pack.c:1362 #, c-format msgid "error processing shallow info: %d" msgstr "fel vid hantering av grund (\"shallow\") info: %d" -#: fetch-pack.c:1349 +#: fetch-pack.c:1409 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "förväntade wanted-ref, fick %s" -#: fetch-pack.c:1354 +#: fetch-pack.c:1414 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "oväntad wanted-ref: \"%s\"" -#: fetch-pack.c:1359 +#: fetch-pack.c:1419 #, c-format msgid "error processing wanted refs: %d" msgstr "fel vid hantering av önskade referenser: %d" -#: fetch-pack.c:1693 +#: fetch-pack.c:1762 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1716 builtin/clone.c:685 +#: fetch-pack.c:1785 builtin/clone.c:688 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: fetch-pack.c:1743 +#: fetch-pack.c:1812 #, c-format msgid "no such remote ref %s" msgstr "ingen sådan fjärreferens: %s" -#: fetch-pack.c:1746 +#: fetch-pack.c:1815 #, 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:321 -msgid "gpg failed to sign the data" -msgstr "gpg misslyckades signera data" - -#: gpg-interface.c:347 +#: gpg-interface.c:223 msgid "could not create temporary file" msgstr "kunde inte skapa temporära fil" -#: gpg-interface.c:350 +#: gpg-interface.c:226 #, c-format msgid "failed writing detached signature to '%s'" msgstr "misslyckades skriva fristående signatur till \"%s\"" -#: graph.c:97 +#: gpg-interface.c:390 +msgid "gpg failed to sign the data" +msgstr "gpg misslyckades signera data" + +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors" @@ -3334,7 +3762,7 @@ msgstr "" msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82 +#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" @@ -3390,7 +3818,7 @@ msgid "Low-level Commands / Interrogators" msgstr "Lågnivåkommandon / frågare" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "Lågnivåkommandon / synka arkiv" #: help.c:38 @@ -3556,7 +3984,7 @@ msgstr "tomt ident-namn (för <%s>) ej tillåtet" msgid "name consists only of disallowed characters: %s" msgstr "namnet består enbart av ej tillåtna tecken: %s" -#: ident.c:436 builtin/commit.c:611 +#: ident.c:436 builtin/commit.c:631 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" @@ -3642,7 +4070,7 @@ msgid "failed to read the cache" msgstr "misslyckades läsa cachen" #: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 -#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785 +#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809 #: builtin/stash.c:264 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" @@ -3837,7 +4265,7 @@ msgstr "namnbyte" msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117 +#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Vägrar förlora lortig fil vid \"%s\"" @@ -3881,7 +4309,7 @@ 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:2056 +#: merge-recursive.c:2114 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3892,7 +4320,7 @@ msgstr "" "katalogen %s bytte namn till flera andra kataloger, utan att någon " "destination fick en majoritet av filerna." -#: merge-recursive.c:2088 +#: merge-recursive.c:2146 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3901,7 +4329,7 @@ msgstr "" "KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för " "implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s." -#: merge-recursive.c:2098 +#: merge-recursive.c:2156 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3910,7 +4338,7 @@ msgstr "" "KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till " "%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s" -#: merge-recursive.c:2190 +#: merge-recursive.c:2248 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3919,7 +4347,7 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog " "%s->%s i %s" -#: merge-recursive.c:2435 +#: merge-recursive.c:2493 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -3928,52 +4356,52 @@ msgstr "" "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har " "bytt namn." -#: merge-recursive.c:2961 +#: merge-recursive.c:3019 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:2964 +#: merge-recursive.c:3022 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:3028 +#: merge-recursive.c:3086 msgid "modify" msgstr "ändra" -#: merge-recursive.c:3028 +#: merge-recursive.c:3086 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:3040 +#: merge-recursive.c:3098 msgid "content" msgstr "innehåll" -#: merge-recursive.c:3044 +#: merge-recursive.c:3102 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:3067 +#: merge-recursive.c:3125 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:3089 git-submodule.sh:937 +#: merge-recursive.c:3147 git-submodule.sh:993 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:3090 +#: merge-recursive.c:3148 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3120 +#: merge-recursive.c:3178 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:3203 +#: merge-recursive.c:3261 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -3982,7 +4410,7 @@ msgstr "" "Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; " "flyttar den till %s." -#: merge-recursive.c:3206 +#: merge-recursive.c:3264 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -3991,7 +4419,7 @@ msgstr "" "KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i " "%s, föreslår att den bör flyttas till%s." -#: merge-recursive.c:3210 +#: merge-recursive.c:3268 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4000,7 +4428,7 @@ msgstr "" "Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte " "namn i %s; flyttar den till %s." -#: merge-recursive.c:3213 +#: merge-recursive.c:3271 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4009,60 +4437,60 @@ msgstr "" "KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som " "bytte namn i %s; flyttar den till %s." -#: merge-recursive.c:3327 +#: merge-recursive.c:3385 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:3350 +#: merge-recursive.c:3408 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:3355 +#: merge-recursive.c:3413 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:3362 +#: merge-recursive.c:3420 #, 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:3371 +#: merge-recursive.c:3429 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:3380 +#: merge-recursive.c:3438 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3424 +#: merge-recursive.c:3482 msgid "Already up to date!" msgstr "Redan à jour!" -#: merge-recursive.c:3433 +#: merge-recursive.c:3491 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:3537 +#: merge-recursive.c:3595 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:3550 +#: merge-recursive.c:3608 #, 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:3600 +#: merge-recursive.c:3658 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:3659 +#: merge-recursive.c:3717 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4072,12 +4500,12 @@ msgstr "" "sammanslagning:\n" " %s" -#: merge-recursive.c:3756 +#: merge-recursive.c:3814 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874 +#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -4143,79 +4571,95 @@ msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten" msgid "error preparing packfile from multi-pack-index" msgstr "fel när paketfiler från multi-pack-index skulle förberedas" -#: midx.c:469 +#: midx.c:472 #, c-format msgid "failed to add packfile '%s'" msgstr "misslyckades läsa paketfilen \"%s\"" -#: midx.c:475 +#: midx.c:478 #, c-format msgid "failed to open pack-index '%s'" msgstr "misslyckades öppna paketindexet \"%s\"" -#: midx.c:535 +#: midx.c:538 #, c-format msgid "failed to locate object %d in packfile" msgstr "misslyckades hitta objekt %d i paketfilen" -#: midx.c:864 +#: midx.c:842 +msgid "Adding packfiles to multi-pack-index" +msgstr "Lägger till paketfiler till multi-pack-index" + +#: midx.c:875 #, c-format msgid "did not see pack-file %s to drop" msgstr "såg inte paketfilen %s som skulle kastas" -#: midx.c:1035 +#: midx.c:973 +msgid "Writing chunks to multi-pack-index" +msgstr "Skriver stycken till multi-pack-index" + +#: midx.c:1052 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "misslyckades städa multi-pack-index på %s" -#: midx.c:1090 +#: midx.c:1108 msgid "Looking for referenced packfiles" msgstr "Ser efter refererade packfiler" -#: midx.c:1105 +#: midx.c:1123 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" "oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1109 -msgid "Verifying OID order in MIDX" -msgstr "Bekräftar OID-ordning i MIDX" +#: midx.c:1128 +msgid "Verifying OID order in multi-pack-index" +msgstr "Bekräftar OID-ordning i multi-pack-index" -#: midx.c:1118 +#: midx.c:1137 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1137 +#: midx.c:1157 msgid "Sorting objects by packfile" msgstr "Sorterar objekt efter packfil" -#: midx.c:1143 +#: midx.c:1164 msgid "Verifying object offsets" msgstr "Bekräftar offset för objekt" -#: midx.c:1159 +#: midx.c:1180 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "misslyckades läsa paketpost för oid[%d] = %s" -#: midx.c:1165 +#: midx.c:1186 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "misslyckades läsa paketindex för paketfil %s" -#: midx.c:1174 +#: midx.c:1195 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1349 +#: midx.c:1220 +msgid "Counting referenced objects" +msgstr "Räknar refererade objekt" + +#: midx.c:1230 +msgid "Finding and deleting unreferenced packfiles" +msgstr "Ser efter och tar bort orefererade packfiler" + +#: midx.c:1388 msgid "could not start pack-objects" msgstr "kunde inte starta pack-objects" -#: midx.c:1368 +#: midx.c:1407 msgid "could not finish pack-objects" msgstr "kunde inte avsluta pack-objects" @@ -4303,12 +4747,12 @@ msgstr "hashvärde stämmer inte överens %s" msgid "offset before end of packfile (broken .idx?)" msgstr "offset före slutet av packfilen (trasig .idx?)" -#: packfile.c:1887 +#: packfile.c:1888 #, 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:1891 +#: packfile.c:1892 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex för %s (trunkerat index?)" @@ -4420,34 +4864,34 @@ msgstr "" msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: path.c:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för gruppen" -#: pathspec.c:128 +#: pathspec.c:130 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "Specialtecknet \"\\\" tillåts inte som sista tecken i attributvärde" -#: pathspec.c:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "Endast en \"attr:\"-angivelse tillåten." -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "attr-angivelse kan inte vara tom" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "ogiltigt attributnamn %s" -#: pathspec.c:257 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla" -#: pathspec.c:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -4455,50 +4899,55 @@ msgstr "" "den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra " "globala sökvägsinställningar" -#: pathspec.c:304 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\"" -#: pathspec.c:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Felaktigt sökvägsuttryck \"%.*s\" i \"%s\"" -#: pathspec.c:330 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\"" -#: pathspec.c:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Ej implementerat sökvägsuttryckmagi \"%c\" i \"%s\"" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: \"literal\" och \"glob\" är inkompatibla" -#: pathspec.c:440 +#: pathspec.c:442 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: \"%s\" är utanför arkivet" -#: pathspec.c:514 +#: pathspec.c:516 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "\"%s\" (minnesstöd: \"%c\")" -#: pathspec.c:524 +#: pathspec.c:526 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s" -#: pathspec.c:591 +#: pathspec.c:593 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" +#: pathspec.c:638 +#, c-format +msgid "line is badly quoted: %s" +msgstr "linjen er felaktigt citerad: %s" + #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "kan inte skriva flush-paket" @@ -4559,42 +5008,42 @@ msgstr "Uppdaterar indexet" msgid "unable to create threaded lstat: %s" msgstr "kunde inte skapa trådad lstat: %s" -#: pretty.c:966 +#: pretty.c:981 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" -#: promisor-remote.c:25 +#: promisor-remote.c:23 msgid "Remote with no URL" msgstr "Fjärr utan URL" -#: promisor-remote.c:61 +#: promisor-remote.c:58 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "kontraktsfjärr kan inte börja med \"/\": %s" -#: range-diff.c:71 +#: range-diff.c:75 msgid "could not start `log`" msgstr "kunde inte starta \"log\"" -#: range-diff.c:73 +#: range-diff.c:77 msgid "could not read `log` output" msgstr "kunde inte läsa utdata från \"log\"" -#: range-diff.c:92 sequencer.c:4985 +#: range-diff.c:96 sequencer.c:5163 #, c-format msgid "could not parse commit '%s'" msgstr "kunde inte tolka incheckningen \"%s\"" -#: range-diff.c:118 +#: range-diff.c:122 #, c-format msgid "could not parse git header '%.*s'" msgstr "kunde inte tolka git-huvudet \"%.*s\"" -#: range-diff.c:275 +#: range-diff.c:285 msgid "failed to generate diff" msgstr "misslyckades skapa diff" -#: range-diff.c:507 range-diff.c:509 +#: range-diff.c:518 range-diff.c:520 #, c-format msgid "could not parse log for '%s'" msgstr "kunde inte tolka loggen för \"%s\"" @@ -4634,16 +5083,16 @@ msgstr "kan inte lägga till \"%s\" till indexet" msgid "unable to stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: read-cache.c:1314 +#: read-cache.c:1325 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "\"%s\" finns både som en fil och en katalog" -#: read-cache.c:1520 +#: read-cache.c:1531 msgid "Refresh index" msgstr "Uppdatera indexet" -#: read-cache.c:1635 +#: read-cache.c:1646 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4652,7 +5101,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1645 +#: read-cache.c:1656 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4661,138 +5110,138 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1701 +#: read-cache.c:1712 #, c-format msgid "bad signature 0x%08x" msgstr "felaktig signatur 0x%08x" -#: read-cache.c:1704 +#: read-cache.c:1715 #, c-format msgid "bad index version %d" msgstr "felaktig indexversion %d" -#: read-cache.c:1713 +#: read-cache.c:1724 msgid "bad index file sha1 signature" msgstr "felaktig sha1-signatur för indexfil" -#: read-cache.c:1743 +#: read-cache.c:1754 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "index använder filtillägget %.4s, vilket vi inte förstår" -#: read-cache.c:1745 +#: read-cache.c:1756 #, c-format msgid "ignoring %.4s extension" msgstr "ignorerar filtillägget %.4s" -#: read-cache.c:1782 +#: read-cache.c:1793 #, c-format msgid "unknown index entry format 0x%08x" msgstr "okänt format 0x%08x på indexpost" -#: read-cache.c:1798 +#: read-cache.c:1809 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "felformat namnfält i indexet, nära sökvägen \"%s\"" -#: read-cache.c:1855 +#: read-cache.c:1866 msgid "unordered stage entries in index" msgstr "osorterade köposter i index" -#: read-cache.c:1858 +#: read-cache.c:1869 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "flera köposter för den sammanslagna filen \"%s\"" -#: read-cache.c:1861 +#: read-cache.c:1872 #, c-format msgid "unordered stage entries for '%s'" msgstr "osorterade köposter för \"%s\"" -#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468 -#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347 +#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470 +#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 -#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 +#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "indexfilen trasig" -#: read-cache.c:2108 +#: read-cache.c:2119 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "kunde inte läsa in cache_entries-tråden: %s" -#: read-cache.c:2121 +#: read-cache.c:2132 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "kunde inte utföra join på cache_entries-tråden: %s" -#: read-cache.c:2154 +#: read-cache.c:2165 #, c-format msgid "%s: index file open failed" msgstr "%s: öppning av indexfilen misslyckades" -#: read-cache.c:2158 +#: read-cache.c:2169 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: kan inte ta startus på det öppna indexet" -#: read-cache.c:2162 +#: read-cache.c:2173 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: indexfilen mindre än förväntat" -#: read-cache.c:2166 +#: read-cache.c:2177 #, c-format msgid "%s: unable to map index file" msgstr "%s: kan inte koppla indexfilen" -#: read-cache.c:2208 +#: read-cache.c:2219 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "kunde inte skapa load_index_extensions-tråden: %s" -#: read-cache.c:2235 +#: read-cache.c:2246 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "kunde inte utföra join på load_index_extensions-tråden: %s" -#: read-cache.c:2267 +#: read-cache.c:2278 #, c-format msgid "could not freshen shared index '%s'" msgstr "kunde inte uppdatera delat index \"%s\"" -#: read-cache.c:2314 +#: read-cache.c:2325 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "trasigt index, förväntade %s i %s, fick %s" -#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119 +#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917 +#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" -#: read-cache.c:3126 +#: read-cache.c:3137 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte öppna git-katalog: %s" -#: read-cache.c:3138 +#: read-cache.c:3149 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort länken: %s" -#: read-cache.c:3163 +#: read-cache.c:3174 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "kan inte rätta behörighetsbitar på \"%s\"" -#: read-cache.c:3312 +#: read-cache.c:3323 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: kan inte återgå till kö 0" @@ -4900,8 +5349,8 @@ msgstr "" msgid "Note that empty commits are commented out" msgstr "Observera att tomma incheckningar är utkommenterade" -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388 -#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536 +#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254 #, c-format msgid "could not write '%s'" msgstr "kunde inte skriva \"%s\"" @@ -4975,14 +5424,15 @@ msgstr "referensen \"%s\" finns redan" msgid "unexpected object ID when writing '%s'" msgstr "oväntat objekt-id vid skrivning \"%s\"" -#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851 -#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620 +#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997 +#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142 +#: wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" -#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714 -#: builtin/rebase.c:1004 +#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714 +#: builtin/rebase.c:1031 #, c-format msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" @@ -5644,8 +6094,8 @@ msgstr "kan inte ta bort lös länk \"%s\"" msgid "Recorded preimage for '%s'" msgstr "Sparade förhandsbild för \"%s\"" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1790 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2067 builtin/log.c:1871 +#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" @@ -5679,33 +6129,33 @@ msgstr "Glömde lösning för \"%s\"\n" msgid "unable to open rr-cache directory" msgstr "kan inte uppdatera katalogen rr-cache" -#: revision.c:2509 +#: revision.c:2497 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2512 +#: revision.c:2500 #, 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:2720 +#: revision.c:2708 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" -#: revision.c:2724 +#: revision.c:2712 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L stöder ännu inte andra diff-format än -p och -s" -#: run-command.c:763 +#: run-command.c:762 msgid "open /dev/null failed" msgstr "misslyckades öppna /dev/null" -#: run-command.c:1269 +#: run-command.c:1268 #, c-format msgid "cannot create async thread: %s" msgstr "kan inte skapa asynkron tråd: %s" -#: run-command.c:1333 +#: run-command.c:1332 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -5714,29 +6164,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:142 +#: send-pack.c:144 msgid "unexpected flush packet while reading remote unpack status" msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus" -#: send-pack.c:144 +#: send-pack.c:146 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "kunde inte tolka fjärruppackningsstatus: %s" -#: send-pack.c:146 +#: send-pack.c:148 #, c-format msgid "remote unpack failed: %s" msgstr "fjärruppackning misslyckades: %s" -#: send-pack.c:307 +#: send-pack.c:309 msgid "failed to sign the push certificate" msgstr "misslyckades underteckna push-certifikatet" -#: send-pack.c:421 +#: send-pack.c:423 msgid "the receiving end does not support --signed push" msgstr "mottagarsidan stöder inte push med --signed" -#: send-pack.c:423 +#: send-pack.c:425 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -5744,47 +6194,47 @@ msgstr "" "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --" "signed" -#: send-pack.c:435 +#: send-pack.c:437 msgid "the receiving end does not support --atomic push" msgstr "mottagarsidan stöder inte push med --atomic" -#: send-pack.c:440 +#: send-pack.c:442 msgid "the receiving end does not support push options" msgstr "mottagarsidan stöder inte push-flaggor" -#: sequencer.c:187 +#: sequencer.c:189 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\"" -#: sequencer.c:292 +#: sequencer.c:294 #, c-format msgid "could not delete '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369 +#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:321 +#: sequencer.c:323 msgid "revert" msgstr "revert" -#: sequencer.c:323 +#: sequencer.c:325 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:325 +#: sequencer.c:327 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:327 +#: sequencer.c:329 #, c-format msgid "unknown action: %d" msgstr "okänd funktion: %d" -#: sequencer.c:385 +#: sequencer.c:387 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -5792,7 +6242,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:388 +#: sequencer.c:390 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -5802,44 +6252,44 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:401 sequencer.c:2847 +#: sequencer.c:403 sequencer.c:2993 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:408 +#: sequencer.c:410 #, c-format msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867 -#: sequencer.c:3130 +#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013 +#: sequencer.c:3277 #, c-format msgid "failed to finalize '%s'" msgstr "misslyckades färdigställa \"%s\"" -#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112 -#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117 -#: builtin/rebase.c:568 +#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259 +#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117 +#: builtin/rebase.c:589 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: sequencer.c:462 +#: sequencer.c:464 #, c-format msgid "your local changes would be overwritten by %s." msgstr "dina lokala ändringar skulle skrivas över av %s." -#: sequencer.c:466 +#: sequencer.c:468 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:498 +#: sequencer.c:500 #, c-format msgid "%s: fast-forward" msgstr "%s: snabbspola" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:539 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" @@ -5847,65 +6297,69 @@ msgstr "Felaktigt städningsläge %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:631 +#: sequencer.c:633 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:648 +#: sequencer.c:650 msgid "unable to update cache tree" msgstr "kan inte uppdatera cacheträd" -#: sequencer.c:662 +#: sequencer.c:664 msgid "could not resolve HEAD commit" msgstr "kunde inte bestämma HEAD:s incheckning" -#: sequencer.c:742 +#: sequencer.c:744 #, c-format msgid "no key present in '%.*s'" msgstr "ingen nyckel i \"%.*s\"" -#: sequencer.c:753 +#: sequencer.c:755 #, c-format msgid "unable to dequote value of '%s'" msgstr "kan inte ta bort citering av värdet \"%s\"" -#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046 +#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705 +#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: sequencer.c:800 +#: sequencer.c:802 msgid "'GIT_AUTHOR_NAME' already given" msgstr "\"GIT_AUTHOR_NAME\" har redan angivits" -#: sequencer.c:805 +#: sequencer.c:807 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits" -#: sequencer.c:810 +#: sequencer.c:812 msgid "'GIT_AUTHOR_DATE' already given" msgstr "\"GIT_AUTHOR_DATE\" har redan angivits" -#: sequencer.c:814 +#: sequencer.c:816 #, c-format msgid "unknown variable '%s'" msgstr "okänd variabel \"%s\"" -#: sequencer.c:819 +#: sequencer.c:821 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "\"GIT_AUTHOR_NAME\" saknas" -#: sequencer.c:821 +#: sequencer.c:823 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "\"GIT_AUTHOR_EMAIL\" saknas" -#: sequencer.c:823 +#: sequencer.c:825 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "\"GIT_AUTHOR_DATE\" saknas" -#: sequencer.c:872 +#: sequencer.c:902 sequencer.c:1427 +msgid "malformed ident line" +msgstr "felaktig ident-rad" + +#: sequencer.c:925 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5934,11 +6388,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1146 +#: sequencer.c:1218 msgid "'prepare-commit-msg' hook failed" msgstr "kroken \"prepare-commit-msg\" misslyckades" -#: sequencer.c:1153 +#: sequencer.c:1224 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5965,7 +6419,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1166 +#: sequencer.c:1237 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5990,327 +6444,331 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1208 +#: sequencer.c:1279 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: sequencer.c:1210 +#: sequencer.c:1281 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: sequencer.c:1256 +#: sequencer.c:1327 msgid "unable to resolve HEAD after creating commit" msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning" -#: sequencer.c:1258 +#: sequencer.c:1329 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: sequencer.c:1262 +#: sequencer.c:1333 msgid " (root-commit)" msgstr " (rotincheckning)" -#: sequencer.c:1283 +#: sequencer.c:1354 msgid "could not parse HEAD" msgstr "kunde inte tolka HEAD" -#: sequencer.c:1285 +#: sequencer.c:1356 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s är inte en incheckning!" -#: sequencer.c:1289 builtin/commit.c:1571 +#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: sequencer.c:1341 sequencer.c:1933 +#: sequencer.c:1411 sequencer.c:2055 msgid "unable to parse commit author" msgstr "kunde inte tolka incheckningens författare" -#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684 +#: sequencer.c:1431 +msgid "corrupted author without date information" +msgstr "trasig författare utan datuminformation" + +#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: sequencer.c:1369 sequencer.c:1429 +#: sequencer.c:1480 sequencer.c:1550 #, c-format msgid "unable to read commit message from '%s'" msgstr "kunde inte läsa incheckningsmeddelande från \"%s\"" -#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883 +#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883 #: builtin/merge.c:908 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: sequencer.c:1456 +#: sequencer.c:1577 #, c-format msgid "could not parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: sequencer.c:1461 +#: sequencer.c:1582 #, c-format msgid "could not parse parent commit %s" msgstr "kunde inte tolka föräldraincheckningen %s" -#: sequencer.c:1535 sequencer.c:1645 +#: sequencer.c:1656 sequencer.c:1767 #, c-format msgid "unknown command: %d" msgstr "okänt kommando: %d" -#: sequencer.c:1592 sequencer.c:1617 +#: sequencer.c:1714 sequencer.c:1739 #, c-format msgid "This is a combination of %d commits." msgstr "Det här är en kombination av %d incheckningar." -#: sequencer.c:1602 +#: sequencer.c:1724 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:1604 sequencer.c:3157 +#: sequencer.c:1726 sequencer.c:3304 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:1606 +#: sequencer.c:1728 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:1612 +#: sequencer.c:1734 #, c-format msgid "cannot write '%s'" msgstr "kan inte skriva \"%s\"" -#: sequencer.c:1619 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1741 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Det här är 1:a incheckningsmeddelandet:" -#: sequencer.c:1627 +#: sequencer.c:1749 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:1634 +#: sequencer.c:1756 #, c-format msgid "This is the commit message #%d:" msgstr "Det här är incheckningsmeddelande %d:" -#: sequencer.c:1640 +#: sequencer.c:1762 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Incheckningsmeddelande %d kommer hoppas över:" -#: sequencer.c:1728 +#: sequencer.c:1850 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:1735 +#: sequencer.c:1857 msgid "cannot fixup root commit" msgstr "kan inte göra \"fixup\" på rotincheckning" -#: sequencer.c:1754 +#: sequencer.c:1876 #, 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:1762 sequencer.c:1770 +#: sequencer.c:1884 sequencer.c:1892 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:1776 +#: sequencer.c:1898 #, 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:1795 +#: sequencer.c:1917 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:1860 +#: sequencer.c:1982 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:1915 +#: sequencer.c:2037 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:1916 +#: sequencer.c:2038 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:1983 +#: sequencer.c:2105 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:1990 +#: sequencer.c:2112 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:2066 +#: sequencer.c:2189 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s tar inte argument: \"%s\"" -#: sequencer.c:2075 +#: sequencer.c:2198 #, c-format msgid "missing arguments for %s" msgstr "argument saknas för %s" -#: sequencer.c:2112 +#: sequencer.c:2235 #, c-format msgid "could not parse '%.*s'" msgstr "kunde inte tolka \"%.*s\"" -#: sequencer.c:2166 +#: sequencer.c:2289 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:2177 +#: sequencer.c:2300 #, c-format msgid "cannot '%s' without a previous commit" msgstr "kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178 -#: builtin/rebase.c:204 builtin/rebase.c:229 +#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197 +#: builtin/rebase.c:223 builtin/rebase.c:248 #, c-format msgid "could not read '%s'." msgstr "kunde inte läsa \"%s\"." -#: sequencer.c:2261 +#: sequencer.c:2384 msgid "cancelling a cherry picking in progress" msgstr "avbryter pågående \"cherry-pick\"" -#: sequencer.c:2268 +#: sequencer.c:2391 msgid "cancelling a revert in progress" msgstr "avbryter pågående \"revert\"" -#: sequencer.c:2302 +#: sequencer.c:2435 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:2304 +#: sequencer.c:2437 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: \"%s\"" -#: sequencer.c:2309 +#: sequencer.c:2442 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:2320 +#: sequencer.c:2453 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:2322 +#: sequencer.c:2455 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:2404 +#: sequencer.c:2533 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:2491 +#: sequencer.c:2630 msgid "unusable squash-onto" msgstr "oanvändbar squash-onto" -#: sequencer.c:2507 +#: sequencer.c:2646 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: \"%s\"" -#: sequencer.c:2590 sequencer.c:4308 +#: sequencer.c:2736 sequencer.c:4463 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:2606 +#: sequencer.c:2752 msgid "revert is already in progress" msgstr "en \"revert\" pågår redan" -#: sequencer.c:2608 +#: sequencer.c:2754 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "testa \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2611 +#: sequencer.c:2757 msgid "cherry-pick is already in progress" msgstr "en \"cherry-pick\" pågår redan" -#: sequencer.c:2613 +#: sequencer.c:2759 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2627 +#: sequencer.c:2773 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:2642 +#: sequencer.c:2788 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:2702 sequencer.c:4057 +#: sequencer.c:2848 sequencer.c:4209 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:2704 sequencer.c:2715 +#: sequencer.c:2850 sequencer.c:2861 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:2706 sequencer.c:2750 +#: sequencer.c:2852 sequencer.c:2896 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:2736 builtin/grep.c:736 +#: sequencer.c:2882 builtin/grep.c:736 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:2738 +#: sequencer.c:2884 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:2739 +#: sequencer.c:2885 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:2745 +#: sequencer.c:2891 #, 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:2756 +#: sequencer.c:2902 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:2797 +#: sequencer.c:2943 msgid "no revert in progress" msgstr "ingen \"revers\" pågår" -#: sequencer.c:2805 +#: sequencer.c:2951 msgid "no cherry-pick in progress" msgstr "ingen \"cherry-pick\" pågår" -#: sequencer.c:2815 +#: sequencer.c:2961 msgid "failed to skip the commit" msgstr "kunde inte hoppa över incheckningen" -#: sequencer.c:2822 +#: sequencer.c:2968 msgid "there is nothing to skip" msgstr "ingenting att hoppa över" -#: sequencer.c:2825 +#: sequencer.c:2971 #, c-format msgid "" "have you committed already?\n" @@ -6319,21 +6777,21 @@ msgstr "" "har du redan checkat in?\n" "testa \"git %s --continue\"" -#: sequencer.c:2949 sequencer.c:3969 +#: sequencer.c:3095 sequencer.c:4121 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:2987 sequencer.c:3949 +#: sequencer.c:3134 sequencer.c:4101 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:3004 +#: sequencer.c:3151 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "kan inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3012 +#: sequencer.c:3159 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6352,27 +6810,22 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:3022 +#: sequencer.c:3169 #, c-format msgid "Could not apply %s... %.*s" msgstr "Kunde inte tillämpa %s... %.*s" -#: sequencer.c:3029 +#: sequencer.c:3176 #, c-format msgid "Could not merge %.*s" msgstr "Kunde inte slå ihop %.*s" -#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641 +#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613 -#: builtin/rebase.c:1987 builtin/rebase.c:2031 -msgid "could not read index" -msgstr "kunde inte läsa indexet" - -#: sequencer.c:3074 +#: sequencer.c:3221 #, c-format msgid "" "execution failed: %s\n" @@ -6387,11 +6840,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3080 +#: sequencer.c:3227 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:3086 +#: sequencer.c:3233 #, c-format msgid "" "execution succeeded: %s\n" @@ -6408,76 +6861,72 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3147 +#: sequencer.c:3294 #, c-format msgid "illegal label name: '%.*s'" msgstr "ogiltigt etikettnamn: \"%.*s\"" -#: sequencer.c:3201 +#: sequencer.c:3348 msgid "writing fake root commit" msgstr "skriver fejkad rotincheckning" -#: sequencer.c:3206 +#: sequencer.c:3353 msgid "writing squash-onto" msgstr "skriver squash-onto" -#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861 +#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882 #, c-format msgid "failed to find tree of %s" msgstr "kunde inte hitta trädet för %s." -#: sequencer.c:3262 builtin/rebase.c:874 -msgid "could not write index" -msgstr "kunde inte skriva indexet" - -#: sequencer.c:3289 +#: sequencer.c:3436 #, c-format msgid "could not resolve '%s'" msgstr "kunde inte upplösa \"%s\"" -#: sequencer.c:3320 +#: sequencer.c:3467 msgid "cannot merge without a current revision" msgstr "kan inte slå ihop utan en aktuell incheckning" -#: sequencer.c:3342 +#: sequencer.c:3489 #, c-format msgid "unable to parse '%.*s'" msgstr "kan inte tolka \"%.*s\"" -#: sequencer.c:3351 +#: sequencer.c:3498 #, c-format msgid "nothing to merge: '%.*s'" msgstr "inget att slå samman: \"%.*s\"" -#: sequencer.c:3363 +#: sequencer.c:3510 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:3378 +#: sequencer.c:3526 #, c-format msgid "could not get commit message of '%s'" msgstr "kunde inte läsa incheckningsmeddelande för \"%s\"" -#: sequencer.c:3538 +#: sequencer.c:3688 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "kunde inte ens försöka slå ihop \"%.*s\"" -#: sequencer.c:3554 +#: sequencer.c:3704 msgid "merge: Unable to write new index file" msgstr "sammanslagning: Kunde inte skriva ny indexfil" -#: sequencer.c:3623 builtin/rebase.c:712 +#: sequencer.c:3773 builtin/rebase.c:733 #, c-format msgid "Applied autostash.\n" msgstr "Tillämpade autostash.\n" -#: sequencer.c:3635 +#: sequencer.c:3785 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6488,31 +6937,31 @@ msgstr "" "Dina ändringar är säkra i stashen.\n" "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" -#: sequencer.c:3699 +#: sequencer.c:3849 #, c-format msgid "could not checkout %s" msgstr "kunde inte checka ut %s" -#: sequencer.c:3713 +#: sequencer.c:3863 #, c-format msgid "%s: not a valid OID" msgstr "%s: inte ett giltigt OID" -#: sequencer.c:3718 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3868 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" -#: sequencer.c:3733 +#: sequencer.c:3883 #, c-format msgid "Stopped at HEAD\n" msgstr "Stoppade på HEAD\n" -#: sequencer.c:3735 +#: sequencer.c:3885 #, c-format msgid "Stopped at %s\n" msgstr "Stoppade på %s\n" -#: sequencer.c:3743 +#: sequencer.c:3893 #, c-format msgid "" "Could not execute the todo command\n" @@ -6533,48 +6982,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3827 +#: sequencer.c:3979 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:3898 +#: sequencer.c:4050 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:3957 +#: sequencer.c:4109 msgid "could not read orig-head" msgstr "kunde inte läsa orig-head" -#: sequencer.c:3962 +#: sequencer.c:4114 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:3976 +#: sequencer.c:4128 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:4069 +#: sequencer.c:4221 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:4078 +#: sequencer.c:4230 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:4080 +#: sequencer.c:4232 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:4082 +#: sequencer.c:4234 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:4085 +#: sequencer.c:4237 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6584,42 +7033,42 @@ msgstr "" "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" "först och kör sedan \"git rebase --continue\" igen." -#: sequencer.c:4121 sequencer.c:4159 +#: sequencer.c:4273 sequencer.c:4312 #, c-format msgid "could not write file: '%s'" msgstr "kunde inte skriva fil: \"%s\"" -#: sequencer.c:4174 +#: sequencer.c:4327 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:4181 +#: sequencer.c:4334 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:4285 +#: sequencer.c:4440 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:4289 +#: sequencer.c:4444 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:4324 +#: sequencer.c:4479 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" -#: sequencer.c:4774 +#: sequencer.c:4952 msgid "make_script: unhandled options" msgstr "make_script: flaggor som inte stöds" -#: sequencer.c:4777 +#: sequencer.c:4955 msgid "make_script: error preparing revisions" msgstr "make_script: fel när revisioner skulle förberedas" -#: sequencer.c:4935 +#: sequencer.c:5113 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -6629,15 +7078,15 @@ msgstr "" "continue\".\n" "Avbryt ombaseringen med \"git rebase --abort\".\n" -#: sequencer.c:5047 sequencer.c:5064 +#: sequencer.c:5226 sequencer.c:5243 msgid "nothing to do" msgstr "inget att göra" -#: sequencer.c:5078 +#: sequencer.c:5257 msgid "could not skip unnecessary pick commands" msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon" -#: sequencer.c:5166 +#: sequencer.c:5351 msgid "the script was already rearranged." msgstr "skriptet har redan omordnats." @@ -6808,12 +7257,12 @@ msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates" #: sha1-file.c:503 #, c-format msgid "unable to normalize alternate object path: %s" -msgstr "kunde inte normalisera alternativ objektsökväg: %s" +msgstr "kunde inte normalisera supplerande objektsökväg: %s" #: sha1-file.c:575 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" -msgstr "%s: ignorerar alternativa objektlagringar, för djup nästling" +msgstr "%s: ignorerar supplerande objektlager, för djup nästling" #: sha1-file.c:582 #, c-format @@ -6822,7 +7271,7 @@ msgstr "kan inte normalisera objektkatalogen: %s" #: sha1-file.c:625 msgid "unable to fdopen alternates lockfile" -msgstr "kan inte utföra \"fdopen\" på låsfil för \"alternates\"" +msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil" #: sha1-file.c:643 msgid "unable to read alternates file" @@ -6860,7 +7309,7 @@ msgstr "referensarkivet \"%s\" är ympat" #: sha1-file.c:791 #, c-format msgid "invalid line while parsing alternate refs: %s" -msgstr "felaktig rad vid tolkning av alternativa referenser: %s" +msgstr "felaktig rad vid tolkning av supplerande referenser: %s" #: sha1-file.c:943 #, c-format @@ -7138,6 +7587,11 @@ msgid_plural "%u bytes/s" msgstr[0] "%u byte/s" msgstr[1] "%u bytes/s" +#: strbuf.c:1149 +#, c-format +msgid "could not edit '%s'" +msgstr "kunde inte redigera \"%s\"" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -7173,7 +7627,7 @@ msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning" -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens." @@ -7212,7 +7666,12 @@ msgstr "undermodulen \"%s\" har ett smutsigt index" msgid "Submodule '%s' could not be updated." msgstr "Undermoduler \"%s\" kunde inte uppdateras." -#: submodule.c:2007 +#: submodule.c:2027 +#, c-format +msgid "submodule git dir '%s' is inside git dir '%.*s'" +msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\"" + +#: submodule.c:2048 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7220,12 +7679,17 @@ msgstr "" "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " "stöds ej" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:2060 submodule.c:2119 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" -#: submodule.c:2026 +#: submodule.c:2064 +#, c-format +msgid "refusing to move '%s' into an existing git dir" +msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog" + +#: submodule.c:2071 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7236,16 +7700,16 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:2109 +#: submodule.c:2154 #, c-format msgid "could not recurse into submodule '%s'" msgstr "kunde inte rekursera in i undermodulen \"%s\"" -#: submodule.c:2153 +#: submodule.c:2198 msgid "could not start ls-files in .." msgstr "kunde inte starta ls-files i .." -#: submodule.c:2192 +#: submodule.c:2237 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en oväntad returkod %d" @@ -7264,12 +7728,12 @@ msgstr "negativa värden är inte tillåtna för submodule.fetchjobs" msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "ignorerar \"%s\" som kan tolkas som en kommandoradsflagga: %s" -#: submodule-config.c:490 +#: submodule-config.c:498 #, c-format msgid "invalid value for %s" msgstr "ogiltigt värde för %s" -#: submodule-config.c:761 +#: submodule-config.c:769 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Kunde inte uppdatera .gitmodules-posten %s" @@ -7417,7 +7881,7 @@ msgstr "Avbryter." msgid "failed to push all needed submodules" msgstr "kunde inte sända alla nödvändiga undermoduler" -#: transport.c:1345 transport-helper.c:655 +#: transport.c:1345 transport-helper.c:656 msgid "operation not supported by protocol" msgstr "funktionen stöds inte av protokollet" @@ -7430,7 +7894,7 @@ msgstr "komplett skrivning till fjärrhjälpare misslyckades" msgid "unable to find remote helper for '%s'" msgstr "kan inte hitta fjärrhjälpare för \"%s\"" -#: transport-helper.c:160 transport-helper.c:569 +#: transport-helper.c:160 transport-helper.c:570 msgid "can't dup helper output fd" msgstr "kunde inte duplicera utdata-filhandtag" @@ -7459,90 +7923,90 @@ msgstr "%s sade oväntat: \"%s\"" msgid "%s also locked %s" msgstr "%s låste också %s" -#: transport-helper.c:491 +#: transport-helper.c:492 msgid "couldn't run fast-import" msgstr "kunde inte köra fast-import" -#: transport-helper.c:514 +#: transport-helper.c:515 msgid "error while running fast-import" msgstr "fel när fast-import kördes" -#: transport-helper.c:543 transport-helper.c:1132 +#: transport-helper.c:544 transport-helper.c:1133 #, c-format msgid "could not read ref %s" msgstr "kunde inte läsa referensen %s" -#: transport-helper.c:588 +#: transport-helper.c:589 #, c-format msgid "unknown response to connect: %s" msgstr "okänt svar på ansluntning: %s" -#: transport-helper.c:610 +#: transport-helper.c:611 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:612 +#: transport-helper.c:613 msgid "invalid remote service path" msgstr "felaktig sökväg till fjärrtjänst" -#: transport-helper.c:658 +#: transport-helper.c:659 #, c-format msgid "can't connect to subservice %s" msgstr "kan inte ansluta till undertjänsten %s" -#: transport-helper.c:734 +#: transport-helper.c:735 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\"" -#: transport-helper.c:787 +#: transport-helper.c:788 #, c-format msgid "helper reported unexpected status of %s" msgstr "hjälparen returnerade oväntad status %s" -#: transport-helper.c:848 +#: transport-helper.c:849 #, c-format msgid "helper %s does not support dry-run" msgstr "hjälparen %s stöder inte dry-run" -#: transport-helper.c:851 +#: transport-helper.c:852 #, c-format msgid "helper %s does not support --signed" msgstr "hjälparen %s stöder inte --signed" -#: transport-helper.c:854 +#: transport-helper.c:855 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "hjälparen %s stöder inte --signed=if-asked" -#: transport-helper.c:859 +#: transport-helper.c:860 #, c-format msgid "helper %s does not support --atomic" msgstr "hjälparen %s stöder inte --atomic" -#: transport-helper.c:865 +#: transport-helper.c:866 #, c-format msgid "helper %s does not support 'push-option'" msgstr "hjälparen %s stöder inte \"push-option\"" -#: transport-helper.c:963 +#: transport-helper.c:964 msgid "remote-helper doesn't support push; refspec needed" msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs" -#: transport-helper.c:968 +#: transport-helper.c:969 #, c-format msgid "helper %s does not support 'force'" msgstr "hjälparen %s stöder inte \"force\"" -#: transport-helper.c:1015 +#: transport-helper.c:1016 msgid "couldn't run fast-export" msgstr "kunde inte köra fast-export" -#: transport-helper.c:1020 +#: transport-helper.c:1021 msgid "error while running fast-export" msgstr "fel vid körning av fast-export" -#: transport-helper.c:1045 +#: transport-helper.c:1046 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -7551,47 +8015,47 @@ msgstr "" "Inga gemensamma referenser och inga angavs; gör inget.\n" "Du kanske borde ange en gren såsom \"master\".\n" -#: transport-helper.c:1118 +#: transport-helper.c:1119 #, c-format msgid "malformed response in ref list: %s" msgstr "felformat svar i referenslistan: %s" -#: transport-helper.c:1270 +#: transport-helper.c:1271 #, c-format msgid "read(%s) failed" msgstr "läs(%s) misslyckades" -#: transport-helper.c:1297 +#: transport-helper.c:1298 #, c-format msgid "write(%s) failed" msgstr "skriv(%s) misslyckades" -#: transport-helper.c:1346 +#: transport-helper.c:1347 #, c-format msgid "%s thread failed" msgstr "%s-tråden misslyckades" -#: transport-helper.c:1350 +#: transport-helper.c:1351 #, c-format msgid "%s thread failed to join: %s" msgstr "%s-tråden misslyckades ansluta: %s" -#: transport-helper.c:1369 transport-helper.c:1373 +#: transport-helper.c:1370 transport-helper.c:1374 #, 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:1410 +#: transport-helper.c:1411 #, c-format msgid "%s process failed to wait" msgstr "processen %s misslyckades vänta" -#: transport-helper.c:1414 +#: transport-helper.c:1415 #, c-format msgid "%s process failed" msgstr "processen %s misslyckades" -#: transport-helper.c:1432 transport-helper.c:1441 +#: transport-helper.c:1433 transport-helper.c:1442 msgid "can't start thread for copying data" msgstr "kan inte skapa tråd för kopiering av data" @@ -7607,7 +8071,12 @@ msgstr "felformat läge i trädpost" msgid "empty filename in tree entry" msgstr "tomt filnamn i trädpost" -#: tree-walk.c:118 +#: tree-walk.c:48 +#, c-format +msgid "filename in tree entry contains backslash: '%s'" +msgstr "filnamnet i trädet innehåller omvänt snedstreck: \"%s\"" + +#: tree-walk.c:124 msgid "too-short tree file" msgstr "trädfil för kort" @@ -7857,6 +8326,10 @@ msgstr "" "sökvägar på ett okänsligt filsystem) och endast en från samma\n" "kollisionsgrupp finns i arbetskatalogen:\n" +#: unpack-trees.c:1441 +msgid "Updating index flags" +msgstr "Uppdaterar indexflaggor" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "ogiltig URL-schemanamn eller saknat \"://\"-suffix" @@ -8452,131 +8925,131 @@ msgstr "dessutom innehåller dit index ändringar som inte har checkats in." 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:452 +#: compat/precompose_utf8.c:58 builtin/clone.c:455 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" -#: builtin/add.c:25 +#: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<flaggor>] [--] <sökväg>..." -#: builtin/add.c:84 +#: builtin/add.c:87 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:92 builtin/commit.c:288 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:99 +#: builtin/add.c:102 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:174 +#: builtin/add.c:177 msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:234 builtin/rev-parse.c:897 +#: builtin/add.c:252 builtin/rev-parse.c:899 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:245 +#: builtin/add.c:263 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning." -#: builtin/add.c:249 +#: builtin/add.c:267 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:252 +#: builtin/add.c:270 msgid "editing patch failed" msgstr "redigering av patch misslyckades" -#: builtin/add.c:255 +#: builtin/add.c:273 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:257 +#: builtin/add.c:275 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:262 +#: builtin/add.c:280 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:270 +#: builtin/add.c:288 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" -#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547 -#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 +#: builtin/add.c:308 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:548 +#: builtin/remote.c:1344 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:293 +#: builtin/add.c:311 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:312 builtin/checkout.c:1482 builtin/reset.c:307 msgid "select hunks interactively" msgstr "välj stycken interaktivt" -#: builtin/add.c:295 +#: builtin/add.c:313 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:296 +#: builtin/add.c:314 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:297 +#: builtin/add.c:315 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:298 +#: builtin/add.c:316 msgid "renormalize EOL of tracked files (implies -u)" msgstr "åternormalisera radslut i spårade filer (implicerar -u)" -#: builtin/add.c:299 +#: builtin/add.c:317 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:300 +#: builtin/add.c:318 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:303 +#: builtin/add.c:321 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:305 +#: builtin/add.c:323 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:306 +#: builtin/add.c:324 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:307 +#: builtin/add.c:325 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:1002 +#: builtin/add.c:327 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" -#: builtin/add.c:311 +#: builtin/add.c:329 msgid "warn when adding an embedded repository" msgstr "varna när ett inbyggt arkiv läggs till" -#: builtin/add.c:326 +#: builtin/add.c:347 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -8607,39 +9080,57 @@ msgstr "" "\n" "Se \"git help submodule\" för ytterligare information." -#: builtin/add.c:354 +#: builtin/add.c:375 #, c-format msgid "adding embedded git repository: %s" msgstr "lägger till inbäddat git-arkiv: %s" -#: builtin/add.c:372 +#: builtin/add.c:393 #, 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:379 +#: builtin/add.c:400 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:419 +#: builtin/add.c:428 builtin/commit.c:348 +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch" + +#: builtin/add.c:434 +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "--pathspec-from-file är inkompatibelt med --edit" + +#: builtin/add.c:446 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:426 +#: builtin/add.c:449 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" -#: builtin/add.c:430 +#: builtin/add.c:453 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x" -#: builtin/add.c:445 +#: builtin/add.c:471 builtin/checkout.c:1648 builtin/commit.c:354 +#: builtin/reset.c:327 +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar" + +#: builtin/add.c:478 builtin/checkout.c:1660 builtin/commit.c:360 +#: builtin/reset.c:333 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "--pathspec-file-nul kräver --pathspec-from-file" + +#: builtin/add.c:482 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:446 +#: builtin/add.c:483 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" @@ -8692,7 +9183,7 @@ msgstr "ogiltig tidszons-offset" msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:948 builtin/clone.c:406 +#: builtin/am.c:948 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" @@ -8785,7 +9276,7 @@ msgstr "Incheckningskroppen är:" 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:1695 builtin/commit.c:374 +#: builtin/am.c:1695 builtin/commit.c:394 msgid "unable to write index file" msgstr "kan inte skriva indexfil" @@ -8835,8 +9326,8 @@ msgstr "" "lösta.\n" "Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den." -#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346 +#: builtin/reset.c:354 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"." @@ -8879,7 +9370,7 @@ msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" #: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:297 builtin/stash.c:812 +#: builtin/repack.c:304 builtin/stash.c:811 msgid "be quiet" msgstr "var tyst" @@ -8921,12 +9412,12 @@ msgstr "ta bort allting före en saxlinje" msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249 -#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442 -#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314 +#: builtin/am.c:2203 builtin/commit.c:1386 builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:676 builtin/grep.c:883 builtin/merge.c:249 +#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1469 +#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:150 parse-options.h:171 parse-options.h:312 +#: parse-options.h:154 parse-options.h:175 parse-options.h:316 msgid "n" msgstr "n" @@ -8975,13 +9466,13 @@ msgstr "ljug om incheckningsdatum" msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511 -#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490 -#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1507 +#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:509 +#: builtin/rebase.c:1513 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484 +#: builtin/am.c:2242 builtin/rebase.c:510 builtin/rebase.c:1514 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" @@ -9143,7 +9634,7 @@ msgstr "Vi utför ingen bisect för tillfället.\n" msgid "'%s' is not a valid commit" msgstr "\"%s\" är inte en giltig incheckning" -#: builtin/bisect--helper.c:174 +#: builtin/bisect--helper.c:172 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -9151,27 +9642,27 @@ msgstr "" "Kunde inte checka ut original-HEAD \"%s\". Försök \"git bisect reset " "<incheckning>\"." -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:216 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Felaktigt argument till bisect_write: %s" -#: builtin/bisect--helper.c:220 +#: builtin/bisect--helper.c:221 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "kan inte läsa oid för referensen \"%s\"" -#: builtin/bisect--helper.c:232 +#: builtin/bisect--helper.c:233 #, c-format msgid "couldn't open the file '%s'" msgstr "kunde inte öppna filen \"%s\"" -#: builtin/bisect--helper.c:258 +#: builtin/bisect--helper.c:259 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Ogiltigt kommando: du utför just nu en \"bisect\" med %s/%s." -#: builtin/bisect--helper.c:285 +#: builtin/bisect--helper.c:286 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -9180,7 +9671,7 @@ msgstr "" "Du måste ange åtminstone en %s och en %s version.\n" "(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)" -#: builtin/bisect--helper.c:289 +#: builtin/bisect--helper.c:290 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9191,7 +9682,7 @@ msgstr "" "Du måste sedan ange åtminstone en %s och en %s version.\n" "(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)" -#: builtin/bisect--helper.c:321 +#: builtin/bisect--helper.c:322 #, c-format msgid "bisecting only with a %s commit" msgstr "utför bisect med endast en %s incheckning" @@ -9200,15 +9691,15 @@ msgstr "utför bisect med endast en %s incheckning" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:329 +#: builtin/bisect--helper.c:330 msgid "Are you sure [Y/n]? " msgstr "Är du säker [Y=ja/N=nej]? " -#: builtin/bisect--helper.c:376 +#: builtin/bisect--helper.c:377 msgid "no terms defined" msgstr "inga termer angivna" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:380 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -9217,7 +9708,7 @@ msgstr "" "Aktuella termer är %s för det gamla tillståndet\n" "och %s för det nya tillståndet.\n" -#: builtin/bisect--helper.c:389 +#: builtin/bisect--helper.c:390 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -9226,113 +9717,113 @@ msgstr "" "ogiltigt argument %s för \"git bisect terms\".\n" "Flaggor som stöds är: --term-good|--term-old och --term-bad|--term-new." -#: builtin/bisect--helper.c:475 +#: builtin/bisect--helper.c:476 #, c-format msgid "unrecognized option: '%s'" msgstr "okänd flagga: %s" -#: builtin/bisect--helper.c:479 +#: builtin/bisect--helper.c:480 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "\"%s\" verkar inte vara en giltig revision" -#: builtin/bisect--helper.c:511 +#: builtin/bisect--helper.c:512 msgid "bad HEAD - I need a HEAD" msgstr "felaktigt HEAD - Jag behöver ett HEAD" -#: builtin/bisect--helper.c:526 +#: builtin/bisect--helper.c:527 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "misslyckades checka ut \"%s\". Försök \"git bisect reset <giltig_gren>\"." # cogito-relaterat -#: builtin/bisect--helper.c:547 +#: builtin/bisect--helper.c:548 msgid "won't bisect on cg-seek'ed tree" msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts" -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:551 msgid "bad HEAD - strange symbolic ref" msgstr "felaktigt HEAD - konstig symbolisk referens" -#: builtin/bisect--helper.c:574 +#: builtin/bisect--helper.c:575 #, c-format msgid "invalid ref: '%s'" msgstr "ogiltig referens: \"%s\"" -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:631 msgid "perform 'git bisect next'" msgstr "utför 'git bisect next'" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:633 msgid "write the terms to .git/BISECT_TERMS" msgstr "skriv termerna i .git/BISECT_TERMS" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:635 msgid "cleanup the bisection state" msgstr "städar upp bisect-tillstånd" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:637 msgid "check for expected revs" msgstr "kontrollera för förväntade versioner" -#: builtin/bisect--helper.c:638 +#: builtin/bisect--helper.c:639 msgid "reset the bisection state" msgstr "återställ bisect-tillstånd" -#: builtin/bisect--helper.c:640 +#: builtin/bisect--helper.c:641 msgid "write out the bisection state in BISECT_LOG" msgstr "skriver bisect-tillståndet i BISECT_LOG" -#: builtin/bisect--helper.c:642 +#: builtin/bisect--helper.c:643 msgid "check and set terms in a bisection state" msgstr "visa och ange termer för bisect-tillstånd" -#: builtin/bisect--helper.c:644 +#: builtin/bisect--helper.c:645 msgid "check whether bad or good terms exist" msgstr "se efter om termer för rätt och fel finns" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:647 msgid "print out the bisect terms" msgstr "skriv ut termer för bisect" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:649 msgid "start the bisect session" msgstr "påbörja bisect-körningen" -#: builtin/bisect--helper.c:650 +#: builtin/bisect--helper.c:651 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:653 msgid "no log for BISECT_WRITE" msgstr "ingen logg för BISECT_WRITE" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:670 msgid "--write-terms requires two arguments" msgstr "--write-terms kräver två argument" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:674 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state tar inga argument" -#: builtin/bisect--helper.c:680 +#: builtin/bisect--helper.c:681 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset kräver antingen inget argument eller en incheckning" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:685 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write kräver antingen 4 eller 5 argument" -#: builtin/bisect--helper.c:690 +#: builtin/bisect--helper.c:691 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms kräver tre argument" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:697 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check kräver 2 eller 3 argument" -#: builtin/bisect--helper.c:702 +#: builtin/bisect--helper.c:703 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms kräver noll eller ett argument" @@ -9431,7 +9922,7 @@ msgstr "Visa författarens e-post istället för namn (Standard: av)" msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:860 builtin/log.c:1630 +#: builtin/blame.c:860 builtin/log.c:1702 msgid "rev" msgstr "rev" @@ -9451,43 +9942,39 @@ msgstr "färglägg redundant metadata från tidigare rader annorlunda" msgid "color lines by age" msgstr "färglägg rader efter ålder" -#: builtin/blame.c:870 -msgid "Use an experimental heuristic to improve diffs" -msgstr "Använd en experimentell algoritm för att förbättra diffar" - -#: builtin/blame.c:872 +#: builtin/blame.c:864 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:873 +#: builtin/blame.c:865 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:874 +#: builtin/blame.c:866 msgid "Use <file>'s contents as the final image" msgstr "Använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:875 builtin/blame.c:876 +#: builtin/blame.c:867 builtin/blame.c:868 msgid "score" msgstr "poäng" -#: builtin/blame.c:875 +#: builtin/blame.c:867 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:876 +#: builtin/blame.c:868 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:877 +#: builtin/blame.c:869 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:877 +#: builtin/blame.c:869 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med början på 1" -#: builtin/blame.c:929 +#: builtin/blame.c:921 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress kan inte användas med --incremental eller porslinsformat" @@ -9499,18 +9986,18 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:972 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" -#: builtin/blame.c:1087 +#: builtin/blame.c:1079 #, 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:1133 +#: builtin/blame.c:1125 msgid "Blaming lines" msgstr "Klandra rader" @@ -9720,7 +10207,7 @@ msgstr "ställ in spårningsläge (se git-pull(1))" msgid "do not use" msgstr "använd ej" -#: builtin/branch.c:626 builtin/rebase.c:486 +#: builtin/branch.c:626 builtin/rebase.c:505 msgid "upstream" msgstr "uppströms" @@ -9729,8 +10216,8 @@ msgid "change the upstream info" msgstr "ändra uppströmsinformationen" #: builtin/branch.c:627 -msgid "Unset the upstream info" -msgstr "Ta bort uppströmsinformationen" +msgid "unset the upstream info" +msgstr "ta bort uppströmsinformationen" #: builtin/branch.c:628 msgid "use colored output" @@ -9831,7 +10318,7 @@ msgstr "sortering och filtrering skiljer gemener och VERSALER" msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/branch.c:684 builtin/clone.c:760 +#: builtin/branch.c:684 builtin/clone.c:784 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" @@ -9920,19 +10407,64 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " "eller --set-upstream-to istället." -#: builtin/bundle.c:45 -#, c-format -msgid "%s is okay\n" -msgstr "%s är okej\n" +#: builtin/bundle.c:15 builtin/bundle.c:23 +msgid "git bundle create [<options>] <file> <git-rev-list args>" +msgstr "git bundle create [<flaggor>] <fil> <git-rev-list-flaggor>" + +#: builtin/bundle.c:16 builtin/bundle.c:28 +msgid "git bundle verify [<options>] <file>" +msgstr "git bundle verify [<flaggor>] <fil>" -#: builtin/bundle.c:58 +#: builtin/bundle.c:17 builtin/bundle.c:33 +msgid "git bundle list-heads <file> [<refname>...]" +msgstr "git bundle list-heads <fil> [<refnamn>...]" + +#: builtin/bundle.c:18 builtin/bundle.c:38 +msgid "git bundle unbundle <file> [<refname>...]" +msgstr "git bundle unbundle <fil> [<refnamn>...]" + +#: builtin/bundle.c:66 builtin/pack-objects.c:3228 +msgid "do not show progress meter" +msgstr "visa inte förloppsindikator" + +#: builtin/bundle.c:68 builtin/pack-objects.c:3230 +msgid "show progress meter" +msgstr "visa förloppsindikator" + +#: builtin/bundle.c:70 builtin/pack-objects.c:3232 +msgid "show progress meter during object writing phase" +msgstr "visa förloppsindikator under objektskrivningsfasen" + +#: builtin/bundle.c:73 builtin/pack-objects.c:3235 +msgid "similar to --all-progress when progress meter is shown" +msgstr "som --all-progress när förloppsindikatorn visas" + +#: builtin/bundle.c:93 msgid "Need a repository to create a bundle." msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." -#: builtin/bundle.c:62 +#: builtin/bundle.c:104 +msgid "do not show bundle details" +msgstr "visa inte paketdetaljer" + +#: builtin/bundle.c:119 +#, c-format +msgid "%s is okay\n" +msgstr "%s är okej\n" + +#: builtin/bundle.c:160 msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." +#: builtin/bundle.c:168 builtin/remote.c:1609 +msgid "be verbose; must be placed before a subcommand" +msgstr "var pratsam; måste skrivas före ett underkommando" + +#: builtin/bundle.c:190 builtin/remote.c:1640 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Okänt underkommando: %s" + #: builtin/cat-file.c:595 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" @@ -9981,7 +10513,7 @@ msgstr "för blob-objekt, kör filter på objektets innehåll" msgid "for blob objects, run filters on object's content" msgstr "för blob-objekt, kör filger på objektets innehåll" -#: builtin/cat-file.c:645 git-submodule.sh:936 +#: builtin/cat-file.c:645 git-submodule.sh:992 msgid "blob" msgstr "blob" @@ -10042,7 +10574,7 @@ msgstr "läs filnamn från standard in" msgid "terminate input and output records by a NUL character" msgstr "avsluta in- och utdataposter med NUL-tecken" -#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537 +#: builtin/check-ignore.c:21 builtin/checkout.c:1435 builtin/gc.c:537 #: builtin/worktree.c:506 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -10133,8 +10665,8 @@ msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 +#: builtin/submodule--helper.c:1385 builtin/submodule--helper.c:1388 +#: builtin/submodule--helper.c:1396 builtin/submodule--helper.c:1882 #: builtin/worktree.c:679 msgid "string" msgstr "sträng" @@ -10163,98 +10695,98 @@ msgstr "git switch [<flaggor>] [<gren>]" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<flaggor>] [--source=<gren>] <fil>..." -#: builtin/checkout.c:173 builtin/checkout.c:212 +#: builtin/checkout.c:175 builtin/checkout.c:214 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:177 builtin/checkout.c:216 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:191 +#: builtin/checkout.c:193 #, 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:241 +#: builtin/checkout.c:243 #, 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:259 +#: builtin/checkout.c:261 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:275 +#: builtin/checkout.c:277 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:375 +#: builtin/checkout.c:377 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Återskapade %d sammanslagningskonflikt" msgstr[1] "Återskapade %d sammanslagningskonflikter" -#: builtin/checkout.c:380 +#: builtin/checkout.c:382 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Uppdaterade %d sökväg från %s" msgstr[1] "Uppdaterade %d sökvägar från %s" -#: builtin/checkout.c:387 +#: builtin/checkout.c:389 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Uppdaterade %d sökväg från indexet" msgstr[1] "Uppdaterade %d sökvägar från indexet" -#: builtin/checkout.c:410 builtin/checkout.c:413 builtin/checkout.c:416 -#: builtin/checkout.c:420 +#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 +#: builtin/checkout.c:422 #, 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:423 builtin/checkout.c:426 +#: builtin/checkout.c:425 builtin/checkout.c:428 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:430 +#: builtin/checkout.c:432 #, 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:434 +#: builtin/checkout.c:436 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "varken \"%s\" eller \"%s\" har angivits" -#: builtin/checkout.c:438 +#: builtin/checkout.c:440 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "\"%s\" måste användas när \"%s\" inte anges" -#: builtin/checkout.c:443 builtin/checkout.c:448 +#: builtin/checkout.c:445 builtin/checkout.c:450 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "\"%s\" eller \"%s\" kan inte användas med %s" -#: builtin/checkout.c:507 builtin/checkout.c:514 +#: builtin/checkout.c:509 builtin/checkout.c:516 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:680 +#: builtin/checkout.c:682 builtin/sparse-checkout.c:82 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:730 +#: builtin/checkout.c:732 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10263,50 +10795,50 @@ msgstr "" "kan inte fortsätta med köade ändringar i följande filer:\n" "%s" -#: builtin/checkout.c:833 +#: builtin/checkout.c:835 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:875 +#: builtin/checkout.c:877 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:879 builtin/clone.c:713 +#: builtin/checkout.c:881 builtin/clone.c:716 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:883 +#: builtin/checkout.c:885 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:886 +#: builtin/checkout.c:888 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:892 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:894 builtin/checkout.c:1291 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:896 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:945 +#: builtin/checkout.c:947 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:953 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10329,7 +10861,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:970 +#: builtin/checkout.c:972 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10356,28 +10888,28 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1007 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1011 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1051 builtin/checkout.c:1286 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:1176 +#: builtin/checkout.c:1178 msgid "only one reference expected" msgstr "endast en referens förväntades" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1195 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1230 +#: builtin/checkout.c:1232 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -10386,37 +10918,37 @@ msgstr "" "\"%s\" kan vara både en lokal fil och en spårande gren.\n" "Använd -- (och möjligen --no-guess) för att göra otvetydig" -#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455 +#: builtin/checkout.c:1245 builtin/worktree.c:290 builtin/worktree.c:455 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1258 builtin/checkout.c:1622 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1305 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "förväntade gren, fick taggen \"%s\"" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1307 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "förväntade gren, fick fjärrgrenen \"%s\"" -#: builtin/checkout.c:1306 builtin/checkout.c:1314 +#: builtin/checkout.c:1308 builtin/checkout.c:1316 #, c-format msgid "a branch is expected, got '%s'" msgstr "förväntade gren, fick \"%s\"" -#: builtin/checkout.c:1309 +#: builtin/checkout.c:1311 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "förväntade gren, fick incheckningen \"%s\"" -#: builtin/checkout.c:1325 +#: builtin/checkout.c:1327 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -10424,7 +10956,7 @@ msgstr "" "kan inte växla gren vid sammanslagning\n" "Överväg \"git merge --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1329 +#: builtin/checkout.c:1331 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -10432,7 +10964,7 @@ msgstr "" "kan inte växla gren mitt i en \"am\"-körning\n" "Överväg \"git am --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1333 +#: builtin/checkout.c:1335 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -10440,7 +10972,7 @@ msgstr "" "kan inte växla gren vid ombasering\n" "Överväg \"git rebase --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1337 +#: builtin/checkout.c:1339 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -10448,7 +10980,7 @@ msgstr "" "kan inte växla gren i en \"cherry-pick\"\n" "Överväg \"git cherry-pick --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1341 +#: builtin/checkout.c:1343 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -10456,123 +10988,120 @@ msgstr "" "kan inte växla gren i en \"revert\"\n" "Överväg \"git revert --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1345 +#: builtin/checkout.c:1347 msgid "you are switching branch while bisecting" msgstr "då växlar grenar medan du gör en \"bisect\"" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1354 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1357 builtin/checkout.c:1361 builtin/checkout.c:1365 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1369 builtin/checkout.c:1372 builtin/checkout.c:1375 +#: builtin/checkout.c:1380 builtin/checkout.c:1385 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1380 +#: builtin/checkout.c:1382 #, c-format msgid "'%s' cannot take <start-point>" msgstr "\"%s\" kan inte ta <startpunkt>" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1390 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1397 msgid "missing branch or commit argument" msgstr "saknar gren- eller incheckingsargument" -#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59 -#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285 -#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174 +#: builtin/checkout.c:1439 builtin/clone.c:91 builtin/commit-graph.c:52 +#: builtin/commit-graph.c:113 builtin/fetch.c:167 builtin/merge.c:285 +#: builtin/multi-pack-index.c:27 builtin/pull.c:138 builtin/push.c:563 +#: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1440 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:1439 builtin/log.c:1618 parse-options.h:318 +#: builtin/checkout.c:1441 builtin/log.c:1690 parse-options.h:322 msgid "style" msgstr "stil" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1442 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1452 builtin/worktree.c:503 +#: builtin/checkout.c:1454 builtin/worktree.c:503 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1455 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1457 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1459 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1459 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1461 builtin/merge.c:288 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1464 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:1475 +#: builtin/checkout.c:1477 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1480 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1484 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1533 +#: builtin/checkout.c:1537 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1536 +#: builtin/checkout.c:1540 msgid "-p and --overlay are mutually exclusive" msgstr "-p och --overlay är ömsesidigt uteslutande" -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1577 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1578 +#: builtin/checkout.c:1582 msgid "missing branch name; try -b" msgstr "grennamn saknas; försök med -b" -#: builtin/checkout.c:1611 +#: builtin/checkout.c:1615 #, c-format msgid "could not resolve %s" msgstr "kunde inte upplösa %s" -#: builtin/checkout.c:1623 -msgid "you must specify path(s) to restore" -msgstr "du måste ange katalog(er) att återställa" - #: builtin/checkout.c:1631 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" @@ -10588,7 +11117,15 @@ msgstr "" 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:1646 +#: builtin/checkout.c:1651 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "--pathspec-from-file är inkompatibelt med --detach" + +#: builtin/checkout.c:1654 builtin/reset.c:324 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "--pathspec-from-file är inkompatibelt med --patch" + +#: builtin/checkout.c:1665 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -10596,7 +11133,11 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/checkout.c:1666 +#: builtin/checkout.c:1670 +msgid "you must specify path(s) to restore" +msgstr "du måste ange katalog(er) att återställa" + +#: builtin/checkout.c:1689 #, c-format msgid "" "'%s' matched more than one remote tracking branch.\n" @@ -10625,65 +11166,65 @@ msgstr "" "föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n" "checkout.defaultRemote=origin i din konfiguration." -#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742 -#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169 +#: builtin/checkout.c:1714 builtin/checkout.c:1716 builtin/checkout.c:1765 +#: builtin/checkout.c:1767 builtin/clone.c:121 builtin/remote.c:169 #: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1715 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1717 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1718 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1720 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "förutspå \"git checkout <gren-saknas>\" (förval)" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1721 msgid "use overlay mode (default)" msgstr "använd överläggsläge (standard)" -#: builtin/checkout.c:1743 +#: builtin/checkout.c:1766 msgid "create and switch to a new branch" msgstr "skapa och växla till en ny gren" -#: builtin/checkout.c:1745 +#: builtin/checkout.c:1768 msgid "create/reset and switch to a branch" msgstr "skapa/nollställ och växla till en gren" -#: builtin/checkout.c:1747 +#: builtin/checkout.c:1770 msgid "second guess 'git switch <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1749 +#: builtin/checkout.c:1772 msgid "throw away local modifications" msgstr "kasta bort lokala ändringar" -#: builtin/checkout.c:1781 +#: builtin/checkout.c:1804 msgid "which tree-ish to checkout from" msgstr "vilken träd-igt att checka ut från" -#: builtin/checkout.c:1783 +#: builtin/checkout.c:1806 msgid "restore the index" msgstr "återställ indexet" -#: builtin/checkout.c:1785 +#: builtin/checkout.c:1808 msgid "restore the working tree (default)" msgstr "återställ arbetskatalogen (förval)" -#: builtin/checkout.c:1787 +#: builtin/checkout.c:1810 msgid "ignore unmerged entries" msgstr "ignorera ej sammanslagna poster" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1811 msgid "use overlay mode" msgstr "använd överläggsläge" @@ -10724,7 +11265,7 @@ msgstr "misslyckades ta bort %s" msgid "could not lstat %s\n" msgstr "kunde inte ta status (\"lstat\") på %s\n" -#: builtin/clean.c:301 git-add--interactive.perl:593 +#: builtin/clean.c:301 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -10737,7 +11278,7 @@ msgstr "" "foo - markera post baserad på unikt prefix\n" " - (tomt) markera ingenting\n" -#: builtin/clean.c:305 git-add--interactive.perl:602 +#: builtin/clean.c:305 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -10758,8 +11299,8 @@ msgstr "" "* - välj alla poster\n" " - (tomt) avsluta markering\n" -#: builtin/clean.c:521 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Vadå (%s)?\n" @@ -10784,11 +11325,6 @@ msgstr "Välj poster att ta bort" msgid "Remove %s [y/N]? " msgstr "Ta bort %s [Y=ja / N=nej]? " -#: builtin/clean.c:787 git-add--interactive.perl:1763 -#, c-format -msgid "Bye.\n" -msgstr "Hej då.\n" - #: builtin/clean.c:795 msgid "" "clean - start cleaning\n" @@ -10807,14 +11343,6 @@ msgstr "" "help - denna skärm\n" "? - hjälp för kommandoval" -#: builtin/clean.c:822 git-add--interactive.perl:1849 -msgid "*** Commands ***" -msgstr "*** Kommandon ***" - -#: builtin/clean.c:823 git-add--interactive.perl:1846 -msgid "What now" -msgstr "Vad nu" - #: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" @@ -10842,8 +11370,8 @@ msgid "remove whole directories" msgstr "ta bort hela kataloger" #: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 -#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178 -#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 +#: builtin/grep.c:901 builtin/log.c:177 builtin/log.c:179 +#: builtin/ls-files.c:557 builtin/name-rev.c:464 builtin/name-rev.c:466 #: builtin/show-ref.c:179 msgid "pattern" msgstr "mönster" @@ -10884,158 +11412,162 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:92 +#: builtin/clone.c:93 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:97 +#: builtin/clone.c:98 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:99 +#: builtin/clone.c:100 msgid "to clone from a local repository" msgstr "för att klona från ett lokalt arkiv" -#: builtin/clone.c:101 +#: builtin/clone.c:102 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hårda länkar, kopiera alltid" -#: builtin/clone.c:103 +#: builtin/clone.c:104 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "pathspec" msgstr "sökvägsangivelse" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:109 +#: builtin/clone.c:110 msgid "number of submodules cloned in parallel" msgstr "antal undermoduler som klonas parallellt" -#: builtin/clone.c:110 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:486 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:111 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1392 +#: builtin/submodule--helper.c:1885 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:117 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1394 +#: builtin/submodule--helper.c:1887 msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" -#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3294 builtin/repack.c:320 +#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3294 builtin/repack.c:327 msgid "name" msgstr "namn" -#: builtin/clone.c:119 +#: builtin/clone.c:120 msgid "use <name> instead of 'origin' to track upstream" msgstr "använd <namn> istället för \"origin\" för att spåra uppströms" -#: builtin/clone.c:121 +#: builtin/clone.c:122 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checka ut <gren> istället för fjärrens HEAD" -#: builtin/clone.c:123 +#: builtin/clone.c:124 msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840 +#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:840 #: builtin/pull.c:227 msgid "depth" msgstr "djup" -#: builtin/clone.c:125 +#: builtin/clone.c:126 msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283 +#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3283 msgid "time" msgstr "tid" -#: builtin/clone.c:127 +#: builtin/clone.c:128 msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon från en angiven tidpunkt" -#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194 -#: builtin/rebase.c:1417 +#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 +#: builtin/rebase.c:1445 msgid "revision" msgstr "revision" -#: builtin/clone.c:129 builtin/fetch.c:172 +#: builtin/clone.c:130 builtin/fetch.c:173 msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" -#: builtin/clone.c:131 +#: builtin/clone.c:132 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:133 +#: builtin/clone.c:134 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "klona inga taggar och gör att senare hämtningar inte följer dem" -#: builtin/clone.c:135 +#: builtin/clone.c:136 msgid "any cloned submodules will be shallow" msgstr "klonade undermoduler kommer vara grunda" -#: builtin/clone.c:136 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:495 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:137 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" -#: builtin/clone.c:138 +#: builtin/clone.c:139 msgid "key=value" msgstr "nyckel=värde" -#: builtin/clone.c:139 +#: builtin/clone.c:140 msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 -#: builtin/push.c:572 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 +#: builtin/push.c:573 builtin/send-pack.c:172 msgid "server-specific" msgstr "serverspecifik" -#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 -#: builtin/push.c:572 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 +#: builtin/push.c:573 builtin/send-pack.c:173 msgid "option to transmit" msgstr "" "inget att checka in\n" "flagga att sända" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240 -#: builtin/push.c:573 +#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:240 +#: builtin/push.c:574 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243 -#: builtin/push.c:575 +#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:243 +#: builtin/push.c:576 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" -#: builtin/clone.c:148 +#: builtin/clone.c:149 msgid "any cloned submodules will use their remote-tracking branch" msgstr "klonade undermoduler kommer använda sin fjärrspårningsgren" -#: builtin/clone.c:284 +#: builtin/clone.c:151 +msgid "initialize sparse-checkout file to include only files at root" +msgstr "initiera sparse-checkout-filen till att bara inkludera filer i roten" + +#: builtin/clone.c:287 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11043,42 +11575,42 @@ msgstr "" "Kunde inte gissa katalognamn.\n" "Ange en katalog på kommandoraden" -#: builtin/clone.c:337 +#: builtin/clone.c:340 #, c-format msgid "info: Could not add alternate for '%s': %s\n" -msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n" +msgstr "info: Kan inte skapa suppleant för \"%s\": %s\n" -#: builtin/clone.c:410 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:427 +#: builtin/clone.c:430 #, c-format msgid "failed to start iterator over '%s'" msgstr "misslyckades starta iterator över \"%s\"" -#: builtin/clone.c:457 +#: builtin/clone.c:460 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:461 +#: builtin/clone.c:464 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:466 +#: builtin/clone.c:469 #, c-format msgid "failed to iterate over '%s'" msgstr "misslyckades iterera över \"%s\"" -#: builtin/clone.c:491 +#: builtin/clone.c:494 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:505 +#: builtin/clone.c:508 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11088,133 +11620,137 @@ msgstr "" "Du kan inspektera det som checkades ut med \"git status\"\n" "och försöka med \"git restore -source=HEAD :/\"\n" -#: builtin/clone.c:582 +#: builtin/clone.c:585 #, 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:701 +#: builtin/clone.c:704 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:751 +#: builtin/clone.c:752 +msgid "failed to initialize sparse-checkout" +msgstr "misslyckades initiera sparse-checkout" + +#: builtin/clone.c:775 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:782 +#: builtin/clone.c:806 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:832 +#: builtin/clone.c:856 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:895 +#: builtin/clone.c:919 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:897 +#: builtin/clone.c:921 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:937 builtin/receive-pack.c:1948 +#: builtin/clone.c:959 builtin/receive-pack.c:1948 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:941 +#: builtin/clone.c:963 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:954 +#: builtin/clone.c:976 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:957 +#: builtin/clone.c:979 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:970 +#: builtin/clone.c:992 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:976 builtin/fetch.c:1790 +#: builtin/clone.c:998 builtin/fetch.c:1787 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:986 +#: builtin/clone.c:1008 #, 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:996 +#: builtin/clone.c:1018 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271 -#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334 +#: builtin/clone.c:1033 builtin/clone.c:1054 builtin/difftool.c:271 +#: builtin/log.c:1866 builtin/worktree.c:302 builtin/worktree.c:334 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:1016 +#: builtin/clone.c:1038 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:1036 +#: builtin/clone.c:1058 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:1038 +#: builtin/clone.c:1060 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:1062 +#: builtin/clone.c:1084 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:1123 +#: builtin/clone.c:1148 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1125 +#: builtin/clone.c:1150 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:1127 +#: builtin/clone.c:1152 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:1129 +#: builtin/clone.c:1154 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1132 +#: builtin/clone.c:1157 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1137 +#: builtin/clone.c:1162 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1212 builtin/clone.c:1220 +#: builtin/clone.c:1237 builtin/clone.c:1245 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1223 +#: builtin/clone.c:1248 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -11263,7 +11799,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "duplicerad förälder %s ignorerades" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 #, c-format msgid "not a valid object name %s" msgstr "objektnamnet är inte giltigt: %s" @@ -11291,13 +11827,13 @@ msgstr "förälder" msgid "id of a parent commit object" msgstr "id på ett förälderincheckningsobjekt" -#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 +#: builtin/commit-tree.c:114 builtin/commit.c:1496 builtin/merge.c:270 #: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 #: builtin/tag.c:412 msgid "message" msgstr "meddelande" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1496 msgid "commit message" msgstr "incheckningsmeddelande" @@ -11305,7 +11841,7 @@ msgstr "incheckningsmeddelande" msgid "read commit log message from file" msgstr "läs incheckningsloggmeddelande från fil" -#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 +#: builtin/commit-tree.c:121 builtin/commit.c:1508 builtin/merge.c:287 #: builtin/pull.c:195 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG-signera incheckning" @@ -11380,57 +11916,65 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:356 +#: builtin/commit.c:351 +msgid "--pathspec-from-file with -a does not make sense" +msgstr "--pathspec-from-file med -a ger ingen mening" + +#: builtin/commit.c:364 +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:376 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:362 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:376 +#: builtin/commit.c:396 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporärt index" -#: builtin/commit.c:378 +#: builtin/commit.c:398 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cacheträdet" -#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:423 builtin/commit.c:446 builtin/commit.c:492 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:455 +#: builtin/commit.c:475 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:457 +#: builtin/commit.c:477 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:465 +#: builtin/commit.c:485 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:484 +#: builtin/commit.c:504 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:582 +#: builtin/commit.c:602 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar författarhuvud" -#: builtin/commit.c:584 +#: builtin/commit.c:604 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:603 +#: builtin/commit.c:623 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:656 +#: builtin/commit.c:676 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -11438,38 +11982,38 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:714 builtin/commit.c:747 builtin/commit.c:1092 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:726 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:708 +#: builtin/commit.c:728 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:712 +#: builtin/commit.c:732 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:763 builtin/commit.c:779 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:750 +#: builtin/commit.c:770 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:810 +#: builtin/commit.c:830 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:829 +#: builtin/commit.c:849 #, c-format msgid "" "\n" @@ -11484,7 +12028,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:834 +#: builtin/commit.c:854 #, c-format msgid "" "\n" @@ -11499,7 +12043,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:847 +#: builtin/commit.c:867 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11509,7 +12053,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:855 +#: builtin/commit.c:875 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11520,144 +12064,140 @@ 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:872 +#: builtin/commit.c:892 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:880 +#: builtin/commit.c:900 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:887 +#: builtin/commit.c:907 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:905 +#: builtin/commit.c:925 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:972 +#: builtin/commit.c:992 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1006 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" -#: builtin/commit.c:1030 +#: builtin/commit.c:1050 #, 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:1044 +#: builtin/commit.c:1064 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Ogiltigt ignorerat läge \"%s\"" -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1082 builtin/commit.c:1322 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1102 +#: builtin/commit.c:1122 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1146 +#: builtin/commit.c:1166 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:1155 +#: builtin/commit.c:1175 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1158 +#: builtin/commit.c:1178 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:1160 +#: builtin/commit.c:1180 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:1163 +#: builtin/commit.c:1183 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1173 +#: builtin/commit.c:1193 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:1175 +#: builtin/commit.c:1195 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F." -#: builtin/commit.c:1183 +#: builtin/commit.c:1203 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:1200 +#: builtin/commit.c:1220 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:1202 -msgid "No paths with --include/--only does not make sense." -msgstr "Du måste ange sökvägar tillsammans med --include/--only." - -#: builtin/commit.c:1208 +#: builtin/commit.c:1226 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "sökvägarna \"%s ...\" med -a ger ingen mening" -#: builtin/commit.c:1339 builtin/commit.c:1523 +#: builtin/commit.c:1357 builtin/commit.c:1519 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1359 builtin/commit.c:1521 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1343 +#: builtin/commit.c:1361 msgid "show stash information" msgstr "visa information om stash" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1363 builtin/commit.c:1523 msgid "compute full ahead/behind values" msgstr "beräkna fullständiga före-/efter-värden" -#: builtin/commit.c:1347 +#: builtin/commit.c:1365 msgid "version" msgstr "version" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548 +#: builtin/commit.c:1365 builtin/commit.c:1525 builtin/push.c:549 #: builtin/worktree.c:650 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1368 builtin/commit.c:1527 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1371 builtin/commit.c:1530 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/commit.c:1373 builtin/commit.c:1377 builtin/commit.c:1533 #: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332 +#: builtin/fast-export.c:1159 builtin/rebase.c:1525 parse-options.h:336 msgid "mode" msgstr "läge" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1374 builtin/commit.c:1533 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:1360 +#: builtin/commit.c:1378 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -11665,11 +12205,11 @@ msgstr "" "visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: " "traditional)" -#: builtin/commit.c:1362 parse-options.h:188 +#: builtin/commit.c:1380 parse-options.h:192 msgid "when" msgstr "när" -#: builtin/commit.c:1363 +#: builtin/commit.c:1381 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -11677,172 +12217,172 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1365 +#: builtin/commit.c:1383 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1366 +#: builtin/commit.c:1384 msgid "do not detect renames" msgstr "detektera inte namnändringar" -#: builtin/commit.c:1368 +#: builtin/commit.c:1386 msgid "detect renames, optionally set similarity index" msgstr "detektera namnändringar, möjligen sätt likhetsindex" -#: builtin/commit.c:1388 +#: builtin/commit.c:1406 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:1493 +#: builtin/commit.c:1489 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1494 +#: builtin/commit.c:1490 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1496 +#: builtin/commit.c:1492 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1493 builtin/merge.c:274 builtin/tag.c:414 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1498 +#: builtin/commit.c:1494 msgid "author" msgstr "författare" -#: builtin/commit.c:1498 +#: builtin/commit.c:1494 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1499 builtin/gc.c:538 +#: builtin/commit.c:1495 builtin/gc.c:538 msgid "date" msgstr "datum" -#: builtin/commit.c:1499 +#: builtin/commit.c:1495 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1497 builtin/commit.c:1498 builtin/commit.c:1499 +#: builtin/commit.c:1500 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1501 +#: builtin/commit.c:1497 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1502 +#: builtin/commit.c:1498 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1503 +#: builtin/commit.c:1499 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1504 +#: builtin/commit.c:1500 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:1505 +#: builtin/commit.c:1501 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:1506 builtin/log.c:1565 builtin/merge.c:289 +#: builtin/commit.c:1502 builtin/log.c:1634 builtin/merge.c:289 #: builtin/pull.c:164 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1507 +#: builtin/commit.c:1503 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1508 +#: builtin/commit.c:1504 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1510 +#: builtin/commit.c:1506 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1515 +#: builtin/commit.c:1511 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1516 +#: builtin/commit.c:1512 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1517 +#: builtin/commit.c:1513 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1518 +#: builtin/commit.c:1514 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1519 +#: builtin/commit.c:1515 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1520 +#: builtin/commit.c:1516 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1521 +#: builtin/commit.c:1517 msgid "bypass pre-commit and commit-msg hooks" msgstr "förbigå pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1522 +#: builtin/commit.c:1518 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1535 +#: builtin/commit.c:1531 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1536 +#: builtin/commit.c:1532 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1541 +#: builtin/commit.c:1539 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1543 +#: builtin/commit.c:1541 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1616 +#: builtin/commit.c:1614 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1623 +#: builtin/commit.c:1621 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1642 +#: builtin/commit.c:1640 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1649 +#: builtin/commit.c:1647 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1654 +#: builtin/commit.c:1652 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1688 +#: builtin/commit.c:1686 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -11853,21 +12393,13 @@ msgstr "" "att kvoten inte har överskridits, och kör sedan\n" "\"git restore --staged :/\" för att återställa." -#: builtin/commit-graph.c:11 -msgid "git commit-graph [--object-dir <objdir>]" -msgstr "git commit-graph [--object-dir <objkat>]" - -#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 -msgid "git commit-graph read [--object-dir <objdir>]" -msgstr "git commit-graph read [--object-dir <objkat>]" - -#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 +#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 msgid "" "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" msgstr "" "git commit-graph verify [--object-dir <objkat>] [--shallow] [--[no-]progress]" -#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 +#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" "reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" @@ -11875,56 +12407,55 @@ msgstr "" "git commit-graph write [--object-dir <objkat>] [--append|--split] [--" "reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <delnings-flaggor>" -#: builtin/commit-graph.c:55 builtin/commit-graph.c:107 -#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178 -#: builtin/log.c:1585 +#: builtin/commit-graph.c:48 builtin/commit-graph.c:103 +#: builtin/commit-graph.c:187 builtin/fetch.c:179 builtin/log.c:1657 msgid "dir" msgstr "kat" -#: builtin/commit-graph.c:56 builtin/commit-graph.c:108 -#: builtin/commit-graph.c:171 builtin/commit-graph.c:255 +#: builtin/commit-graph.c:49 builtin/commit-graph.c:104 +#: builtin/commit-graph.c:188 msgid "The object directory to store the graph" msgstr "Objektkatalogen där grafen skall lagras" -#: builtin/commit-graph.c:58 +#: builtin/commit-graph.c:51 msgid "if the commit-graph is split, only verify the tip file" msgstr "om inchecknignsgrafen är delad, kontrollera bara spetsfilen" -#: builtin/commit-graph.c:80 builtin/commit-graph.c:125 +#: builtin/commit-graph.c:73 t/helper/test-read-graph.c:23 #, c-format msgid "Could not open commit-graph '%s'" msgstr "Kunde inte öppna incheckningsgrafen \"%s\"" -#: builtin/commit-graph.c:173 +#: builtin/commit-graph.c:106 msgid "start walk at all refs" msgstr "starta traversering vid alla referenser" -#: builtin/commit-graph.c:175 +#: builtin/commit-graph.c:108 msgid "scan pack-indexes listed by stdin for commits" msgstr "sök paketindex listade på standard in efter incheckningar" -#: builtin/commit-graph.c:177 +#: builtin/commit-graph.c:110 msgid "start walk at commits listed by stdin" msgstr "börja gå genom incheckningar listade på standard in" -#: builtin/commit-graph.c:179 +#: builtin/commit-graph.c:112 msgid "include all commits already in the commit-graph file" msgstr "ta med alla incheckningar redan i filen commit-graph" -#: builtin/commit-graph.c:182 +#: builtin/commit-graph.c:115 msgid "allow writing an incremental commit-graph file" msgstr "tillåt skriva en inkrementell incheckningsgraffil" -#: builtin/commit-graph.c:184 builtin/commit-graph.c:188 +#: builtin/commit-graph.c:117 builtin/commit-graph.c:121 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" "maximalt antal incheckningar i en delad incheckingsgraf som inte är bad" -#: builtin/commit-graph.c:186 +#: builtin/commit-graph.c:119 msgid "maximum ratio between two levels of a split commit-graph" msgstr "maximalt förhållande mellan två nivåer av en delad incheckningsgraf" -#: builtin/commit-graph.c:204 +#: builtin/commit-graph.c:137 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" @@ -12376,7 +12907,7 @@ msgstr "överväg endast taggar som motsvarar <mönster>" msgid "do not consider tags matching <pattern>" msgstr "överväg inte taggar som motsvarar <mönster>" -#: builtin/describe.c:553 builtin/name-rev.c:426 +#: builtin/describe.c:553 builtin/name-rev.c:473 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" @@ -12636,7 +13167,7 @@ msgstr "Använd done-funktionen för att avsluta strömmen" msgid "Skip output of blob data" msgstr "Hoppa över skrivning av blob-data" -#: builtin/fast-export.c:1177 builtin/log.c:1633 +#: builtin/fast-export.c:1177 builtin/log.c:1705 msgid "refspec" msgstr "referensspecifikation" @@ -12680,88 +13211,88 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:115 +#: builtin/fetch.c:116 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel kan inte vara negativt" -#: builtin/fetch.c:138 builtin/pull.c:204 +#: builtin/fetch.c:139 builtin/pull.c:204 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:140 builtin/pull.c:248 +#: builtin/fetch.c:141 builtin/pull.c:248 msgid "set upstream for git pull/fetch" msgstr "ställ in uppström för git pull/fetch" -#: builtin/fetch.c:142 builtin/pull.c:207 +#: builtin/fetch.c:143 builtin/pull.c:207 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:144 builtin/pull.c:210 +#: builtin/fetch.c:145 builtin/pull.c:210 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:145 +#: builtin/fetch.c:146 msgid "force overwrite of local reference" msgstr "tvinga överskrivning av lokal referens" -#: builtin/fetch.c:147 +#: builtin/fetch.c:148 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:149 builtin/pull.c:214 +#: builtin/fetch.c:150 builtin/pull.c:214 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:151 +#: builtin/fetch.c:152 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:153 +#: builtin/fetch.c:154 msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:155 builtin/pull.c:217 +#: builtin/fetch.c:156 builtin/pull.c:217 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:157 +#: builtin/fetch.c:158 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:158 builtin/fetch.c:181 builtin/pull.c:141 +#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:141 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:159 +#: builtin/fetch.c:160 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:163 builtin/pull.c:225 +#: builtin/fetch.c:164 builtin/pull.c:225 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:165 +#: builtin/fetch.c:166 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228 +#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:228 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:170 +#: builtin/fetch.c:171 msgid "deepen history of shallow repository based on time" msgstr "fördjupa historik för grund klon baserad på tid" -#: builtin/fetch.c:176 builtin/pull.c:231 +#: builtin/fetch.c:177 builtin/pull.c:231 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:179 +#: builtin/fetch.c:180 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:182 +#: builtin/fetch.c:183 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -12769,90 +13300,94 @@ msgstr "" "standard för rekursiv hämtning av undermoduler (lägre prioritet än " "konfigurationsfiler)" -#: builtin/fetch.c:186 builtin/pull.c:234 +#: builtin/fetch.c:187 builtin/pull.c:234 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:187 builtin/pull.c:236 +#: builtin/fetch.c:188 builtin/pull.c:236 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:188 builtin/pull.c:237 +#: builtin/fetch.c:189 builtin/pull.c:237 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:195 +#: builtin/fetch.c:196 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:198 +#: builtin/fetch.c:199 msgid "run 'gc --auto' after fetching" msgstr "kör \"gc --auto\" efter hämtning" -#: builtin/fetch.c:200 builtin/pull.c:246 +#: builtin/fetch.c:201 builtin/pull.c:246 msgid "check for forced-updates on all updated branches" msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar" -#: builtin/fetch.c:510 +#: builtin/fetch.c:203 +msgid "write the commit-graph after fetching" +msgstr "skriv incheckingsgrafen efter hämtning" + +#: builtin/fetch.c:513 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:650 +#: builtin/fetch.c:653 #, 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:748 +#: builtin/fetch.c:751 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:752 +#: builtin/fetch.c:755 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853 +#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:766 +#: builtin/fetch.c:769 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:776 +#: builtin/fetch.c:779 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836 -#: builtin/fetch.c:848 +#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 +#: builtin/fetch.c:851 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:781 +#: builtin/fetch.c:784 msgid "would clobber existing tag" msgstr "skulle skriva över befintlig tagg" -#: builtin/fetch.c:803 +#: builtin/fetch.c:806 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:806 +#: builtin/fetch.c:809 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:809 +#: builtin/fetch.c:812 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:848 +#: builtin/fetch.c:851 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:853 +#: builtin/fetch.c:856 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:874 +#: builtin/fetch.c:877 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -12863,7 +13398,7 @@ msgstr "" "av. För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n" "\"git config fetch.showForcedUpdates true\"." -#: builtin/fetch.c:878 +#: builtin/fetch.c:881 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -12876,22 +13411,22 @@ msgstr "" "showForcedUpdates\n" "false\" för att undvika testet.\n" -#: builtin/fetch.c:908 +#: builtin/fetch.c:911 #, 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:929 +#: builtin/fetch.c:932 #, 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:1020 builtin/fetch.c:1157 +#: builtin/fetch.c:1017 builtin/fetch.c:1155 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:1031 +#: builtin/fetch.c:1028 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -12900,56 +13435,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:1127 +#: builtin/fetch.c:1125 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:1128 +#: builtin/fetch.c:1126 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:1160 +#: builtin/fetch.c:1158 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:1161 builtin/remote.c:1036 +#: builtin/fetch.c:1159 builtin/remote.c:1035 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:1184 +#: builtin/fetch.c:1182 #, 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:1203 +#: builtin/fetch.c:1201 #, 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:1206 +#: builtin/fetch.c:1204 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1414 -msgid "multiple branch detected, incompatible with --set-upstream" +#: builtin/fetch.c:1412 +msgid "multiple branches detected, incompatible with --set-upstream" msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream" -#: builtin/fetch.c:1429 +#: builtin/fetch.c:1427 msgid "not setting upstream for a remote remote-tracking branch" msgstr "ställer inte in uppströmsgren för en fjärrspårande gren på fjärren" -#: builtin/fetch.c:1431 +#: builtin/fetch.c:1429 msgid "not setting upstream for a remote tag" msgstr "ställer inte in uppström för en fjärrtag" -#: builtin/fetch.c:1433 +#: builtin/fetch.c:1431 msgid "unknown branch type" msgstr "okänd grentyp" -#: builtin/fetch.c:1435 +#: builtin/fetch.c:1433 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -12957,22 +13492,22 @@ msgstr "" "hittade ingen källgren.\n" "du måste ange exakt en gren med flaggan --set-upstream." -#: builtin/fetch.c:1561 builtin/fetch.c:1623 +#: builtin/fetch.c:1559 builtin/fetch.c:1622 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100 +#: builtin/fetch.c:1569 builtin/fetch.c:1624 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1583 +#: builtin/fetch.c:1581 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "kunde inte hämta \"%s\" (felkod: %d)\n" -#: builtin/fetch.c:1685 +#: builtin/fetch.c:1684 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -12980,44 +13515,44 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar skall hämtas från." -#: builtin/fetch.c:1722 +#: builtin/fetch.c:1721 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1774 +#: builtin/fetch.c:1771 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1776 +#: builtin/fetch.c:1773 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1781 +#: builtin/fetch.c:1778 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1783 +#: builtin/fetch.c:1780 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1799 +#: builtin/fetch.c:1796 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1801 +#: builtin/fetch.c:1798 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1810 +#: builtin/fetch.c:1807 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1817 +#: builtin/fetch.c:1814 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" -#: builtin/fetch.c:1835 +#: builtin/fetch.c:1832 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13031,23 +13566,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:674 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:675 +#: builtin/fmt-merge-msg.c:677 msgid "alias for --log (deprecated)" msgstr "alias för --log (avråds)" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:680 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:681 msgid "use <text> as start of message" msgstr "inled meddelande med <text>" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:682 msgid "file to read from" msgstr "fil att läsa från" @@ -13112,32 +13647,32 @@ 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:88 builtin/fsck.c:160 builtin/fsck.c:161 +#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 msgid "unknown" msgstr "okänd" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:120 builtin/fsck.c:136 +#: builtin/fsck.c:100 builtin/fsck.c:120 #, c-format msgid "error in %s %s: %s" msgstr "fel i %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:131 +#: builtin/fsck.c:114 #, c-format msgid "warning in %s %s: %s" msgstr "varning i %s %s: %s" -#: builtin/fsck.c:157 builtin/fsck.c:159 +#: builtin/fsck.c:143 builtin/fsck.c:146 #, c-format msgid "broken link from %7s %s" msgstr "trasig länk från %7s %s" -#: builtin/fsck.c:168 +#: builtin/fsck.c:155 msgid "wrong object type in link" msgstr "fel objekttyp i länk" -#: builtin/fsck.c:184 +#: builtin/fsck.c:171 #, c-format msgid "" "broken link from %7s %s\n" @@ -13146,215 +13681,215 @@ msgstr "" "trasig länk från %7s %s\n" " till %7s %s" -#: builtin/fsck.c:295 +#: builtin/fsck.c:282 #, c-format msgid "missing %s %s" msgstr "saknat %s %s" -#: builtin/fsck.c:321 +#: builtin/fsck.c:309 #, c-format msgid "unreachable %s %s" msgstr "onåbart %s %s" -#: builtin/fsck.c:340 +#: builtin/fsck.c:329 #, c-format msgid "dangling %s %s" msgstr "hängande %s %s" -#: builtin/fsck.c:349 +#: builtin/fsck.c:339 msgid "could not create lost-found" msgstr "kunde inte skapa lost-found" -#: builtin/fsck.c:360 +#: builtin/fsck.c:350 #, c-format msgid "could not finish '%s'" msgstr "kunde inte avsluta \"%s\"" -#: builtin/fsck.c:377 +#: builtin/fsck.c:367 #, c-format msgid "Checking %s" msgstr "Kontrollerar %s" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:415 +#: builtin/fsck.c:405 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Kontrollerar konnektivitet (%d objekt)" -#: builtin/fsck.c:434 +#: builtin/fsck.c:424 #, c-format msgid "Checking %s %s" msgstr "Kontrollerar %s %s" -#: builtin/fsck.c:438 +#: builtin/fsck.c:429 msgid "broken links" msgstr "trasiga länkar" -#: builtin/fsck.c:447 +#: builtin/fsck.c:438 #, c-format msgid "root %s" msgstr "roten %s" -#: builtin/fsck.c:455 +#: builtin/fsck.c:446 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "taggad %s %s (%s) i %s" -#: builtin/fsck.c:484 +#: builtin/fsck.c:475 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: objekt trasigt eller saknas" -#: builtin/fsck.c:509 +#: builtin/fsck.c:500 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: ogiltig reflog-post %s" -#: builtin/fsck.c:523 +#: builtin/fsck.c:514 #, c-format msgid "Checking reflog %s->%s" msgstr "Kontrollerar reflog %s->%s" -#: builtin/fsck.c:557 +#: builtin/fsck.c:548 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: ogiltig sha1-pekare %s" -#: builtin/fsck.c:564 +#: builtin/fsck.c:555 #, c-format msgid "%s: not a commit" msgstr "%s: inte en incheckning!" -#: builtin/fsck.c:619 +#: builtin/fsck.c:609 msgid "notice: No default references" msgstr "obs: Inga förvalda referenser" -#: builtin/fsck.c:634 +#: builtin/fsck.c:624 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: objektet trasigt eller saknas: %s" -#: builtin/fsck.c:647 +#: builtin/fsck.c:637 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: objektet kunde inte tolkas: %s" -#: builtin/fsck.c:667 +#: builtin/fsck.c:657 #, c-format msgid "bad sha1 file: %s" msgstr "ogiltig sha1-fil: %s" -#: builtin/fsck.c:682 +#: builtin/fsck.c:672 msgid "Checking object directory" msgstr "Kontrollerar objektkatalog" -#: builtin/fsck.c:685 +#: builtin/fsck.c:675 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:700 +#: builtin/fsck.c:690 #, c-format msgid "Checking %s link" msgstr "Kontrollerar %s-länk" -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:695 builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/fsck.c:712 +#: builtin/fsck.c:702 #, c-format msgid "%s points to something strange (%s)" msgstr "%s pekar på något konstigt (%s)" -#: builtin/fsck.c:718 +#: builtin/fsck.c:708 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: frånkopplat HEAD pekar på ingenting" -#: builtin/fsck.c:722 +#: builtin/fsck.c:712 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "obs: %s pekar på en ofödd gren (%s)" -#: builtin/fsck.c:734 +#: builtin/fsck.c:724 msgid "Checking cache tree" msgstr "Kontrollerar cacheträd" -#: builtin/fsck.c:739 +#: builtin/fsck.c:729 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: ogiltig sha1-pekare i cacheträd" -#: builtin/fsck.c:750 +#: builtin/fsck.c:738 msgid "non-tree in cache-tree" msgstr "icke-träd i cacheträd" -#: builtin/fsck.c:781 +#: builtin/fsck.c:769 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:787 +#: builtin/fsck.c:775 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:788 +#: builtin/fsck.c:776 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:789 +#: builtin/fsck.c:777 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:790 +#: builtin/fsck.c:778 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:791 +#: builtin/fsck.c:779 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:792 +#: builtin/fsck.c:780 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:793 +#: builtin/fsck.c:781 msgid "also consider packs and alternate objects" -msgstr "ta även hänsyn till paket och alternativa objekt" +msgstr "ta även hänsyn till paket och supplerande objekt" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:794 +#: builtin/fsck.c:782 msgid "check only connectivity" msgstr "kontrollera endast konnektivitet" -#: builtin/fsck.c:795 +#: builtin/fsck.c:783 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:797 +#: builtin/fsck.c:785 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:786 builtin/prune.c:132 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:799 +#: builtin/fsck.c:787 msgid "show verbose names for reachable objects" msgstr "visa ordrika namn för nåbara objekt" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:846 builtin/index-pack.c:225 msgid "Checking objects" msgstr "Kontrollerar objekt" -#: builtin/fsck.c:887 +#: builtin/fsck.c:874 #, c-format msgid "%s: object missing" msgstr "%s: objekt saknas" -#: builtin/fsck.c:899 +#: builtin/fsck.c:885 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "ogiltig parameter: förväntade sha1, fick \"%s\"" @@ -13916,7 +14451,7 @@ msgstr "använde fler byte än tillgängligt" 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:291 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "paket är större än tillåten maximal storlek" @@ -14156,7 +14691,7 @@ msgstr "--stdin kräver ett git-arkiv" msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1833 builtin/unpack-objects.c:581 msgid "fsck error in pack objects" msgstr "fsck-fel i packat objekt" @@ -14339,121 +14874,126 @@ 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:55 +#: builtin/log.c:56 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" -#: builtin/log.c:56 +#: builtin/log.c:57 msgid "git show [<options>] <object>..." msgstr "git show [<flaggor>] <objekt>..." -#: builtin/log.c:109 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:173 +#: builtin/log.c:174 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:174 +#: builtin/log.c:175 msgid "Use mail map file" msgstr "Använd e-postmappningsfil" -#: builtin/log.c:176 +#: builtin/log.c:177 msgid "only decorate refs that match <pattern>" msgstr "dekorera endast referenser som motsvarar <mönster>" -#: builtin/log.c:178 +#: builtin/log.c:179 msgid "do not decorate refs that match <pattern>" msgstr "dekorera inte referenser som motsvarar <mönster>" -#: builtin/log.c:179 +#: builtin/log.c:180 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:182 +#: builtin/log.c:183 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:280 +#: builtin/log.c:281 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:534 +#: builtin/log.c:535 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:549 builtin/log.c:644 +#: builtin/log.c:550 builtin/log.c:645 #, c-format msgid "could not read object %s" msgstr "kunde inte läsa objektet %s" -#: builtin/log.c:669 +#: builtin/log.c:670 #, c-format msgid "unknown type: %d" msgstr "okänd typ: %d" -#: builtin/log.c:792 +#: builtin/log.c:814 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "%s: ogiltigt omslag från beskrivningsläge" + +#: builtin/log.c:821 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:909 +#: builtin/log.c:936 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:925 +#: builtin/log.c:952 #, c-format msgid "cannot open patch file %s" msgstr "kan inte öppna patchfilen %s" -#: builtin/log.c:942 +#: builtin/log.c:969 msgid "need exactly one range" msgstr "behöver precis ett intervall" -#: builtin/log.c:952 +#: builtin/log.c:979 msgid "not a range" msgstr "inte ett intervall" -#: builtin/log.c:1075 +#: builtin/log.c:1143 msgid "cover letter needs email format" msgstr "omslagsbrevet behöver e-postformat" -#: builtin/log.c:1081 +#: builtin/log.c:1149 msgid "failed to create cover-letter file" msgstr "misslyckades skapa fil för omslagsbrev" -#: builtin/log.c:1160 +#: builtin/log.c:1228 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1187 +#: builtin/log.c:1255 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1245 +#: builtin/log.c:1313 msgid "two output directories?" msgstr "två utdatakataloger?" -#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 +#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 #, c-format msgid "unknown commit %s" msgstr "okänd incheckning %s" -#: builtin/log.c:1366 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "misslyckades slå upp \"%s\" som en giltig referens" -#: builtin/log.c:1371 +#: builtin/log.c:1439 msgid "could not find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1375 +#: builtin/log.c:1443 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" @@ -14463,267 +15003,275 @@ msgstr "" "använd git branch --set-upstream-to för att spåra en fjärrgren.\n" "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> manuellt" -#: builtin/log.c:1395 +#: builtin/log.c:1463 msgid "failed to find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1406 +#: builtin/log.c:1474 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1410 +#: builtin/log.c:1478 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1463 +#: builtin/log.c:1531 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1515 +#: builtin/log.c:1583 msgid "failed to infer range-diff ranges" msgstr "misslyckades räkna ut intervall range-diff" -#: builtin/log.c:1560 +#: builtin/log.c:1629 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:1563 +#: builtin/log.c:1632 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1567 +#: builtin/log.c:1636 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1569 +#: builtin/log.c:1638 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1571 +#: builtin/log.c:1640 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1572 +#: builtin/log.c:1641 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1573 +#: builtin/log.c:1642 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1575 +#: builtin/log.c:1644 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1577 +#: builtin/log.c:1646 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1579 +#: builtin/log.c:1648 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Använd [RFC PATCH] istället för [PATCH]" -#: builtin/log.c:1582 +#: builtin/log.c:1651 +msgid "cover-from-description-mode" +msgstr "cover-from-description-läge" + +#: builtin/log.c:1652 +msgid "generate parts of a cover letter based on a branch's description" +msgstr "skapa delar av omslagsbrevet baserat på grenbeskrivelsen" + +#: builtin/log.c:1654 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1585 +#: builtin/log.c:1657 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1588 +#: builtin/log.c:1660 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1591 +#: builtin/log.c:1663 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1593 +#: builtin/log.c:1665 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1595 +#: builtin/log.c:1667 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1597 +#: builtin/log.c:1669 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1599 +#: builtin/log.c:1671 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1600 +#: builtin/log.c:1672 msgid "header" msgstr "huvud" -#: builtin/log.c:1601 +#: builtin/log.c:1673 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1602 builtin/log.c:1604 +#: builtin/log.c:1674 builtin/log.c:1676 msgid "email" msgstr "epost" -#: builtin/log.c:1602 +#: builtin/log.c:1674 msgid "add To: header" msgstr "lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1604 +#: builtin/log.c:1676 msgid "add Cc: header" msgstr "lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1606 +#: builtin/log.c:1678 msgid "ident" msgstr "ident" -#: builtin/log.c:1607 +#: builtin/log.c:1679 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:1609 +#: builtin/log.c:1681 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1610 +#: builtin/log.c:1682 msgid "make first mail a reply to <message-id>" msgstr "gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1611 builtin/log.c:1614 +#: builtin/log.c:1683 builtin/log.c:1686 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1612 +#: builtin/log.c:1684 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1615 +#: builtin/log.c:1687 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1619 +#: builtin/log.c:1691 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1621 +#: builtin/log.c:1693 msgid "signature" msgstr "signatur" -#: builtin/log.c:1622 +#: builtin/log.c:1694 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1623 +#: builtin/log.c:1695 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1624 +#: builtin/log.c:1696 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1626 +#: builtin/log.c:1698 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1627 +#: builtin/log.c:1699 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1629 +#: builtin/log.c:1701 msgid "show progress while generating patches" msgstr "visa förloppsindikator medan patchar skapas" -#: builtin/log.c:1631 +#: builtin/log.c:1703 msgid "show changes against <rev> in cover letter or single patch" msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch" -#: builtin/log.c:1634 +#: builtin/log.c:1706 msgid "show changes against <refspec> in cover letter or single patch" msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch" -#: builtin/log.c:1636 +#: builtin/log.c:1708 msgid "percentage by which creation is weighted" msgstr "procent som skapelse vägs med" -#: builtin/log.c:1711 +#: builtin/log.c:1792 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1726 +#: builtin/log.c:1807 msgid "-n and -k are mutually exclusive" msgstr "-n och -k kan inte användas samtidigt" -#: builtin/log.c:1728 +#: builtin/log.c:1809 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt" -#: builtin/log.c:1736 +#: builtin/log.c:1817 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1738 +#: builtin/log.c:1819 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1740 +#: builtin/log.c:1821 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1773 +#: builtin/log.c:1854 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1877 +#: builtin/log.c:1958 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff kräver --cover-letter eller ensam patch" -#: builtin/log.c:1881 +#: builtin/log.c:1962 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1882 +#: builtin/log.c:1963 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff mot v%d:" -#: builtin/log.c:1888 +#: builtin/log.c:1969 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor kräver --range-diff" -#: builtin/log.c:1892 +#: builtin/log.c:1973 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff kräver --cover-letter eller ensam patch" -#: builtin/log.c:1900 +#: builtin/log.c:1981 msgid "Range-diff:" msgstr "Intervall-diff:" -#: builtin/log.c:1901 +#: builtin/log.c:1982 #, c-format msgid "Range-diff against v%d:" msgstr "Intervall-diff mot v%d:" -#: builtin/log.c:1912 +#: builtin/log.c:1993 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:1948 +#: builtin/log.c:2029 msgid "Generating patches" msgstr "Skapar patchar" -#: builtin/log.c:1992 +#: builtin/log.c:2073 msgid "failed to create output files" msgstr "misslyckades skapa utdatafiler" -#: builtin/log.c:2051 +#: builtin/log.c:2132 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:2105 +#: builtin/log.c:2186 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -14847,7 +15395,7 @@ msgstr "" msgid "do not print remote URL" msgstr "visa inte fjärr-URL" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1518 msgid "exec" msgstr "exec" @@ -14998,7 +15546,7 @@ msgid "verify that the named commit has a valid GPG signature" msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur" #: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187 -#: builtin/rebase.c:493 builtin/rebase.c:1501 builtin/revert.c:114 +#: builtin/rebase.c:512 builtin/rebase.c:1531 builtin/revert.c:114 msgid "strategy" msgstr "strategi" @@ -15435,17 +15983,17 @@ msgstr "tillåt skapa mer än ett träd" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" -"batch-size=<size>)" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<size>)" msgstr "" -"git multi-pack-index [--object-dir=<kat>] (write|verify|expire|repack --" -"batch-size=<storlek>)" +"git multi-pack-index [<flaggor>] (write|verify|expire|repack --batch-" +"size=<storlek>)" -#: builtin/multi-pack-index.c:23 +#: builtin/multi-pack-index.c:26 msgid "object directory containing set of packfile and pack-index pairs" msgstr "objektkatalog med uppsättning av par med paketfiler och pack-index" -#: builtin/multi-pack-index.c:25 +#: builtin/multi-pack-index.c:29 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -15453,15 +16001,15 @@ msgstr "" "vid ompackning, samla mindre paketfiler i en bunt som är större än denna " "storlekt" -#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "för många argument" -#: builtin/multi-pack-index.c:52 +#: builtin/multi-pack-index.c:60 msgid "--batch-size option is only for 'repack' subcommand" msgstr "flaggan --batch-size används bara i underkommandot \"repack\"" -#: builtin/multi-pack-index.c:61 +#: builtin/multi-pack-index.c:69 #, c-format msgid "unrecognized subcommand: %s" msgstr "okänt underkommando: %s" @@ -15554,52 +16102,52 @@ msgstr "%s, källa=%s, mål=%s" msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511 +#: builtin/mv.c:277 builtin/remote.c:716 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" -#: builtin/name-rev.c:356 +#: builtin/name-rev.c:403 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<flaggor>] <incheckning>..." -#: builtin/name-rev.c:357 +#: builtin/name-rev.c:404 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<flaggor>] --all" -#: builtin/name-rev.c:358 +#: builtin/name-rev.c:405 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<flaggor>] --stdin" -#: builtin/name-rev.c:415 +#: builtin/name-rev.c:462 msgid "print only names (no SHA-1)" msgstr "skriv endast namn (ingen SHA-1)" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:463 msgid "only use tags to name the commits" msgstr "använd endast taggar för att namnge incheckningar" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:465 msgid "only use refs matching <pattern>" msgstr "använd endast referenser som motsvarar <mönster>" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:467 msgid "ignore refs matching <pattern>" msgstr "ignorera referenser som motsvarar <mönster>" -#: builtin/name-rev.c:422 +#: builtin/name-rev.c:469 msgid "list all commits reachable from all refs" msgstr "lista alla incheckningar som kan nås alla referenser" -#: builtin/name-rev.c:423 +#: builtin/name-rev.c:470 msgid "read from stdin" msgstr "läs från standard in" -#: builtin/name-rev.c:424 +#: builtin/name-rev.c:471 msgid "allow to print `undefined` names (default)" msgstr "tillåt att skriva \"odefinierade\" namn (standard)" -#: builtin/name-rev.c:430 +#: builtin/name-rev.c:477 msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" @@ -16078,7 +16626,7 @@ msgstr "" msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:917 builtin/update-index.c:89 +#: builtin/pack-objects.c:917 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "misslyckades ta status på %s" @@ -16208,22 +16756,6 @@ msgstr "indexversionen %s stöds ej" msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:3228 -msgid "do not show progress meter" -msgstr "visa inte förloppsindikator" - -#: builtin/pack-objects.c:3230 -msgid "show progress meter" -msgstr "visa förloppsindikator" - -#: builtin/pack-objects.c:3232 -msgid "show progress meter during object writing phase" -msgstr "visa förloppsindikator under objektskrivningsfasen" - -#: builtin/pack-objects.c:3235 -msgid "similar to --all-progress when progress meter is shown" -msgstr "som --all-progress när förloppsindikatorn visas" - #: builtin/pack-objects.c:3236 msgid "<version>[,<offset>]" msgstr "<version>[,<offset>]" @@ -16238,7 +16770,7 @@ msgstr "maximal storlek på varje utdatapaketfil" #: builtin/pack-objects.c:3242 msgid "ignore borrowed objects from alternate object store" -msgstr "ignorera lånade objekt från alternativa objektlager" +msgstr "ignorera lånade objekt från supplerande objektlager" #: builtin/pack-objects.c:3244 msgid "ignore packed objects" @@ -16470,7 +17002,7 @@ msgstr "Alternativ gällande sammanslagning" msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" -#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126 +#: builtin/pull.c:177 builtin/rebase.c:467 builtin/revert.c:126 msgid "allow fast-forward" msgstr "tillåt snabbspolning" @@ -16529,7 +17061,7 @@ msgstr "" "gren. Eftersom det inte är den fjärr som är konfigurerad som\n" "standard för aktuell gren måste du ange en gren på kommandoraden." -#: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73 +#: builtin/pull.c:448 builtin/rebase.c:1375 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." @@ -16546,7 +17078,7 @@ msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." #: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470 -#: builtin/rebase.c:1353 git-parse-remote.sh:64 +#: builtin/rebase.c:1381 git-parse-remote.sh:64 msgid "<remote>" msgstr "<fjärr>" @@ -16555,7 +17087,7 @@ msgstr "<fjärr>" msgid "<branch>" msgstr "<gren>" -#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75 +#: builtin/pull.c:463 builtin/rebase.c:1373 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." @@ -16642,15 +17174,15 @@ msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/push.c:111 +#: builtin/push.c:112 msgid "tag shorthand without <tag>" msgstr "taggförkortning utan <tagg>" -#: builtin/push.c:121 +#: builtin/push.c:122 msgid "--delete only accepts plain target ref names" msgstr "--delete godtar endast enkla målreferensnamn" -#: builtin/push.c:167 +#: builtin/push.c:168 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -16659,7 +17191,7 @@ msgstr "" "För att välja ett av alternativen permanent, se push.default i \"git help " "config\"." -#: builtin/push.c:170 +#: builtin/push.c:171 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -16684,7 +17216,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:185 +#: builtin/push.c:186 #, c-format msgid "" "You are not currently on a branch.\n" @@ -16699,7 +17231,7 @@ msgstr "" "\n" " git push %s HEAD:<namn-på-fjärrgren>\n" -#: builtin/push.c:199 +#: builtin/push.c:200 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -16712,12 +17244,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:207 +#: builtin/push.c:208 #, 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:210 +#: builtin/push.c:211 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -16728,14 +17260,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:269 +#: builtin/push.c:270 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:276 +#: builtin/push.c:277 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -16747,7 +17279,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:282 +#: builtin/push.c:283 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" @@ -16759,7 +17291,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:288 +#: builtin/push.c:289 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" @@ -16773,11 +17305,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:295 +#: builtin/push.c:296 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:298 +#: builtin/push.c:299 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" @@ -16788,99 +17320,99 @@ msgstr "" "pekar på något som inte är en incheckning, utan att använda flaggan\n" "\"--force\".\n" -#: builtin/push.c:359 +#: builtin/push.c:360 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:366 +#: builtin/push.c:367 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:541 +#: builtin/push.c:542 msgid "repository" msgstr "arkiv" -#: builtin/push.c:542 builtin/send-pack.c:164 +#: builtin/push.c:543 builtin/send-pack.c:164 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:543 builtin/send-pack.c:166 +#: builtin/push.c:544 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:545 +#: builtin/push.c:546 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:546 +#: builtin/push.c:547 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:549 builtin/send-pack.c:167 +#: builtin/push.c:550 builtin/send-pack.c:167 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:551 builtin/send-pack.c:181 +#: builtin/push.c:552 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "<refnamn>:<förvänta>" -#: builtin/push.c:552 builtin/send-pack.c:182 +#: builtin/push.c:553 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:555 +#: builtin/push.c:556 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:557 builtin/send-pack.c:175 +#: builtin/push.c:558 builtin/send-pack.c:175 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161 +#: builtin/push.c:559 builtin/push.c:560 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:560 +#: builtin/push.c:561 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:563 +#: builtin/push.c:564 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:565 +#: builtin/push.c:566 msgid "bypass pre-push hook" msgstr "förbigå pre-push-krok" -#: builtin/push.c:566 +#: builtin/push.c:567 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:569 builtin/send-pack.c:169 +#: builtin/push.c:570 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "GPG-signera insändningen" -#: builtin/push.c:571 builtin/send-pack.c:176 +#: builtin/push.c:572 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "begär atomiska transaktioner på fjärrsidan" -#: builtin/push.c:589 +#: builtin/push.c:590 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är inkompatibel med --all, --mirror och --tags" -#: builtin/push.c:591 +#: builtin/push.c:592 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" -#: builtin/push.c:611 +#: builtin/push.c:612 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:612 +#: builtin/push.c:613 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -16901,27 +17433,27 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:627 +#: builtin/push.c:628 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:629 +#: builtin/push.c:630 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:633 +#: builtin/push.c:634 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:635 +#: builtin/push.c:636 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:638 +#: builtin/push.c:639 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:642 +#: builtin/push.c:643 msgid "push options must not have new line characters" msgstr "push-flaggor kan inte innehålla radbrytning" @@ -16938,24 +17470,32 @@ msgstr "git range-diff [<flaggor>] <gammal-bas>..<ny-ända>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<flaggor>] <bas> <gammal-ända> <ny-ända>" -#: builtin/range-diff.c:21 +#: builtin/range-diff.c:22 msgid "Percentage by which creation is weighted" msgstr "Procent som skapelse vägs med" -#: builtin/range-diff.c:23 +#: builtin/range-diff.c:24 msgid "use simple diff colors" msgstr "använd enkla diff-färger" -#: builtin/range-diff.c:46 builtin/range-diff.c:50 +#: builtin/range-diff.c:26 +msgid "notes" +msgstr "anteckningar" + +#: builtin/range-diff.c:26 +msgid "passed to 'git log'" +msgstr "sänds till \"git log\"" + +#: builtin/range-diff.c:50 builtin/range-diff.c:54 #, c-format msgid "no .. in range: '%s'" msgstr ".. saknas i intervall: \"%s\"" -#: builtin/range-diff.c:60 +#: builtin/range-diff.c:64 msgid "single arg format must be symmetric range" msgstr "ensamt argument måste vara symmetriskt intervall" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:79 msgid "need two commit ranges" msgstr "behöver två incheckningsintervall" @@ -17037,6 +17577,10 @@ msgstr "felsök unpack-trees" msgid "suppress feedback messages" msgstr "undertryck återkopplingsmeddelanden" +#: builtin/read-tree.c:188 +msgid "You need to resolve your current index first" +msgstr "Du måste lösa ditt befintliga index först" + #: builtin/rebase.c:32 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " @@ -17055,216 +17599,216 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:177 builtin/rebase.c:201 builtin/rebase.c:228 #, c-format msgid "unusable todo list: '%s'" msgstr "oanvändbar todo-lista: %s" -#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 +#: builtin/rebase.c:186 builtin/rebase.c:212 builtin/rebase.c:236 #, c-format msgid "could not write '%s'." msgstr "kunde inte skriva \"%s\"." -#: builtin/rebase.c:252 +#: builtin/rebase.c:271 msgid "no HEAD?" msgstr "inget HEAD?" -#: builtin/rebase.c:279 +#: builtin/rebase.c:298 #, c-format msgid "could not create temporary %s" msgstr "kunde inte skapa temporär %s" -#: builtin/rebase.c:285 +#: builtin/rebase.c:304 msgid "could not mark as interactive" msgstr "kunde inte markera som interaktiv" -#: builtin/rebase.c:343 +#: builtin/rebase.c:362 msgid "could not generate todo list" msgstr "Kunde inte skapa attgöra-lista" -#: builtin/rebase.c:383 +#: builtin/rebase.c:402 msgid "a base commit must be provided with --upstream or --onto" msgstr "en basincheckning måste anges med --upstream eller --onto" -#: builtin/rebase.c:438 +#: builtin/rebase.c:457 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<flaggor>]" -#: builtin/rebase.c:450 +#: builtin/rebase.c:469 msgid "keep empty commits" msgstr "behåll tomma incheckningar" -#: builtin/rebase.c:452 builtin/revert.c:128 +#: builtin/rebase.c:471 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "tillåt incheckningar med tomt meddelande" -#: builtin/rebase.c:453 +#: builtin/rebase.c:472 msgid "rebase merge commits" msgstr "ombasera sammanslagningar" -#: builtin/rebase.c:455 +#: builtin/rebase.c:474 msgid "keep original branch points of cousins" msgstr "behåll ursprungliga förgreningspunkter för kusiner" -#: builtin/rebase.c:457 +#: builtin/rebase.c:476 msgid "move commits that begin with squash!/fixup!" msgstr "flytta incheckningar som inleds med squash!/fixup!" -#: builtin/rebase.c:458 +#: builtin/rebase.c:477 msgid "sign commits" msgstr "signera incheckningar" -#: builtin/rebase.c:460 builtin/rebase.c:1427 +#: builtin/rebase.c:479 builtin/rebase.c:1455 msgid "display a diffstat of what changed upstream" msgstr "vis diffstat för vad som ändrats uppströms" -#: builtin/rebase.c:462 +#: builtin/rebase.c:481 msgid "continue rebase" msgstr "fortsätt ombasering" -#: builtin/rebase.c:464 +#: builtin/rebase.c:483 msgid "skip commit" msgstr "hoppa över incheckning" -#: builtin/rebase.c:465 +#: builtin/rebase.c:484 msgid "edit the todo list" msgstr "redigera attgöra-listan" -#: builtin/rebase.c:467 +#: builtin/rebase.c:486 msgid "show the current patch" msgstr "visa nuvarande patch" -#: builtin/rebase.c:470 +#: builtin/rebase.c:489 msgid "shorten commit ids in the todo list" msgstr "förkorta inchecknings-id i todo-listan" -#: builtin/rebase.c:472 +#: builtin/rebase.c:491 msgid "expand commit ids in the todo list" msgstr "utöka inchecknings-id i todo-listan" -#: builtin/rebase.c:474 +#: builtin/rebase.c:493 msgid "check the todo list" msgstr "kontrollera todo-listan" -#: builtin/rebase.c:476 +#: builtin/rebase.c:495 msgid "rearrange fixup/squash lines" msgstr "ordna om fixup-/squash-rader" -#: builtin/rebase.c:478 +#: builtin/rebase.c:497 msgid "insert exec commands in todo list" msgstr "lägg in exec-kommandon i todo-listan" -#: builtin/rebase.c:479 +#: builtin/rebase.c:498 msgid "onto" msgstr "ovanpå" -#: builtin/rebase.c:482 +#: builtin/rebase.c:501 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:482 +#: builtin/rebase.c:501 msgid "restrict revision" msgstr "begränsa revision" -#: builtin/rebase.c:484 +#: builtin/rebase.c:503 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:485 +#: builtin/rebase.c:504 msgid "squash onto" msgstr "tryck ihop ovanpå" -#: builtin/rebase.c:487 +#: builtin/rebase.c:506 msgid "the upstream commit" msgstr "uppströmsincheckningen" -#: builtin/rebase.c:489 +#: builtin/rebase.c:508 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:489 +#: builtin/rebase.c:508 msgid "head name" msgstr "namn på huvud" -#: builtin/rebase.c:494 +#: builtin/rebase.c:513 msgid "rebase strategy" msgstr "sammanslagningsstrategi" -#: builtin/rebase.c:495 +#: builtin/rebase.c:514 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:496 +#: builtin/rebase.c:515 msgid "strategy options" msgstr "strategiflaggor" -#: builtin/rebase.c:497 +#: builtin/rebase.c:516 msgid "switch-to" msgstr "switch-to" -#: builtin/rebase.c:498 +#: builtin/rebase.c:517 msgid "the branch or commit to checkout" msgstr "gren eller inchecking att checka ut" -#: builtin/rebase.c:499 +#: builtin/rebase.c:518 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:499 +#: builtin/rebase.c:518 msgid "onto name" msgstr "på-namn" -#: builtin/rebase.c:500 +#: builtin/rebase.c:519 msgid "cmd" msgstr "kmd" -#: builtin/rebase.c:500 +#: builtin/rebase.c:519 msgid "the command to run" msgstr "kommando att köra" -#: builtin/rebase.c:503 builtin/rebase.c:1510 +#: builtin/rebase.c:522 builtin/rebase.c:1540 msgid "automatically re-schedule any `exec` that fails" msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt" -#: builtin/rebase.c:519 +#: builtin/rebase.c:540 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges" -#: builtin/rebase.c:535 +#: builtin/rebase.c:556 #, c-format msgid "%s requires an interactive rebase" msgstr "%s kräver en interaktiv ombasering" -#: builtin/rebase.c:587 +#: builtin/rebase.c:608 #, c-format msgid "could not get 'onto': '%s'" msgstr "kunde inte hämta \"onto\": \"%s\"" -#: builtin/rebase.c:602 +#: builtin/rebase.c:623 #, c-format msgid "invalid orig-head: '%s'" msgstr "ogiltigt orig-head: \"%s\"" -#: builtin/rebase.c:627 +#: builtin/rebase.c:648 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\"" -#: builtin/rebase.c:703 +#: builtin/rebase.c:724 #, c-format msgid "Could not read '%s'" msgstr "Kunde inte läsa \"%s\"" -#: builtin/rebase.c:721 +#: builtin/rebase.c:742 #, c-format msgid "Cannot store %s" msgstr "Kan inte spara %s" -#: builtin/rebase.c:828 +#: builtin/rebase.c:849 msgid "could not determine HEAD revision" msgstr "kunde inte bestämma HEAD-revision" -#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:972 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -17278,7 +17822,7 @@ msgstr "" "För att avbryta och återgå till där du var före ombaseringen, kör \"git " "rebase --abort\"." -#: builtin/rebase.c:1032 +#: builtin/rebase.c:1060 #, c-format msgid "" "\n" @@ -17297,7 +17841,7 @@ msgstr "" "\n" "Därför kan inte git ombasera dessa." -#: builtin/rebase.c:1339 +#: builtin/rebase.c:1367 #, c-format msgid "" "%s\n" @@ -17314,7 +17858,7 @@ msgstr "" " git rebase '<gren>'\n" "\n" -#: builtin/rebase.c:1355 +#: builtin/rebase.c:1383 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17327,132 +17871,144 @@ msgstr "" " git branch --set-upstream-to=%s/<gren> %s\n" "\n" -#: builtin/rebase.c:1385 +#: builtin/rebase.c:1413 msgid "exec commands cannot contain newlines" msgstr "exec-kommandon kan inte innehålla nyradstecken" -#: builtin/rebase.c:1389 +#: builtin/rebase.c:1417 msgid "empty exec command" msgstr "tomt exec-kommando" -#: builtin/rebase.c:1418 +#: builtin/rebase.c:1446 msgid "rebase onto given branch instead of upstream" msgstr "ombasera mot given grenen istället för uppström" -#: builtin/rebase.c:1420 +#: builtin/rebase.c:1448 msgid "use the merge-base of upstream and branch as the current base" msgstr "använd sammanslagningsbasen mellan uppströms och gren som aktuell bas" -#: builtin/rebase.c:1422 +#: builtin/rebase.c:1450 msgid "allow pre-rebase hook to run" msgstr "tillåt pre-rebase-krok att köra" -#: builtin/rebase.c:1424 +#: builtin/rebase.c:1452 msgid "be quiet. implies --no-stat" msgstr "var tyst. implicerar --no-stat" -#: builtin/rebase.c:1430 +#: builtin/rebase.c:1458 msgid "do not show diffstat of what changed upstream" msgstr "visa inte en diffstat för vad som ändrats uppströms" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1461 msgid "add a Signed-off-by: line to each commit" msgstr "lägg \"Signed-off-by:\"-rad till varje incheckning" -#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441 -msgid "passed to 'git am'" -msgstr "sänds till \"git am\"" +#: builtin/rebase.c:1464 +msgid "make committer date match author date" +msgstr "sätt incheckningsdatum till författardatum" + +#: builtin/rebase.c:1466 +msgid "ignore author date and use current date" +msgstr "ignorera författardatum och använd nuvarande" + +#: builtin/rebase.c:1468 +msgid "synonym of --reset-author-date" +msgstr "synonym för --reset-author-date" -#: builtin/rebase.c:1443 builtin/rebase.c:1445 +#: builtin/rebase.c:1470 builtin/rebase.c:1474 msgid "passed to 'git apply'" msgstr "sänds till \"git apply\"" -#: builtin/rebase.c:1447 builtin/rebase.c:1450 +#: builtin/rebase.c:1472 +msgid "ignore changes in whitespace" +msgstr "ignorera ändringar i blanksteg" + +#: builtin/rebase.c:1476 builtin/rebase.c:1479 msgid "cherry-pick all commits, even if unchanged" msgstr "utför cherry-pick på alla incheckningar, även om oändrad" -#: builtin/rebase.c:1452 +#: builtin/rebase.c:1481 msgid "continue" msgstr "fortsätt" -#: builtin/rebase.c:1455 +#: builtin/rebase.c:1484 msgid "skip current patch and continue" msgstr "hoppa över nuvarande patch och fortsätt" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1486 msgid "abort and check out the original branch" msgstr "avbryt och checka ut ursprungsgrenen" -#: builtin/rebase.c:1460 +#: builtin/rebase.c:1489 msgid "abort but keep HEAD where it is" msgstr "avbryt men behåll HEAD där det är" -#: builtin/rebase.c:1461 +#: builtin/rebase.c:1490 msgid "edit the todo list during an interactive rebase" msgstr "redigera attgöra-listan under interaktiv ombasering." -#: builtin/rebase.c:1464 +#: builtin/rebase.c:1493 msgid "show the patch file being applied or merged" msgstr "visa patchen som tillämpas eller slås samman" -#: builtin/rebase.c:1467 +#: builtin/rebase.c:1496 msgid "use merging strategies to rebase" msgstr "använd sammanslagningsstrategier för sammanslagning" -#: builtin/rebase.c:1471 +#: builtin/rebase.c:1500 msgid "let the user edit the list of commits to rebase" msgstr "låt användaren redigera listan över incheckningar att ombasera" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1504 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" "(AVRÅDS) försök återskapa sammanslagningar istället för att ignorera dem" -#: builtin/rebase.c:1479 +#: builtin/rebase.c:1509 msgid "preserve empty commits during rebase" msgstr "behåll tomma incheckningar under ombasering" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1511 msgid "move commits that begin with squash!/fixup! under -i" msgstr "flytta incheckningar som börjar med squash!/fixup! under -i" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1517 msgid "automatically stash/stash pop before and after" msgstr "utför automatiskt stash/stash pop före och efter" -#: builtin/rebase.c:1489 +#: builtin/rebase.c:1519 msgid "add exec lines after each commit of the editable list" msgstr "lägg till exec-rader efter varje incheckning i den redigerbara listan" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1523 msgid "allow rebasing commits with empty messages" msgstr "tillåt ombasering av incheckningar med tomt meddelande" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1526 msgid "try to rebase merges instead of skipping them" msgstr "försök ombasera sammanslagningar istället för att ignorera dem" -#: builtin/rebase.c:1499 +#: builtin/rebase.c:1529 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "använd \"merge-base --fork-point\" för att förfina uppström" -#: builtin/rebase.c:1501 +#: builtin/rebase.c:1531 msgid "use the given merge strategy" msgstr "använd angiven sammanslagningsstrategi" -#: builtin/rebase.c:1503 builtin/revert.c:115 +#: builtin/rebase.c:1533 builtin/revert.c:115 msgid "option" msgstr "alternativ" -#: builtin/rebase.c:1504 +#: builtin/rebase.c:1534 msgid "pass the argument through to the merge strategy" msgstr "sänd flaggan till sammanslagningsstrategin" -#: builtin/rebase.c:1507 +#: builtin/rebase.c:1537 msgid "rebase all reachable commits up to the root(s)" msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna" -#: builtin/rebase.c:1524 +#: builtin/rebase.c:1554 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -17460,37 +18016,37 @@ msgstr "" "stödet för rebase.useBuiltin har tagits bort!\n" "Se posten för det i \"git help config\" för detaljer." -#: builtin/rebase.c:1530 +#: builtin/rebase.c:1560 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera." -#: builtin/rebase.c:1571 +#: builtin/rebase.c:1601 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "git rebase --preserve-merges avråds från. Använd --rebase-merges istället." -#: builtin/rebase.c:1576 +#: builtin/rebase.c:1606 msgid "cannot combine '--keep-base' with '--onto'" msgstr "kan inte kombinera \"--keep-base\" med \"--onto\"" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1608 msgid "cannot combine '--keep-base' with '--root'" msgstr "kan inte kombinera \"--keep-base\" med \"--root\"" -#: builtin/rebase.c:1582 +#: builtin/rebase.c:1612 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: builtin/rebase.c:1586 +#: builtin/rebase.c:1616 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering." -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1639 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: builtin/rebase.c:1621 +#: builtin/rebase.c:1651 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -17498,16 +18054,16 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: builtin/rebase.c:1640 +#: builtin/rebase.c:1670 msgid "could not discard worktree changes" msgstr "kunde inte kasta ändringar i arbetskatalogen" -#: builtin/rebase.c:1659 +#: builtin/rebase.c:1689 #, c-format msgid "could not move back to %s" msgstr "kunde inte flytta tillbaka till %s" -#: builtin/rebase.c:1704 +#: builtin/rebase.c:1734 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17528,159 +18084,159 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där.\n" -#: builtin/rebase.c:1725 +#: builtin/rebase.c:1757 msgid "switch `C' expects a numerical value" msgstr "flaggan \"C\" förväntar ett numeriskt värde" -#: builtin/rebase.c:1766 +#: builtin/rebase.c:1798 #, c-format msgid "Unknown mode: %s" msgstr "Okänt läge: %s" -#: builtin/rebase.c:1788 +#: builtin/rebase.c:1820 msgid "--strategy requires --merge or --interactive" msgstr "--strategy kräver --merge eller --interactive" -#: builtin/rebase.c:1828 +#: builtin/rebase.c:1860 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec kräver --exec eller --interactive" -#: builtin/rebase.c:1840 +#: builtin/rebase.c:1872 msgid "cannot combine am options with either interactive or merge options" msgstr "" "kan inte kombinera am-flaggor med varken interaktiv- eller " "sammanslagningsflaggor" -#: builtin/rebase.c:1859 +#: builtin/rebase.c:1891 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\"" -#: builtin/rebase.c:1863 +#: builtin/rebase.c:1895 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec" "\"" -#: builtin/rebase.c:1887 +#: builtin/rebase.c:1919 #, c-format msgid "invalid upstream '%s'" msgstr "felaktig uppström \"%s\"" -#: builtin/rebase.c:1893 +#: builtin/rebase.c:1925 msgid "Could not create new root commit" msgstr "kunde inte skapa ny rotincheckning" -#: builtin/rebase.c:1919 +#: builtin/rebase.c:1951 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "\"%s\": behöver precis en sammanslagningsbas med gren" -#: builtin/rebase.c:1922 +#: builtin/rebase.c:1954 #, c-format msgid "'%s': need exactly one merge base" msgstr "\"%s\": behöver precis en sammanslagningsbas" -#: builtin/rebase.c:1930 +#: builtin/rebase.c:1962 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "Pekar inte på en giltig incheckning: \"%s\"" -#: builtin/rebase.c:1955 +#: builtin/rebase.c:1987 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\"" -#: builtin/rebase.c:1963 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:1995 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:1961 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/rebase.c:1974 +#: builtin/rebase.c:2006 msgid "Could not resolve HEAD to a revision" msgstr "Kunde inte bestämma HEAD:s incheckning" -#: builtin/rebase.c:2012 +#: builtin/rebase.c:2044 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: builtin/rebase.c:2015 +#: builtin/rebase.c:2047 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Oväntat svar från stash: \"%s\"" -#: builtin/rebase.c:2021 +#: builtin/rebase.c:2053 #, c-format msgid "Could not create directory for '%s'" msgstr "Kunde inte skapa katalog för \"%s\"" -#: builtin/rebase.c:2024 +#: builtin/rebase.c:2056 #, c-format msgid "Created autostash: %s\n" msgstr "Skapade autostash: %s\n" -#: builtin/rebase.c:2027 +#: builtin/rebase.c:2059 msgid "could not reset --hard" msgstr "kunde inte utföra \"reset --hard\"" -#: builtin/rebase.c:2036 +#: builtin/rebase.c:2068 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: builtin/rebase.c:2063 +#: builtin/rebase.c:2095 #, c-format msgid "could not parse '%s'" msgstr "kunde inte tolka \"%s\"" -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2108 #, c-format msgid "could not switch to %s" msgstr "kunde inte växla till %s" -#: builtin/rebase.c:2087 +#: builtin/rebase.c:2119 msgid "HEAD is up to date." msgstr "HEAD är à jour." -#: builtin/rebase.c:2089 +#: builtin/rebase.c:2121 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Aktuell gren %s är à jour.\n" -#: builtin/rebase.c:2097 +#: builtin/rebase.c:2129 msgid "HEAD is up to date, rebase forced." msgstr "HEAD är à jour, ombasering framtvingad." -#: builtin/rebase.c:2099 +#: builtin/rebase.c:2131 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Aktuell gren %s är à jour, ombasering framtvingad.\n" -#: builtin/rebase.c:2107 +#: builtin/rebase.c:2139 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: builtin/rebase.c:2114 +#: builtin/rebase.c:2146 #, c-format msgid "Changes to %s:\n" msgstr "Ändringar till %s:\n" -#: builtin/rebase.c:2117 +#: builtin/rebase.c:2149 #, c-format msgid "Changes from %s to %s:\n" msgstr "Ändringar från %s till %s:\n" -#: builtin/rebase.c:2142 +#: builtin/rebase.c:2174 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det...\n" -#: builtin/rebase.c:2151 +#: builtin/rebase.c:2183 msgid "Could not detach HEAD" msgstr "Kunde inte koppla från HEAD" -#: builtin/rebase.c:2160 +#: builtin/rebase.c:2192 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Snabbspolade %s till %s.\n" @@ -17968,7 +18524,7 @@ msgstr "(matchande)" msgid "(delete)" msgstr "(ta bort)" -#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 +#: builtin/remote.c:629 builtin/remote.c:764 builtin/remote.c:863 #, c-format msgid "No such remote: '%s'" msgstr "Ingen sådan fjärr: \"%s\"" @@ -17989,17 +18545,17 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nödvändigt." -#: builtin/remote.c:702 +#: builtin/remote.c:701 #, c-format msgid "deleting '%s' failed" msgstr "misslyckades ta bort \"%s\"" -#: builtin/remote.c:736 +#: builtin/remote.c:735 #, c-format msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:802 +#: builtin/remote.c:801 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -18013,118 +18569,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:816 +#: builtin/remote.c:815 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:917 +#: 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:920 +#: builtin/remote.c:919 msgid " tracked" msgstr " spårad" -#: builtin/remote.c:922 +#: 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:924 +#: builtin/remote.c:923 msgid " ???" msgstr " ???" -#: builtin/remote.c:965 +#: 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:974 +#: builtin/remote.c:973 #, c-format msgid "rebases interactively onto remote %s" msgstr "ombaseras interaktivt på fjärren %s" -#: builtin/remote.c:976 +#: 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:979 +#: builtin/remote.c:978 #, c-format msgid "rebases onto remote %s" msgstr "ombaseras på fjärren %s" -#: builtin/remote.c:983 +#: builtin/remote.c:982 #, c-format msgid " merges with remote %s" msgstr " sammanslås med fjärren %s" -#: builtin/remote.c:986 +#: builtin/remote.c:985 #, c-format msgid "merges with remote %s" msgstr "sammanslås med fjärren %s" -#: builtin/remote.c:989 +#: builtin/remote.c:988 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s och med fjärren %s\n" -#: builtin/remote.c:1032 +#: builtin/remote.c:1031 msgid "create" msgstr "skapa" -#: builtin/remote.c:1035 +#: builtin/remote.c:1034 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1039 +#: builtin/remote.c:1038 msgid "up to date" msgstr "àjour" -#: builtin/remote.c:1042 +#: builtin/remote.c:1041 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1045 +#: builtin/remote.c:1044 msgid "local out of date" msgstr "lokal föråldrad" -#: builtin/remote.c:1052 +#: builtin/remote.c:1051 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1055 +#: builtin/remote.c:1054 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sänder till %-*s (%s)" -#: builtin/remote.c:1059 +#: builtin/remote.c:1058 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1061 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" -#: builtin/remote.c:1130 +#: builtin/remote.c:1129 msgid "do not query remotes" msgstr "fråga inte fjärrar" -#: builtin/remote.c:1157 +#: builtin/remote.c:1156 #, c-format msgid "* remote %s" msgstr "* fjärr %s" -#: builtin/remote.c:1158 +#: builtin/remote.c:1157 #, c-format msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313 msgid "(no URL)" msgstr "(ingen URL)" @@ -18132,188 +18688,179 @@ msgstr "(ingen URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1172 builtin/remote.c:1174 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: 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:1177 +#: builtin/remote.c:1176 msgid "(not queried)" msgstr "(inte förfrågad)" -#: builtin/remote.c:1179 +#: builtin/remote.c:1178 msgid "(unknown)" msgstr "(okänd)" -#: builtin/remote.c:1183 +#: 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:1195 +#: 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:1198 builtin/remote.c:1224 +#: builtin/remote.c:1197 builtin/remote.c:1223 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1207 +#: 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:1215 +#: builtin/remote.c:1214 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1221 +#: 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:1242 +#: 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:1244 +#: builtin/remote.c:1243 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1259 +#: builtin/remote.c:1258 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1261 +#: 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:1271 +#: builtin/remote.c:1270 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1279 +#: builtin/remote.c:1278 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1280 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1298 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1300 +#: builtin/remote.c:1299 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1310 +#: builtin/remote.c:1309 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1311 +#: builtin/remote.c:1310 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1326 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1329 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: 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:1454 +#: builtin/remote.c:1453 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1461 +#: builtin/remote.c:1460 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1478 +#: 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:1480 +#: builtin/remote.c:1479 msgid "return all URLs" msgstr "returnera alla URL:er" -#: builtin/remote.c:1508 +#: 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:1534 +#: builtin/remote.c:1533 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1536 +#: builtin/remote.c:1535 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1538 +#: builtin/remote.c:1537 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1545 +#: builtin/remote.c:1544 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1584 +#: builtin/remote.c:1583 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1592 +#: builtin/remote.c:1591 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1594 +#: 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:1610 -msgid "be verbose; must be placed before a subcommand" -msgstr "var pratsam; måste skrivas före ett underkommando" - -#: builtin/remote.c:1641 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "Okänt underkommando: %s" - #: builtin/repack.c:23 msgid "git repack [<options>]" msgstr "git repack [<flaggor>]" @@ -18331,108 +18878,108 @@ msgstr "" msgid "could not start pack-objects to repack promisor objects" msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt" -#: builtin/repack.c:230 builtin/repack.c:409 +#: builtin/repack.c:230 builtin/repack.c:416 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Förväntar kompletta hex-objekt-id-rader endast från pack-objects." -#: builtin/repack.c:247 +#: builtin/repack.c:254 msgid "could not finish pack-objects to repack promisor objects" msgstr "kunde inte avsluta pack-objects för att packa om kontraktsobjekt" -#: builtin/repack.c:285 +#: builtin/repack.c:292 msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" -#: builtin/repack.c:287 +#: builtin/repack.c:294 msgid "same as -a, and turn unreachable objects loose" msgstr "samma som -a, och gör onåbara objekt lösa" -#: builtin/repack.c:290 +#: builtin/repack.c:297 msgid "remove redundant packs, and run git-prune-packed" msgstr "ta bort överflödiga paket, och kör git-prune-packed" -#: builtin/repack.c:292 +#: builtin/repack.c:299 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "sänd --no-reuse-delta till git-pack-objects" -#: builtin/repack.c:294 +#: builtin/repack.c:301 msgid "pass --no-reuse-object to git-pack-objects" msgstr "sänd --no-reuse-object till git-pack-objects" -#: builtin/repack.c:296 +#: builtin/repack.c:303 msgid "do not run git-update-server-info" msgstr "kör inte git-update-server-info" -#: builtin/repack.c:299 +#: builtin/repack.c:306 msgid "pass --local to git-pack-objects" msgstr "sänd --local till git-pack-objects" -#: builtin/repack.c:301 +#: builtin/repack.c:308 msgid "write bitmap index" msgstr "skriv bitkartindex" -#: builtin/repack.c:303 +#: builtin/repack.c:310 msgid "pass --delta-islands to git-pack-objects" msgstr "sänd --delta-islands till git-pack-objects" -#: builtin/repack.c:304 +#: builtin/repack.c:311 msgid "approxidate" msgstr "cirkadatum" -#: builtin/repack.c:305 +#: builtin/repack.c:312 msgid "with -A, do not loosen objects older than this" msgstr "med -A, lös inte upp objekt äldre än detta" -#: builtin/repack.c:307 +#: builtin/repack.c:314 msgid "with -a, repack unreachable objects" msgstr "med -a, packa om onåbara objekt" -#: builtin/repack.c:309 +#: builtin/repack.c:316 msgid "size of the window used for delta compression" msgstr "storlek på fönster använt för deltakomprimering" -#: builtin/repack.c:310 builtin/repack.c:316 +#: builtin/repack.c:317 builtin/repack.c:323 msgid "bytes" msgstr "byte" -#: builtin/repack.c:311 +#: builtin/repack.c:318 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:313 +#: builtin/repack.c:320 msgid "limits the maximum delta depth" msgstr "begränsa maximalt deltadjup" -#: builtin/repack.c:315 +#: builtin/repack.c:322 msgid "limits the maximum number of threads" msgstr "begränsar maximalt antal trådar" -#: builtin/repack.c:317 +#: builtin/repack.c:324 msgid "maximum size of each packfile" msgstr "maximal storlek på varje paketfil" -#: builtin/repack.c:319 +#: builtin/repack.c:326 msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:321 +#: builtin/repack.c:328 msgid "do not repack this pack" msgstr "packa inte om detta paket" -#: builtin/repack.c:331 +#: builtin/repack.c:338 msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" -#: builtin/repack.c:335 +#: builtin/repack.c:342 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable och -A kan inte användas samtidigt" -#: builtin/repack.c:418 +#: builtin/repack.c:425 msgid "Nothing new to pack." msgstr "Inget nytt att packa." -#: builtin/repack.c:479 +#: builtin/repack.c:486 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18451,7 +18998,7 @@ msgstr "" "VARNING: namnet misslyckades också.\n" "VARNING: Byt namn på dem i %s manuellt:\n" -#: builtin/repack.c:527 +#: builtin/repack.c:534 #, c-format msgid "failed to remove '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -18728,119 +19275,125 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." msgstr "git reset [-q] [<träd-igt>] [--] <sökvägar>..." #: builtin/reset.c:34 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgid "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" +msgstr "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<träd-igt>]" + +#: builtin/reset.c:35 +msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" msgstr "git reset --patch [<träd-igt>] [--] [<sökvägar>...]" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "mixed" msgstr "blandad" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "soft" msgstr "mjuk" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "hard" msgstr "hård" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "merge" msgstr "sammanslagning" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "keep" msgstr "behåll" -#: builtin/reset.c:81 +#: builtin/reset.c:82 msgid "You do not have a valid HEAD." msgstr "Du har inte en giltig HEAD." -#: builtin/reset.c:83 +#: builtin/reset.c:84 msgid "Failed to find tree of HEAD." msgstr "Kunde inte hitta trädet för HEAD." -#: builtin/reset.c:89 +#: builtin/reset.c:90 #, c-format msgid "Failed to find tree of %s." msgstr "Kunde inte hitta trädet för %s." -#: builtin/reset.c:114 +#: builtin/reset.c:115 #, c-format msgid "HEAD is now at %s" msgstr "HEAD är nu på %s" -#: builtin/reset.c:193 +#: builtin/reset.c:194 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." -#: builtin/reset.c:293 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:294 builtin/stash.c:519 builtin/stash.c:594 +#: builtin/stash.c:618 msgid "be quiet, only report errors" msgstr "var tyst, rapportera endast fel" -#: builtin/reset.c:295 +#: builtin/reset.c:296 msgid "reset HEAD and index" msgstr "återställ HEAD och index" -#: builtin/reset.c:296 +#: builtin/reset.c:297 msgid "reset only HEAD" msgstr "återställ endast HEAD" -#: builtin/reset.c:298 builtin/reset.c:300 +#: builtin/reset.c:299 builtin/reset.c:301 msgid "reset HEAD, index and working tree" msgstr "återställ HEAD, index och arbetskatalog" -#: builtin/reset.c:302 +#: builtin/reset.c:303 msgid "reset HEAD but keep local changes" msgstr "återställ HEAD men behåll lokala ändringar" -#: builtin/reset.c:308 +#: builtin/reset.c:309 msgid "record only the fact that removed paths will be added later" msgstr "registrera endast att borttagna sökvägar kommer läggas till senare" -#: builtin/reset.c:326 +#: builtin/reset.c:343 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Kunde inte slå upp \"%s\" som en giltig revision." -#: builtin/reset.c:334 +#: builtin/reset.c:351 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd." -#: builtin/reset.c:343 +#: builtin/reset.c:360 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch är inkompatibel med --{hard,mixed,soft}" -#: builtin/reset.c:353 +#: builtin/reset.c:370 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"." -#: builtin/reset.c:355 +#: builtin/reset.c:372 #, c-format msgid "Cannot do %s reset with paths." msgstr "Kan inte göra %s återställning med sökvägar." -#: builtin/reset.c:370 +#: builtin/reset.c:387 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s återställning tillåts inte i ett naket arkiv" -#: builtin/reset.c:374 +#: builtin/reset.c:391 msgid "-N can only be used with --mixed" msgstr "-N kan endast användas med --mixed" -#: builtin/reset.c:395 +#: builtin/reset.c:412 msgid "Unstaged changes after reset:" msgstr "Oköade ändringar efter återställning:" -#: builtin/reset.c:398 +#: builtin/reset.c:415 #, c-format msgid "" "\n" @@ -18854,12 +19407,12 @@ msgstr "" "konfigurationsvariabeln\n" "reset.quiet till true för att göra detta till förval.\n" -#: builtin/reset.c:408 +#: builtin/reset.c:425 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." -#: builtin/reset.c:412 +#: builtin/reset.c:429 msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." @@ -19319,6 +19872,56 @@ msgstr "visa inte resultat på standard ut (användbart med --verify)" msgid "show refs from stdin that aren't in local repository" msgstr "visa referenser från standard in som inte finns i lokalt arkiv" +#: builtin/sparse-checkout.c:20 +msgid "git sparse-checkout (init|list|set|disable) <options>" +msgstr "git sparse-checkout (init|list|set|disable) <flaggor>" + +#: builtin/sparse-checkout.c:61 +msgid "this worktree is not sparse (sparse-checkout file may not exist)" +msgstr "" +"arbetskatalogen är inte glest (sparse-checkout-filen kanske inte finns)" + +#: builtin/sparse-checkout.c:220 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "misslyckades ändra inställningen extensions.worktreeConfig" + +#: builtin/sparse-checkout.c:237 +msgid "git sparse-checkout init [--cone]" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:256 +msgid "initialize the sparse-checkout in cone mode" +msgstr "initiera sparse-checkout i konläge" + +#: builtin/sparse-checkout.c:262 +msgid "initialize sparse-checkout" +msgstr "initiera sparse-checkout" + +#: builtin/sparse-checkout.c:295 +#, c-format +msgid "failed to open '%s'" +msgstr "misslyckades öppna \"%s\"" + +#: builtin/sparse-checkout.c:361 +msgid "git sparse-checkout set (--stdin | <patterns>)" +msgstr "git sparse-checkout set (--stdin | <mönster>)" + +#: builtin/sparse-checkout.c:378 +msgid "read patterns from standard in" +msgstr "läs mönster från standard in" + +#: builtin/sparse-checkout.c:384 +msgid "set sparse-checkout patterns" +msgstr "ställ in filter för gles utcheckning" + +#: builtin/sparse-checkout.c:447 +msgid "disable sparse-checkout" +msgstr "inaktivera gles utcheckning" + +#: builtin/sparse-checkout.c:459 +msgid "error while refreshing working directory" +msgstr "fel vid uppdatering av arbetskatalog" + #: builtin/stash.c:22 builtin/stash.c:37 msgid "git stash list [<options>]" msgstr "git stash list [<flaggor>]" @@ -19383,7 +19986,7 @@ msgstr "\"%s\" är inte en \"stash\"-liknande incheckning" msgid "Too many revisions specified:%s" msgstr "För många revisioner angivna:%s" -#: builtin/stash.c:161 git-legacy-stash.sh:548 +#: builtin/stash.c:161 git-legacy-stash.sh:549 msgid "No stash entries found." msgstr "Inga \"stash\"-poster hittades." @@ -19422,51 +20025,51 @@ msgstr "kunde inte återställa ospårade filer från stash-post" msgid "Merging %s with %s" msgstr "Slår ihop %s med %s" -#: builtin/stash.c:460 git-legacy-stash.sh:680 +#: builtin/stash.c:460 git-legacy-stash.sh:681 msgid "Index was not unstashed." msgstr "Indexet har inte tagits upp ur \"stash\":en" -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:521 builtin/stash.c:620 msgid "attempt to recreate the index" msgstr "försök återskapa indexet" -#: builtin/stash.c:555 +#: builtin/stash.c:554 #, c-format msgid "Dropped %s (%s)" msgstr "Kastade %s (%s)" -#: builtin/stash.c:558 +#: builtin/stash.c:557 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Kunde inte kasta \"stash\"-post" -#: builtin/stash.c:583 +#: builtin/stash.c:582 #, c-format msgid "'%s' is not a stash reference" msgstr "\"%s\" är inte en \"stash\"-referens" -#: builtin/stash.c:633 git-legacy-stash.sh:694 +#: builtin/stash.c:632 git-legacy-stash.sh:695 msgid "The stash entry is kept in case you need it again." msgstr "Stash-posten behålls ifall du behöver den igen." -#: builtin/stash.c:656 git-legacy-stash.sh:712 +#: builtin/stash.c:655 git-legacy-stash.sh:713 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: builtin/stash.c:796 builtin/stash.c:833 +#: builtin/stash.c:795 builtin/stash.c:832 #, c-format msgid "Cannot update %s with %s" msgstr "Kan inte uppdatera %s med %s" -#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506 +#: builtin/stash.c:813 builtin/stash.c:1470 builtin/stash.c:1506 msgid "stash message" msgstr "\"stash\"-meddelande" -#: builtin/stash.c:824 +#: builtin/stash.c:823 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" kräver ett <incheckning>-argument" -#: builtin/stash.c:1046 git-legacy-stash.sh:217 +#: builtin/stash.c:1045 git-legacy-stash.sh:218 msgid "No changes selected" msgstr "Inga ändringar valda" @@ -19482,16 +20085,16 @@ msgstr "Kan inte spara aktuellt tillstånd för indexet" msgid "Cannot save the untracked files" msgstr "Kan inte spara ospårade filer" -#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200 -#: git-legacy-stash.sh:213 +#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:201 +#: git-legacy-stash.sh:214 msgid "Cannot save the current worktree state" msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" -#: builtin/stash.c:1229 git-legacy-stash.sh:233 +#: builtin/stash.c:1229 git-legacy-stash.sh:234 msgid "Cannot record working tree state" msgstr "Kan inte registrera tillstånd för arbetskatalog" -#: builtin/stash.c:1278 git-legacy-stash.sh:337 +#: builtin/stash.c:1278 git-legacy-stash.sh:338 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt" @@ -19499,15 +20102,15 @@ msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt" msgid "Did you forget to 'git add'?" msgstr "Glömde du använda \"git add\"?" -#: builtin/stash.c:1309 git-legacy-stash.sh:345 +#: builtin/stash.c:1309 git-legacy-stash.sh:346 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" -#: builtin/stash.c:1316 git-legacy-stash.sh:350 +#: builtin/stash.c:1316 git-legacy-stash.sh:351 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: builtin/stash.c:1331 git-legacy-stash.sh:354 +#: builtin/stash.c:1331 git-legacy-stash.sh:355 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" @@ -19516,7 +20119,7 @@ msgstr "Kan inte spara aktuell status" msgid "Saved working directory and index state %s" msgstr "Sparade arbetskatalogen och indexstatus %s" -#: builtin/stash.c:1426 git-legacy-stash.sh:384 +#: builtin/stash.c:1426 git-legacy-stash.sh:385 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" @@ -19561,40 +20164,40 @@ msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken" msgid "prepend comment character and space to each line" msgstr "lägg in kommentarstecken och blanksteg först på varje rad" -#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1970 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" -#: builtin/submodule--helper.c:62 +#: builtin/submodule--helper.c:64 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote tar inga argument" -#: builtin/submodule--helper.c:100 +#: builtin/submodule--helper.c:102 #, 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:408 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1380 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" -#: builtin/submodule--helper.c:413 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 -#: builtin/submodule--helper.c:651 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:653 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules" -#: builtin/submodule--helper.c:522 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "Går in i \"%s\"\n" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -19603,7 +20206,7 @@ msgstr "" "run_command returnerade icke-nollstatus för %s\n" "." -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -19614,19 +20217,19 @@ msgstr "" "undermoduler för %s\n" "." -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:565 msgid "Suppress output of entering each submodule command" msgstr "Dölj utdata från för varje undermodulskommando som startas" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1053 msgid "Recurse into nested submodules" msgstr "Rekursera in i nästlade undermoduler" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -19635,54 +20238,54 @@ msgstr "" "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget " "officiella uppström." -#: builtin/submodule--helper.c:665 +#: builtin/submodule--helper.c:667 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Misslyckades registrera url för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:669 +#: builtin/submodule--helper.c:671 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n" -#: builtin/submodule--helper.c:679 +#: builtin/submodule--helper.c:681 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n" -#: builtin/submodule--helper.c:686 +#: builtin/submodule--helper.c:688 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:708 +#: builtin/submodule--helper.c:710 msgid "Suppress output for initializing a submodule" msgstr "Dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:715 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<flaggor>] [<sökväg>]" -#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:914 #, 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:824 +#: builtin/submodule--helper.c:827 #, 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:851 builtin/submodule--helper.c:1020 +#: builtin/submodule--helper.c:854 builtin/submodule--helper.c:1023 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "misslyckades rekursera in i undermodulen \"%s\"" -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:878 builtin/submodule--helper.c:1189 msgid "Suppress submodule status output" msgstr "Hindra statusutskrift för undermodul" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:879 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -19690,47 +20293,47 @@ msgstr "" "Visa incheckning från indexet istället för den som lagrats i undermodulens " "HEAD" -#: builtin/submodule--helper.c:877 +#: builtin/submodule--helper.c:880 msgid "recurse into nested submodules" msgstr "rekursera in i nästlade undermoduler" -#: builtin/submodule--helper.c:882 +#: builtin/submodule--helper.c:885 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]" -#: builtin/submodule--helper.c:906 +#: builtin/submodule--helper.c:909 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sökväg>" -#: builtin/submodule--helper.c:970 +#: builtin/submodule--helper.c:973 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synkroniserar undermodul-url för \"%s\"\n" -#: builtin/submodule--helper.c:976 +#: builtin/submodule--helper.c:979 #, 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:990 +#: builtin/submodule--helper.c:993 #, 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:1001 +#: builtin/submodule--helper.c:1004 #, 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:1048 +#: builtin/submodule--helper.c:1051 msgid "Suppress output of synchronizing submodule url" msgstr "Dölj utdata från synkroniering av undermodul-url" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1058 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]" -#: builtin/submodule--helper.c:1109 +#: builtin/submodule--helper.c:1112 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -19739,7 +20342,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:1121 +#: builtin/submodule--helper.c:1124 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -19748,81 +20351,97 @@ msgstr "" "Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort " "dem" -#: builtin/submodule--helper.c:1129 +#: builtin/submodule--helper.c:1132 #, c-format msgid "Cleared directory '%s'\n" msgstr "Rensade katalogen \"%s\"\n" -#: builtin/submodule--helper.c:1131 +#: builtin/submodule--helper.c:1134 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1145 #, c-format msgid "could not create empty submodule directory %s" msgstr "kunde inte skapa tom undermodulskatalog %s" -#: builtin/submodule--helper.c:1158 +#: builtin/submodule--helper.c:1161 #, 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:1187 +#: builtin/submodule--helper.c:1190 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:1188 +#: builtin/submodule--helper.c:1191 msgid "Unregister all submodules" msgstr "Avregistrera alla undermoduler" -#: builtin/submodule--helper.c:1193 +#: builtin/submodule--helper.c:1196 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1210 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:1302 builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1275 +msgid "" +"An alternate computed from a superproject's alternate is invalid.\n" +"To allow Git to clone without an alternate in such a case, set\n" +"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" +"'--reference-if-able' instead of '--reference'." +msgstr "" +"En suppleant beräknad från överprojektets suppleant är ogiltig.\n" +"För att i så fall låta Git klona utan ett suppleant, sätt\n" +"submodule.alternateErrorStrategy till \"info\" eller, likvärdigt, klona\n" +"med \"--reference-if-able\" istället för \"--reference\"." + +#: builtin/submodule--helper.c:1314 builtin/submodule--helper.c:1317 #, c-format msgid "submodule '%s' cannot add alternate: %s" -msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s" +msgstr "undermodulen \"%s\" kan inte lägga till suppleant: %s" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1353 #, 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:1348 +#: builtin/submodule--helper.c:1360 #, 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:1371 +#: builtin/submodule--helper.c:1383 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen skall klonas till" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1386 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:1377 +#: builtin/submodule--helper.c:1389 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:1385 +#: builtin/submodule--helper.c:1397 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1897 msgid "force cloning progress" msgstr "tvinga kloningsförlopp" -#: builtin/submodule--helper.c:1393 +#: builtin/submodule--helper.c:1402 builtin/submodule--helper.c:1899 +msgid "disallow cloning into non-empty directory" +msgstr "förhindra kloning till icke-tom katalog" + +#: builtin/submodule--helper.c:1407 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -19830,93 +20449,103 @@ 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:1424 +#: builtin/submodule--helper.c:1431 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "vägrar skapa/använda \"%s\" i en annan undermoduls gitkatalog" + +#: builtin/submodule--helper.c:1442 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\"" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1446 +#, c-format +msgid "directory not empty: '%s'" +msgstr "katalogen inte tom: \"%s\"" + +#: builtin/submodule--helper.c:1458 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" -#: builtin/submodule--helper.c:1474 +#: builtin/submodule--helper.c:1494 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Ogiltigt uppdateringsläge \"%s\" för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1478 +#: builtin/submodule--helper.c:1498 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Ogiltigt uppdateringsläge \"%s\" konfigurerat för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1571 +#: builtin/submodule--helper.c:1594 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:1575 +#: builtin/submodule--helper.c:1598 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:1605 +#: builtin/submodule--helper.c:1628 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:1634 +#: builtin/submodule--helper.c:1657 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" -#: builtin/submodule--helper.c:1778 +#: builtin/submodule--helper.c:1803 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" -#: builtin/submodule--helper.c:1789 +#: builtin/submodule--helper.c:1814 #, 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:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:2120 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:1879 msgid "path into the working tree, across nested submodule boundaries" msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser" -#: builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:1883 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1889 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Skapa en grund klon trunkerad till angivet antal revisioner" -#: builtin/submodule--helper.c:1867 +#: builtin/submodule--helper.c:1892 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:1894 msgid "whether the initial clone should follow the shallow recommendation" msgstr "om den första klonen skall följa rekommendation för grund kloning" -#: builtin/submodule--helper.c:1870 +#: builtin/submodule--helper.c:1895 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:1877 +#: builtin/submodule--helper.c:1904 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:1917 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:1965 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -19925,50 +20554,50 @@ msgstr "" "Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men " "huvudprojektet är inte på någon gren" -#: builtin/submodule--helper.c:2061 +#: builtin/submodule--helper.c:2088 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "kunde inte få tag i arkivhandtag för undermodulen \"%s\"" -#: builtin/submodule--helper.c:2094 +#: builtin/submodule--helper.c:2121 msgid "recurse into submodules" msgstr "rekursera ner i undermoduler" -#: builtin/submodule--helper.c:2100 +#: builtin/submodule--helper.c:2127 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2183 msgid "check if it is safe to write to the .gitmodules file" msgstr "se om det är säkert att skriva till .gitmodules-filen" -#: builtin/submodule--helper.c:2159 +#: builtin/submodule--helper.c:2186 msgid "unset the config in the .gitmodules file" msgstr "ta bort konfigurationen från .gitmodules-filen" -#: builtin/submodule--helper.c:2164 +#: builtin/submodule--helper.c:2191 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <namn> [<värde>]" -#: builtin/submodule--helper.c:2165 +#: builtin/submodule--helper.c:2192 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <namn>" -#: builtin/submodule--helper.c:2166 +#: builtin/submodule--helper.c:2193 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2185 git-submodule.sh:171 +#: builtin/submodule--helper.c:2212 git-submodule.sh:173 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "se till att .gitmodules finns i arbetskatalogen" -#: builtin/submodule--helper.c:2235 git.c:433 git.c:683 +#: builtin/submodule--helper.c:2262 git.c:433 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" -#: builtin/submodule--helper.c:2241 +#: builtin/submodule--helper.c:2268 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -20223,203 +20852,207 @@ msgstr "taggen \"%s\" finns redan" msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" -#: builtin/unpack-objects.c:500 +#: builtin/unpack-objects.c:501 msgid "Unpacking objects" msgstr "Packar upp objekt" -#: builtin/update-index.c:83 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "misslyckades skapa katalogen %s" -#: builtin/update-index.c:99 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "misslyckades skapa filen %s" -#: builtin/update-index.c:107 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "misslyckades ta bort filen %s" -#: builtin/update-index.c:114 builtin/update-index.c:220 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "misslyckades ta bort katalogen %s" -#: builtin/update-index.c:139 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "Testar mtime i \"%s\" " -#: builtin/update-index.c:153 +#: builtin/update-index.c:154 msgid "directory stat info does not change after adding a new file" msgstr "stat-informationen för en katalog ändras inte när nya filer läggs till" -#: builtin/update-index.c:166 +#: builtin/update-index.c:167 msgid "directory stat info does not change after adding a new directory" msgstr "" "stat-informationen för en katalog ändras inte när nya kataloger läggs till" -#: builtin/update-index.c:179 +#: builtin/update-index.c:180 msgid "directory stat info changes after updating a file" msgstr "stat-informationen för en katalog ändras när filer uppdateras" -#: builtin/update-index.c:190 +#: builtin/update-index.c:191 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "stat-informationen för en katalog ändras när filer läggs till i en " "underkatalog" -#: builtin/update-index.c:201 +#: builtin/update-index.c:202 msgid "directory stat info does not change after deleting a file" msgstr "stat-informationen för en katalog ändras inte när en fil tas bort" -#: builtin/update-index.c:214 +#: builtin/update-index.c:215 msgid "directory stat info does not change after deleting a directory" msgstr "stat-informationen för en katalog ändras inte när en katalog tas bort" -#: builtin/update-index.c:221 +#: builtin/update-index.c:222 msgid " OK" msgstr " OK" -#: builtin/update-index.c:589 +#: builtin/update-index.c:591 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<flaggor>] [--] [<fil>...]" -#: builtin/update-index.c:972 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är àjour" -#: builtin/update-index.c:975 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:978 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:980 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "låt filer ersätta kataloger och omvänt" -#: builtin/update-index.c:982 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:984 +#: builtin/update-index.c:986 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" -#: builtin/update-index.c:987 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:991 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:995 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:996 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:1009 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:1015 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:1018 +#: builtin/update-index.c:1020 +msgid "do not touch index-only entries" +msgstr "rör inte \"endast index\"-poster" + +#: builtin/update-index.c:1022 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:1020 +#: builtin/update-index.c:1024 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:1022 +#: builtin/update-index.c:1026 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1028 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:1028 +#: builtin/update-index.c:1032 msgid "add entries from standard input to the index" msgstr "lägg poster från standard in till indexet" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1036 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:1036 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:1043 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "rapportera åtgärder på standard ut" -#: builtin/update-index.c:1045 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:1051 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "aktivera/inaktivera ospårad cache" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1059 msgid "test if the filesystem supports untracked cache" msgstr "testa om filsystemet stöder ospårad cache" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1061 msgid "enable untracked cache without testing the filesystem" msgstr "aktivera ospårad cache utan att testa filsystemet" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1063 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:1061 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "aktivera eller inaktivera filsystemsövervakning" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "markera filer som \"fsmonitor valid\"" -#: builtin/update-index.c:1066 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "töm \"fsmonitor valid\"-bit" -#: builtin/update-index.c:1169 +#: builtin/update-index.c:1173 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -20427,7 +21060,7 @@ msgstr "" "core.splitIndex är satt till false; ta bort eller ändra det om du verkligen " "vill aktivera delat index" -#: builtin/update-index.c:1178 +#: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -20435,7 +21068,7 @@ msgstr "" "core.splitIndex är satt till true; ta bort eller ändra det om du verkligen " "vill inaktivera delat index" -#: builtin/update-index.c:1190 +#: builtin/update-index.c:1194 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -20443,11 +21076,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:1194 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "Ospårad cache är inaktiverad" -#: builtin/update-index.c:1202 +#: builtin/update-index.c:1206 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -20455,26 +21088,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:1206 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Ospårad cache är aktiverad för \"%s\"" -#: builtin/update-index.c:1214 +#: builtin/update-index.c:1218 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:1218 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "fsmonitor aktiverat" -#: builtin/update-index.c:1221 +#: builtin/update-index.c:1225 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:1225 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "fsmonitor inaktiverat" @@ -20871,16 +21504,21 @@ msgstr "visa trädobjekt för underkatalogen <prefix>" msgid "only useful for debugging" msgstr "endast användbart vid felsökning" -#: fast-import.c:3118 +#: fast-import.c:3125 #, c-format msgid "Expected 'mark' command, got %s" msgstr "Förväntade \"mark\"-kommando, fick %s" -#: fast-import.c:3123 +#: fast-import.c:3130 #, c-format msgid "Expected 'to' command, got %s" msgstr "Förväntade \"to\"-kommando, fick %s" +#: fast-import.c:3254 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "funktionen \"%s\" förbjuden i indata utan --allow-unsafe-features" + #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -21015,17 +21653,17 @@ msgstr "okänt skrivfel på standard ut" msgid "close failed on standard output" msgstr "stäng misslyckades på standard ut" -#: git.c:792 +#: git.c:793 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "alias-slinga detekterades: expansionen av \"%s\" avslutas aldrig:%s" -#: git.c:842 +#: git.c:843 #, c-format msgid "cannot handle %s as a builtin" msgstr "kan inte hantera %s som inbyggd" -#: git.c:855 +#: git.c:856 #, c-format msgid "" "usage: %s\n" @@ -21034,13 +21672,13 @@ msgstr "" "användning: %s\n" "\n" -#: git.c:875 +#: git.c:876 #, 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:887 +#: git.c:888 #, c-format msgid "failed to run command '%s': %s\n" msgstr "misslyckades köra kommandot \"%s\": %s\n" @@ -21058,30 +21696,30 @@ msgstr "Delegerad styrning stöds inte av cURL < 7.22.0" 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:878 +#: http.c:876 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REVOKE stöds inte av cURL < 7.44.0" -#: http.c:951 +#: http.c:949 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Prtokollbegränsningar stöds inte av cURL < 7.19.4" -#: http.c:1088 +#: http.c:1086 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "SSL-bakändan \"%s\" stöds inte. Dessa SSL-bakändor stöds:" -#: http.c:1095 +#: http.c:1093 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "Kan inte sätta SSL-bakända till \"%s\": cURL byggdes utan SSL-bakändor" -#: http.c:1099 +#: http.c:1097 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "Kunde inte sätta SSL-bakända till \"%s\": redan valt" -#: http.c:1968 +#: http.c:1966 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21209,30 +21847,39 @@ msgstr "argument" msgid "object filtering" msgstr "objektfiltrering" -#: parse-options.h:179 +#: parse-options.h:183 msgid "expiry-date" msgstr "giltig-till" -#: parse-options.h:193 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakåtkompatibilitet)" -#: parse-options.h:305 +#: parse-options.h:309 msgid "be more verbose" msgstr "var mer pratsam" -#: parse-options.h:307 +#: parse-options.h:311 msgid "be more quiet" msgstr "var mer tyst" -#: parse-options.h:313 +#: parse-options.h:317 msgid "use <n> digits to display SHA-1s" msgstr "använd <n> siffror för att visa SHA-1:or" -#: parse-options.h:332 +#: parse-options.h:336 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" +#: parse-options.h:337 +msgid "read pathspec from file" +msgstr "läs sökvägsangivelse från fil" + +#: parse-options.h:338 +msgid "" +"with --pathspec-from-file, pathspec elements are separated with NUL character" +msgstr "med --pathspec-from-file, sökvägsangivelser avdelas med NUL-tecken" + #: ref-filter.h:101 msgid "key" msgstr "nyckel" @@ -21741,162 +22388,170 @@ msgid "Common Git shell script setup code" msgstr "Gemensam skriptstartkod för Git" #: command-list.h:171 +msgid "Initialize and modify the sparse-checkout" +msgstr "Initiera och modifiera sparse-checkout" + +#: command-list.h:172 msgid "Stash the changes in a dirty working directory away" msgstr "Spara undan ändringar i en lortig arbetskatalog" -#: command-list.h:172 +#: command-list.h:173 msgid "Add file contents to the staging area" msgstr "Lägg filinnehållet till indexet" -#: command-list.h:173 +#: command-list.h:174 msgid "Show the working tree status" msgstr "Visa status för arbetskatalogen" -#: command-list.h:174 +#: command-list.h:175 msgid "Remove unnecessary whitespace" msgstr "Ta bort onödiga blanksteg" -#: command-list.h:175 +#: command-list.h:176 msgid "Initialize, update or inspect submodules" msgstr "Initiera, uppdatera eller inspektera undermoduler" -#: command-list.h:176 +#: command-list.h:177 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Dubbelriktad verkan mellan ett Subversion-arkiv och Git" -#: command-list.h:177 +#: command-list.h:178 msgid "Switch branches" msgstr "Byt gren" -#: command-list.h:178 +#: command-list.h:179 msgid "Read, modify and delete symbolic refs" msgstr "Läs, modifiera eller ta bort symbolisk referens" -#: command-list.h:179 +#: command-list.h:180 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt" -#: command-list.h:180 +#: command-list.h:181 msgid "Creates a temporary file with a blob's contents" msgstr "Skapar temporära filer med innehållet från en blob" -#: command-list.h:181 +#: command-list.h:182 msgid "Unpack objects from a packed archive" msgstr "Packa upp objekt från ett pakat arkiv" -#: command-list.h:182 +#: command-list.h:183 msgid "Register file contents in the working tree to the index" msgstr "Registrera filinnehållet från arbetskatalogen i indexet" -#: command-list.h:183 +#: command-list.h:184 msgid "Update the object name stored in a ref safely" msgstr "Uppdatera objektnamnet i en referens på ett säkert sätt" -#: command-list.h:184 +#: command-list.h:185 msgid "Update auxiliary info file to help dumb servers" msgstr "Uppdatera tilläggsinfofil för att hjälpa dumma servrar" -#: command-list.h:185 +#: command-list.h:186 msgid "Send archive back to git-archive" msgstr "Sänd arkivet tillbaka till git-archive" -#: command-list.h:186 +#: command-list.h:187 msgid "Send objects packed back to git-fetch-pack" msgstr "Sänd packade objekt tillbaka till git-fetch-pack" -#: command-list.h:187 +#: command-list.h:188 msgid "Show a Git logical variable" msgstr "Visa en logisk Git-variabel" -#: command-list.h:188 +#: command-list.h:189 msgid "Check the GPG signature of commits" msgstr "Kontrollera GPG-signaturer för incheckningar" -#: command-list.h:189 +#: command-list.h:190 msgid "Validate packed Git archive files" msgstr "Bekräfta packade Git-arkivfiler" -#: command-list.h:190 +#: command-list.h:191 msgid "Check the GPG signature of tags" msgstr "Kontrollera GPG-signaturer i taggar" -#: command-list.h:191 +#: command-list.h:192 msgid "Git web interface (web frontend to Git repositories)" msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)" -#: command-list.h:192 +#: command-list.h:193 msgid "Show logs with difference each commit introduces" msgstr "Visa loggar med differenser varje incheckning introducerar" -#: command-list.h:193 +#: command-list.h:194 msgid "Manage multiple working trees" msgstr "Hantera ytterligare arbetskataloger" -#: command-list.h:194 +#: command-list.h:195 msgid "Create a tree object from the current index" msgstr "Skapa ett trädobjekt från aktuellt index" -#: command-list.h:195 +#: command-list.h:196 msgid "Defining attributes per path" msgstr "Definierar attribut per sökväg" -#: command-list.h:196 +#: command-list.h:197 msgid "Git command-line interface and conventions" msgstr "Gits kommandoradsgränssnitt och -konventioner" -#: command-list.h:197 +#: command-list.h:198 msgid "A Git core tutorial for developers" msgstr "Grundläggande Git-handledning för utvecklare" -#: command-list.h:198 +#: command-list.h:199 msgid "Git for CVS users" msgstr "Git för CVS-användare" -#: command-list.h:199 +#: command-list.h:200 msgid "Tweaking diff output" msgstr "Justrea diff-utdata" -#: command-list.h:200 +#: command-list.h:201 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:201 +#: command-list.h:202 msgid "A Git Glossary" msgstr "En Git-ordlista" -#: command-list.h:202 +#: command-list.h:203 msgid "Hooks used by Git" msgstr "Krokar som används av Git" -#: command-list.h:203 +#: command-list.h:204 msgid "Specifies intentionally untracked files to ignore" msgstr "Ange avsiktligen ospårade filer att ignorera" -#: command-list.h:204 +#: command-list.h:205 msgid "Defining submodule properties" msgstr "Ange egenskaper för undermoduler" -#: command-list.h:205 +#: command-list.h:206 msgid "Git namespaces" msgstr "Git-namnrymder" -#: command-list.h:206 +#: command-list.h:207 msgid "Git Repository Layout" msgstr "Gits arkivlayout" -#: command-list.h:207 +#: command-list.h:208 msgid "Specifying revisions and ranges for Git" msgstr "Ange versioner och intervall i Git" -#: command-list.h:208 +#: command-list.h:209 +msgid "Mounting one repository inside another" +msgstr "Monterar ett arkiv inuti ett annat" + +#: command-list.h:210 msgid "A tutorial introduction to Git: part two" msgstr "Introduktion till Git: del två" -#: command-list.h:209 +#: command-list.h:211 msgid "A tutorial introduction to Git" msgstr "Introduktion till Git" -#: command-list.h:210 +#: command-list.h:212 msgid "An overview of recommended workflows with Git" msgstr "Översikt över rekommenderade arbetsflöden med Git" @@ -22023,113 +22678,113 @@ msgstr "Försök enkel sammanslagning med $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning." -#: git-legacy-stash.sh:220 +#: git-legacy-stash.sh:221 msgid "Cannot remove temporary index (can't happen)" msgstr "Kan inte ta bort temporärt index (kan inte inträffa)" -#: git-legacy-stash.sh:271 +#: git-legacy-stash.sh:272 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Kan inte uppdatera $ref_stash med $w_commit" -#: git-legacy-stash.sh:323 +#: git-legacy-stash.sh:324 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "fel: okänd flagga för \"stash push\": $option" -#: git-legacy-stash.sh:355 +#: git-legacy-stash.sh:356 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Sparade arbetskatalogen och indexstatus $stash_msg" -#: git-legacy-stash.sh:535 +#: git-legacy-stash.sh:536 #, sh-format msgid "unknown option: $opt" msgstr "okänd flagga: $opt" -#: git-legacy-stash.sh:555 +#: git-legacy-stash.sh:556 #, sh-format msgid "Too many revisions specified: $REV" msgstr "För många revisioner angivna: $REV" -#: git-legacy-stash.sh:570 +#: git-legacy-stash.sh:571 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference är inte en giltig referens" -#: git-legacy-stash.sh:598 +#: git-legacy-stash.sh:599 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "\"$args\" är inte en \"stash\"-liknande incheckning" -#: git-legacy-stash.sh:609 +#: git-legacy-stash.sh:610 #, sh-format msgid "'$args' is not a stash reference" msgstr "\"$args\" är inte en \"stash\"-referens" -#: git-legacy-stash.sh:617 +#: git-legacy-stash.sh:618 msgid "unable to refresh index" msgstr "kan inte uppdatera indexet" -#: git-legacy-stash.sh:621 +#: git-legacy-stash.sh:622 msgid "Cannot apply a stash in the middle of a merge" msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning" -#: git-legacy-stash.sh:629 +#: git-legacy-stash.sh:630 msgid "Conflicts in index. Try without --index." msgstr "Konflikter i indexet. Testa utan --index." -#: git-legacy-stash.sh:631 +#: git-legacy-stash.sh:632 msgid "Could not save index tree" msgstr "Kunde inte spara indexträd" -#: git-legacy-stash.sh:640 +#: git-legacy-stash.sh:641 msgid "Could not restore untracked files from stash entry" msgstr "Kunde inte återställa ospårade filer från stash-post" -#: git-legacy-stash.sh:665 +#: git-legacy-stash.sh:666 msgid "Cannot unstage modified files" msgstr "Kan inte ta bort ändrade filer ur kön" -#: git-legacy-stash.sh:703 +#: git-legacy-stash.sh:704 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Kastade ${REV} ($s)" -#: git-legacy-stash.sh:704 +#: git-legacy-stash.sh:705 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-legacy-stash.sh:791 +#: git-legacy-stash.sh:792 msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" -#: git-submodule.sh:200 +#: git-submodule.sh:202 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:210 +#: git-submodule.sh:212 #, 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:229 +#: git-submodule.sh:231 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:232 +#: git-submodule.sh:234 #, 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:239 +#: git-submodule.sh:241 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "\"$sm_path\" har inte någon utcheckad incheckning" -#: git-submodule.sh:245 +#: git-submodule.sh:247 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -22140,22 +22795,22 @@ msgstr "" "$sm_path\n" "Använd -f om du verkligen vill lägga till den." -#: git-submodule.sh:268 +#: git-submodule.sh:270 #, 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:270 +#: git-submodule.sh:272 #, 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:278 +#: git-submodule.sh:280 #, 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:280 +#: git-submodule.sh:282 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -22173,37 +22828,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:286 +#: git-submodule.sh:288 #, 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:298 +#: git-submodule.sh:300 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:303 +#: git-submodule.sh:305 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:312 +#: git-submodule.sh:314 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:573 +#: git-submodule.sh:580 #, 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:583 +#: git-submodule.sh:590 #, 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:588 +#: git-submodule.sh:595 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -22212,7 +22867,7 @@ msgstr "" "Kan inte hitta aktuell revision för ${remote_name}/${branch} i " "undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:606 +#: git-submodule.sh:613 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -22221,7 +22876,7 @@ msgstr "" "Kan inte hämta i undermodulsökväg \"$displaypath\"; försökte hämta $sha1 " "direkt:" -#: git-submodule.sh:612 +#: git-submodule.sh:619 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -22230,72 +22885,72 @@ msgstr "" "Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. " "Direkt hämtning av incheckningen misslyckades." -#: git-submodule.sh:619 +#: git-submodule.sh:626 #, 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:620 +#: git-submodule.sh:627 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:624 +#: git-submodule.sh:631 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:625 +#: git-submodule.sh:632 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:630 +#: git-submodule.sh:637 #, 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:631 +#: git-submodule.sh:638 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:636 +#: git-submodule.sh:643 #, 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:637 +#: git-submodule.sh:644 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" -#: git-submodule.sh:668 +#: git-submodule.sh:675 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:830 +#: git-submodule.sh:886 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" -#: git-submodule.sh:882 +#: git-submodule.sh:938 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:902 +#: git-submodule.sh:958 #, 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:905 +#: git-submodule.sh:961 #, 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:908 +#: git-submodule.sh:964 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -22680,81 +23335,19 @@ msgid "Unable to determine absolute path of git directory" msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:210 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:211 -msgid "staged" -msgstr "köad" - -#: git-add--interactive.perl:211 -msgid "unstaged" -msgstr "ej köad" - -#: git-add--interactive.perl:267 git-add--interactive.perl:292 -msgid "binary" -msgstr "binär" - -#: git-add--interactive.perl:276 git-add--interactive.perl:330 -msgid "nothing" -msgstr "ingenting" - -#: git-add--interactive.perl:312 git-add--interactive.perl:327 -msgid "unchanged" -msgstr "oändrad" - -#: git-add--interactive.perl:623 -#, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "lade till %d sökväg\n" -msgstr[1] "lade till %d sökvägar\n" - -#: git-add--interactive.perl:626 -#, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "uppdaterade %d sökväg\n" -msgstr[1] "uppdaterade %d sökvägar\n" - -#: git-add--interactive.perl:629 -#, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "återställde %d sökväg\n" -msgstr[1] "återställde %d sökvägar\n" - -#: git-add--interactive.perl:632 +#: git-add--interactive.perl:634 #, 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:641 -msgid "Update" -msgstr "Uppdatera" - -#: git-add--interactive.perl:653 -msgid "Revert" -msgstr "Återställ" - -#: git-add--interactive.perl:676 -#, perl-format -msgid "note: %s is untracked now.\n" -msgstr "observera: %s spåras inte längre.\n" - -#: git-add--interactive.perl:687 -msgid "Add untracked" -msgstr "Lägg till ospårad" - -#: git-add--interactive.perl:693 -msgid "No untracked files.\n" -msgstr "Inga ospårade filer.\n" - -#: git-add--interactive.perl:1051 +#: git-add--interactive.perl:1053 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -22762,7 +23355,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "köas omedelbart." -#: git-add--interactive.perl:1054 +#: git-add--interactive.perl:1056 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -22770,7 +23363,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "läggas till i \"stash\" omedelbart." -#: git-add--interactive.perl:1057 +#: git-add--interactive.perl:1059 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -22778,8 +23371,8 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "tas bort från kön omedelbart." -#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 -#: git-add--interactive.perl:1075 +#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 +#: git-add--interactive.perl:1077 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -22787,8 +23380,8 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "markeras för applicering omedelbart." -#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 -#: git-add--interactive.perl:1072 +#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 +#: git-add--interactive.perl:1074 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -22796,16 +23389,12 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "markeras för kasta omedelbart." -#: git-add--interactive.perl:1109 +#: git-add--interactive.perl:1111 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s" -#: git-add--interactive.perl:1110 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n" - -#: git-add--interactive.perl:1116 +#: git-add--interactive.perl:1118 #, perl-format msgid "" "---\n" @@ -22818,36 +23407,12 @@ msgstr "" "Ta bort \"%s\" rader genom att radera dem.\n" "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:1124 -msgid "" -"If it does not apply cleanly, you will be given an opportunity to\n" -"edit again. If all lines of the hunk are removed, then the edit is\n" -"aborted and the hunk is left unchanged.\n" -msgstr "" -"Om patchen inte kan appliceras rent kommer du få en möjlighet att\n" -"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:1138 +#: git-add--interactive.perl:1140 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s" -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. 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:1237 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "" -"Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) " -"[y/n]? " - -#: git-add--interactive.perl:1246 +#: git-add--interactive.perl:1248 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -22861,7 +23426,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:1252 +#: git-add--interactive.perl:1254 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -22875,7 +23440,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:1258 +#: git-add--interactive.perl:1260 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -22889,7 +23454,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:1264 +#: git-add--interactive.perl:1266 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -22903,7 +23468,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:1270 git-add--interactive.perl:1288 +#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -22917,7 +23482,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:1276 +#: git-add--interactive.perl:1278 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -22931,7 +23496,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:1282 +#: git-add--interactive.perl:1284 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -22945,7 +23510,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:1294 +#: git-add--interactive.perl:1296 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -22959,7 +23524,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:1309 +#: git-add--interactive.perl:1311 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -22981,226 +23546,198 @@ msgstr "" "e - redigera aktuellt stycke manuellt\n" "? - visa hjälp\n" -#: git-add--interactive.perl:1340 +#: git-add--interactive.perl:1342 msgid "The selected hunks do not apply to the index!\n" msgstr "Markerade stycken kan inte appliceras på indexet!\n" -#: git-add--interactive.perl:1341 +#: git-add--interactive.perl:1343 msgid "Apply them to the worktree anyway? " msgstr "Applicera dem på arbetskatalogen trots det? " -#: git-add--interactive.perl:1344 +#: git-add--interactive.perl:1346 msgid "Nothing was applied.\n" msgstr "Ingenting applicerades.\n" -#: git-add--interactive.perl:1355 +#: git-add--interactive.perl:1357 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorerar ej sammanslagen: %s\n" -#: git-add--interactive.perl:1364 -msgid "Only binary files changed.\n" -msgstr "Endast binära filer ändrade.\n" - -#: git-add--interactive.perl:1366 -msgid "No changes.\n" -msgstr "Inga ändringar.\n" - -#: git-add--interactive.perl:1374 -msgid "Patch update" -msgstr "Uppdatera patch" - -#: git-add--interactive.perl:1426 +#: git-add--interactive.perl:1428 #, 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:1427 +#: git-add--interactive.perl:1429 #, 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:1428 +#: git-add--interactive.perl:1430 #, 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:1431 +#: git-add--interactive.perl:1433 #, 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:1432 +#: git-add--interactive.perl:1434 #, 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:1433 +#: git-add--interactive.perl:1435 #, 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:1436 +#: git-add--interactive.perl:1438 #, 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:1437 +#: git-add--interactive.perl:1439 #, 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:1438 +#: git-add--interactive.perl:1440 #, 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:1441 +#: git-add--interactive.perl:1443 #, 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:1442 +#: git-add--interactive.perl:1444 #, 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:1443 +#: git-add--interactive.perl:1445 #, 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:1446 git-add--interactive.perl:1461 +#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 #, 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:1447 git-add--interactive.perl:1462 +#: git-add--interactive.perl:1449 git-add--interactive.perl:1464 #, 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:1448 git-add--interactive.perl:1463 +#: git-add--interactive.perl:1450 git-add--interactive.perl:1465 #, 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:1451 +#: git-add--interactive.perl:1453 #, 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:1452 +#: git-add--interactive.perl:1454 #, 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:1453 +#: git-add--interactive.perl:1455 #, 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:1456 +#: git-add--interactive.perl:1458 #, 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:1457 +#: git-add--interactive.perl:1459 #, 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:1458 +#: git-add--interactive.perl:1460 #, 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:1466 +#: git-add--interactive.perl:1468 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "Applicera ändrat läge på arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1467 +#: git-add--interactive.perl:1469 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Applicera borttagning på arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1470 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "Applicera stycket på arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1568 +#: git-add--interactive.perl:1570 msgid "No other hunks to goto\n" msgstr "Inga andra stycken att gå till\n" -#: git-add--interactive.perl:1575 -msgid "go to which hunk (<ret> to see more)? " -msgstr "gå till vilket stycke (<ret> för att se fler)? " - -#: git-add--interactive.perl:1577 -msgid "go to which hunk? " -msgstr "gå till vilket stycke? " - -#: git-add--interactive.perl:1586 +#: git-add--interactive.perl:1588 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Ogiltigt siffervärde: \"%s\"\n" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1593 #, 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:1617 +#: git-add--interactive.perl:1619 msgid "No other hunks to search\n" msgstr "Inga andra stycken att söka efter\n" -#: git-add--interactive.perl:1621 -msgid "search for regex? " -msgstr "sök efter reguljärt uttryck? " - -#: git-add--interactive.perl:1634 +#: git-add--interactive.perl:1636 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1646 msgid "No hunk matches the given pattern\n" msgstr "Inga stycken motsvarar givet mönster\n" -#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 +#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 msgid "No previous hunk\n" msgstr "Inget föregående stycke\n" -#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 +#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 msgid "No next hunk\n" msgstr "Inget följande stycke\n" -#: git-add--interactive.perl:1690 +#: git-add--interactive.perl:1692 msgid "Sorry, cannot split this hunk\n" msgstr "Beklagar, kan inte dela stycket\n" -#: git-add--interactive.perl:1696 +#: git-add--interactive.perl:1698 #, 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:1706 +#: git-add--interactive.perl:1708 msgid "Sorry, cannot edit this hunk\n" msgstr "Beklagar, kan inte redigera stycket\n" -#: git-add--interactive.perl:1752 -msgid "Review diff" -msgstr "Granska diff" - #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1771 +#: git-add--interactive.perl:1773 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -23217,19 +23754,19 @@ msgstr "" "diff - visa diff mellan HEAD och index\n" "add untracked - lägg till innehåll i ospårade filer till köade ändringar\n" -#: git-add--interactive.perl:1788 git-add--interactive.perl:1793 -#: git-add--interactive.perl:1796 git-add--interactive.perl:1803 -#: git-add--interactive.perl:1806 git-add--interactive.perl:1813 -#: git-add--interactive.perl:1817 git-add--interactive.perl:1823 +#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 +#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 +#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 +#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 msgid "missing --" msgstr "saknad --" -#: git-add--interactive.perl:1819 +#: git-add--interactive.perl:1821 #, perl-format msgid "unknown --patch mode: %s" msgstr "okänt läge för --patch: %s" -#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 +#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 #, perl-format msgid "invalid argument %s, expecting --" msgstr "felaktigt argument %s, förväntar --" @@ -23599,6 +24136,18 @@ msgstr "" msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "unable to get tree for %s" +#~ msgstr "kunde inte hämta trädet på %s" + +#~ msgid "Use an experimental heuristic to improve diffs" +#~ msgstr "Använd en experimentell algoritm för att förbättra diffar" + +#~ msgid "git commit-graph [--object-dir <objdir>]" +#~ msgstr "git commit-graph [--object-dir <objkat>]" + +#~ msgid "git commit-graph read [--object-dir <objdir>]" +#~ msgstr "git commit-graph read [--object-dir <objkat>]" + #~ 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" @@ -23705,9 +24254,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgstr "" #~ "kan inte vara interaktiv om standard in inte är ansluten till en terminal." -#~ msgid "failed to open '%s'" -#~ msgstr "misslyckades öppna \"%s\"" - #~ msgid "failed to stat %s\n" #~ msgstr "misslyckades ta status på %s\n" @@ -24224,9 +24770,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "Cannot cherry-pick during another cherry-pick." #~ msgstr "Kan inte utföra \"cherry-pick\" under en annan \"cherry-pick\"." -#~ msgid "Could not parse line %d." -#~ msgstr "Kan inte tolka rad %d." - #~ msgid "Could not open %s" #~ msgstr "Kunde inte öppna %s" |