diff options
| author | Peter Krefting <peter@softwolves.pp.se> | 2022-04-17 18:13:34 +0100 |
|---|---|---|
| committer | Peter Krefting <peter@softwolves.pp.se> | 2022-04-17 18:13:34 +0100 |
| commit | 9b23d2c7b8970e76125872ccf0aed2e9484c250c (patch) | |
| tree | 497d76fceebfea642f06967985fac71858c830af /po | |
| parent | 1208041f05ccdcc95a1a1bed02a96a3a17106701 (diff) | |
| download | git-9b23d2c7b8970e76125872ccf0aed2e9484c250c.tar.gz | |
l10n: sv.po: Update Swedish translation (5282t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Diffstat (limited to 'po')
| -rw-r--r-- | po/sv.po | 8694 |
1 files changed, 4735 insertions, 3959 deletions
@@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.34.0\n" +"Project-Id-Version: git 2.36.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-01-17 08:34+0800\n" -"PO-Revision-Date: 2022-01-11 16:34+0100\n" +"POT-Creation-Date: 2022-04-13 14:52+0800\n" +"PO-Revision-Date: 2022-04-17 18:08+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -16,215 +16,213 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 3.38.0\n" -#: add-interactive.c:380 +#: add-interactive.c:382 #, c-format msgid "Huh (%s)?" msgstr "Vadå (%s)?" -#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509 -#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233 -#: builtin/rebase.c:1642 +#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505 +#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261 +#: builtin/rebase.c:1671 msgid "could not read index" msgstr "kunde inte läsa indexet" -#: add-interactive.c:588 git-add--interactive.perl:269 +#: add-interactive.c:590 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "binär" -#: add-interactive.c:646 git-add--interactive.perl:278 +#: add-interactive.c:648 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "ingenting" -#: add-interactive.c:647 git-add--interactive.perl:314 +#: add-interactive.c:649 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "oändrad" -#: add-interactive.c:684 git-add--interactive.perl:641 +#: add-interactive.c:686 git-add--interactive.perl:641 msgid "Update" msgstr "Uppdatera" -#: add-interactive.c:701 add-interactive.c:889 +#: add-interactive.c:703 add-interactive.c:891 #, c-format msgid "could not stage '%s'" msgstr "kunde inte köa \"%s\"" -#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713 +#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709 msgid "could not write index" msgstr "kunde inte skriva indexet" -#: add-interactive.c:710 git-add--interactive.perl:626 +#: add-interactive.c:712 git-add--interactive.perl:626 #, 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:728 git-add--interactive.perl:676 +#: add-interactive.c:730 git-add--interactive.perl:676 #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "observera: %s spåras inte längre.\n" -#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306 +#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311 #: builtin/reset.c:167 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: add-interactive.c:763 git-add--interactive.perl:653 +#: add-interactive.c:765 git-add--interactive.perl:653 msgid "Revert" msgstr "Återställ" -#: add-interactive.c:779 +#: add-interactive.c:781 msgid "Could not parse HEAD^{tree}" msgstr "kunde inte tolka HEAD^{tree}" -#: add-interactive.c:817 git-add--interactive.perl:629 +#: add-interactive.c:819 git-add--interactive.perl:629 #, 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:868 git-add--interactive.perl:693 +#: add-interactive.c:870 git-add--interactive.perl:693 #, c-format msgid "No untracked files.\n" msgstr "Inga ospårade filer.\n" -#: add-interactive.c:872 git-add--interactive.perl:687 +#: add-interactive.c:874 git-add--interactive.perl:687 msgid "Add untracked" msgstr "Lägg till ospårad" -#: add-interactive.c:899 git-add--interactive.perl:623 +#: add-interactive.c:901 git-add--interactive.perl:623 #, 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:929 +#: add-interactive.c:931 #, c-format msgid "ignoring unmerged: %s" msgstr "ignorerar ej sammanslagen: %s" -#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371 +#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371 #, c-format msgid "Only binary files changed.\n" msgstr "Endast binära filer ändrade.\n" -#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373 +#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373 #, c-format msgid "No changes.\n" msgstr "Inga ändringar.\n" -#: add-interactive.c:947 git-add--interactive.perl:1381 +#: add-interactive.c:949 git-add--interactive.perl:1381 msgid "Patch update" msgstr "Uppdatera patch" -#: add-interactive.c:986 git-add--interactive.perl:1794 +#: add-interactive.c:988 git-add--interactive.perl:1794 msgid "Review diff" msgstr "Granska diff" -#: add-interactive.c:1014 +#: add-interactive.c:1016 msgid "show paths with changes" msgstr "visa sökvägar med ändringar" -#: add-interactive.c:1016 +#: add-interactive.c:1018 msgid "add working tree state to the staged set of changes" msgstr "lägg arbetskatalogens tillstånd till köade ändringar" -#: add-interactive.c:1018 +#: add-interactive.c:1020 msgid "revert staged set of changes back to the HEAD version" msgstr "återställ köade ändringar tillbaka till HEAD-versionen" -#: add-interactive.c:1020 +#: add-interactive.c:1022 msgid "pick hunks and update selectively" msgstr "välj stycken och uppdatera selektivt" -#: add-interactive.c:1022 +#: add-interactive.c:1024 msgid "view diff between HEAD and index" msgstr "visa skillnad mellan HEAD och index" -#: add-interactive.c:1024 +#: add-interactive.c:1026 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:1032 add-interactive.c:1081 +#: add-interactive.c:1034 add-interactive.c:1083 msgid "Prompt help:" msgstr "Kommandoradshjälp:" -#: add-interactive.c:1034 +#: add-interactive.c:1036 msgid "select a single item" msgstr "markera en post" -#: add-interactive.c:1036 +#: add-interactive.c:1038 msgid "select a range of items" msgstr "markera intervall av poster" -#: add-interactive.c:1038 +#: add-interactive.c:1040 msgid "select multiple ranges" msgstr "markera flera intervall" -#: add-interactive.c:1040 add-interactive.c:1085 +#: add-interactive.c:1042 add-interactive.c:1087 msgid "select item based on unique prefix" msgstr "markera post baserad på unikt prefix" -#: add-interactive.c:1042 +#: add-interactive.c:1044 msgid "unselect specified items" msgstr "avmarkera angivna poster" -#: add-interactive.c:1044 +#: add-interactive.c:1046 msgid "choose all items" msgstr "välj alla poster" -#: add-interactive.c:1046 +#: add-interactive.c:1048 msgid "(empty) finish selecting" msgstr "(tomt) avsluta markering" -#: add-interactive.c:1083 +#: add-interactive.c:1085 msgid "select a numbered item" msgstr "markera en numrerad post" -#: add-interactive.c:1087 +#: add-interactive.c:1089 msgid "(empty) select nothing" msgstr "(tomt) markera ingenting" -#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898 +#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895 +#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895 msgid "What now" msgstr "Vad nu" -#: add-interactive.c:1148 git-add--interactive.perl:213 +#: add-interactive.c:1150 git-add--interactive.perl:213 msgid "staged" msgstr "köad" -#: add-interactive.c:1148 git-add--interactive.perl:213 +#: add-interactive.c:1150 git-add--interactive.perl:213 msgid "unstaged" msgstr "ej köad" -#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367 -#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128 -#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858 -#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504 -#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574 -#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812 +#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370 +#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132 +#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194 +#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709 +#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891 #: git-add--interactive.perl:213 msgid "path" msgstr "sökväg" -#: add-interactive.c:1155 +#: add-interactive.c:1157 msgid "could not refresh index" msgstr "kunde inte uppdatera indexet" -#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805 +#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805 #, c-format msgid "Bye.\n" msgstr "Hej då.\n" @@ -535,24 +533,24 @@ msgstr "kunde inte tolka styckehuvudet \"%.*s\"" msgid "could not parse colored hunk header '%.*s'" msgstr "kunde inte tolka färgat styckehuvud \"%.*s\"" -#: add-patch.c:420 +#: add-patch.c:431 msgid "could not parse diff" msgstr "kunde inte tolka diff" -#: add-patch.c:439 +#: add-patch.c:450 msgid "could not parse colored diff" msgstr "kunde inte tolka färgad diff" -#: add-patch.c:453 +#: add-patch.c:464 #, c-format msgid "failed to run '%s'" msgstr "misslyckades att köra \"%s\"" -#: add-patch.c:612 +#: add-patch.c:618 msgid "mismatched output from interactive.diffFilter" msgstr "omaka utdata från interactive.diffFilter" -#: add-patch.c:613 +#: add-patch.c:619 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -560,7 +558,7 @@ msgstr "" "Alla rader i indata måste ha en motsvarande rad i utdata från\n" "ditt filter." -#: add-patch.c:791 +#: add-patch.c:797 #, c-format msgid "" "expected context line #%d in\n" @@ -569,7 +567,7 @@ msgstr "" "förväntade sammanhangsrad %d i\n" "%.*s" -#: add-patch.c:806 +#: add-patch.c:812 #, c-format msgid "" "hunks do not overlap:\n" @@ -582,11 +580,11 @@ msgstr "" "\tavslutas inte med:\n" "%.*s" -#: add-patch.c:1082 git-add--interactive.perl:1115 +#: add-patch.c:1088 git-add--interactive.perl:1115 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:1086 +#: add-patch.c:1092 #, c-format msgid "" "---\n" @@ -600,7 +598,7 @@ msgstr "" "Rader som börjar med %c kommer att tas bort.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1100 git-add--interactive.perl:1129 +#: add-patch.c:1106 git-add--interactive.perl:1129 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" @@ -610,11 +608,11 @@ msgstr "" "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:1133 +#: add-patch.c:1139 msgid "could not parse hunk header" msgstr "kunde inte tolka styckehuvud" -#: add-patch.c:1178 +#: add-patch.c:1184 msgid "'git apply --cached' failed" msgstr "\"git apply --cached\" misslyckades" @@ -630,26 +628,26 @@ msgstr "\"git apply --cached\" misslyckades" #. 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:1247 git-add--interactive.perl:1244 +#: add-patch.c:1253 git-add--interactive.perl:1244 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:1290 +#: add-patch.c:1296 msgid "The selected hunks do not apply to the index!" msgstr "Markerade stycken kan inte appliceras på indexet!" -#: add-patch.c:1291 git-add--interactive.perl:1348 +#: add-patch.c:1297 git-add--interactive.perl:1348 msgid "Apply them to the worktree anyway? " msgstr "Applicera dem på arbetskatalogen trots det? " -#: add-patch.c:1298 git-add--interactive.perl:1351 +#: add-patch.c:1304 git-add--interactive.perl:1351 msgid "Nothing was applied.\n" msgstr "Ingenting applicerades.\n" -#: add-patch.c:1355 +#: add-patch.c:1361 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -671,73 +669,73 @@ msgstr "" "e - redigera aktuellt stycke manuellt\n" "? - visa hjälp\n" -#: add-patch.c:1517 add-patch.c:1527 +#: add-patch.c:1523 add-patch.c:1533 msgid "No previous hunk" msgstr "Inget föregående stycke" -#: add-patch.c:1522 add-patch.c:1532 +#: add-patch.c:1528 add-patch.c:1538 msgid "No next hunk" msgstr "Inget följande stycke" -#: add-patch.c:1538 +#: add-patch.c:1544 msgid "No other hunks to goto" msgstr "Inga andra stycken att gå till" -#: add-patch.c:1549 git-add--interactive.perl:1608 +#: add-patch.c:1555 git-add--interactive.perl:1608 msgid "go to which hunk (<ret> to see more)? " msgstr "gå till vilket stycke (<ret> för att se fler)? " -#: add-patch.c:1550 git-add--interactive.perl:1610 +#: add-patch.c:1556 git-add--interactive.perl:1610 msgid "go to which hunk? " msgstr "gå till vilket stycke? " -#: add-patch.c:1561 +#: add-patch.c:1567 #, c-format msgid "Invalid number: '%s'" msgstr "Ogiltigt siffervärde: \"%s\"" -#: add-patch.c:1566 +#: add-patch.c:1572 #, 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:1575 +#: add-patch.c:1581 msgid "No other hunks to search" msgstr "Inga andra stycken att söka efter" -#: add-patch.c:1581 git-add--interactive.perl:1663 +#: add-patch.c:1587 git-add--interactive.perl:1663 msgid "search for regex? " msgstr "sök efter reguljärt uttryck? " -#: add-patch.c:1596 +#: add-patch.c:1602 #, c-format msgid "Malformed search regexp %s: %s" msgstr "Felaktigt format på reguljärt sökuttryck %s: %s" -#: add-patch.c:1613 +#: add-patch.c:1619 msgid "No hunk matches the given pattern" msgstr "Inga stycken motsvarar givet mönster" -#: add-patch.c:1620 +#: add-patch.c:1626 msgid "Sorry, cannot split this hunk" msgstr "Beklagar, kan inte dela stycket" -#: add-patch.c:1624 +#: add-patch.c:1630 #, c-format msgid "Split into %d hunks." msgstr "Dela i %d stycken." -#: add-patch.c:1628 +#: add-patch.c:1634 msgid "Sorry, cannot edit this hunk" msgstr "Beklagar, kan inte redigera stycket" -#: add-patch.c:1680 +#: add-patch.c:1686 msgid "'git apply' failed" msgstr "\"git apply\" misslyckades" -#: advice.c:78 +#: advice.c:81 #, c-format msgid "" "\n" @@ -746,47 +744,47 @@ msgstr "" "\n" "Slå av meddelandet med \"git config advice.%s false\"" -#: advice.c:94 +#: advice.c:97 #, c-format msgid "%shint: %.*s%s\n" msgstr "%stips: %.*s%s\n" -#: advice.c:178 +#: advice.c:181 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:180 +#: advice.c:183 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:182 +#: advice.c:185 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:184 +#: advice.c:187 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:186 +#: advice.c:189 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:188 +#: advice.c:191 #, 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:196 +#: advice.c:199 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." @@ -794,27 +792,27 @@ 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:204 +#: advice.c:207 msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:209 builtin/merge.c:1382 +#: advice.c:212 builtin/merge.c:1388 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: advice.c:211 +#: advice.c:214 msgid "Please, commit your changes before merging." msgstr "Checka in dina ändringar innan du utför sammanslagningen." -#: advice.c:212 +#: advice.c:215 msgid "Exiting because of unfinished merge." msgstr "Avslutar på grund av ofullbordad sammanslagning." -#: advice.c:217 +#: advice.c:220 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: advice.c:227 +#: advice.c:230 #, c-format msgid "" "The following paths and/or pathspecs matched paths that exist\n" @@ -825,7 +823,7 @@ msgstr "" "utanför din \"sparse-checkout\"-definition, så de kommer inte\n" "uppdateras i indexet:\n" -#: advice.c:234 +#: advice.c:237 msgid "" "If you intend to update such entries, try one of the following:\n" "* Use the --sparse option.\n" @@ -835,7 +833,7 @@ msgstr "" "* Använd flaggan --sparse.\n" "* Inaktivera eller ändra reglerna för gles utcheckning." -#: advice.c:242 +#: advice.c:245 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -896,80 +894,83 @@ msgstr "okänt alternativ för whitespace: \"%s\"" msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307 -#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870 -#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885 -#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541 -#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470 -#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757 -#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361 -#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155 -#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038 -#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560 -#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778 -#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073 -#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641 -#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199 -#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426 -#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710 -#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316 -#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572 -#: builtin/worktree.c:702 +#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555 +#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332 +#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907 +#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509 +#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755 +#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663 +#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921 +#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200 +#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593 +#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245 +#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167 +#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560 +#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778 +#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409 +#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592 +#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641 +#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227 +#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433 +#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711 +#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328 +#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573 +#: builtin/worktree.c:779 #, c-format msgid "options '%s' and '%s' cannot be used together" msgstr "flaggorna \"%s\" och \"%s\" kan inte användas samtidigt" -#: apply.c:139 apply.c:150 apply.c:153 +#: apply.c:141 apply.c:152 apply.c:155 #, c-format msgid "'%s' outside a repository" msgstr "\"%s\" utanför arkiv" -#: apply.c:800 +#: apply.c:807 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: apply.c:809 +#: apply.c:816 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: apply.c:883 +#: apply.c:890 #, c-format msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen på rad %d" -#: apply.c:921 +#: apply.c:928 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d" -#: apply.c:927 +#: apply.c:934 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d" -#: apply.c:928 +#: apply.c:935 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d" -#: apply.c:933 +#: apply.c:940 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d" -#: apply.c:962 +#: apply.c:969 #, c-format msgid "invalid mode on line %d: %s" msgstr "ogiltigt läge på rad %d: %s" -#: apply.c:1281 +#: apply.c:1288 #, c-format msgid "inconsistent header lines %d and %d" msgstr "huvudet är inkonsekvent mellan rad %d och %d" -#: apply.c:1371 +#: apply.c:1378 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -985,92 +986,92 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: apply.c:1384 +#: apply.c:1391 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)" -#: apply.c:1480 +#: apply.c:1487 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: oväntad rad: %.*s" -#: apply.c:1549 +#: apply.c:1556 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: apply.c:1752 +#: apply.c:1759 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: apply.c:1754 +#: apply.c:1761 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: apply.c:1788 +#: apply.c:1795 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: apply.c:1825 +#: apply.c:1832 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: apply.c:1827 +#: apply.c:1834 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: apply.c:1830 +#: apply.c:1837 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** varning: filen %s blir tom men har inte tagits bort" -#: apply.c:1978 +#: apply.c:1985 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: apply.c:2015 +#: apply.c:2022 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: apply.c:2177 +#: apply.c:2184 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: apply.c:2263 +#: apply.c:2270 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: apply.c:2267 +#: apply.c:2274 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: apply.c:2936 +#: apply.c:2943 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: apply.c:3057 +#: apply.c:3064 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Stycke %d lyckades på %d (offset %d rad)." msgstr[1] "Stycke %d lyckades på %d (offset %d rader)." -#: apply.c:3069 +#: apply.c:3076 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d" -#: apply.c:3075 +#: apply.c:3082 #, c-format msgid "" "while searching for:\n" @@ -1079,25 +1080,25 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: apply.c:3097 +#: apply.c:3104 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: apply.c:3105 +#: apply.c:3112 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s" "\"" -#: apply.c:3152 +#: apply.c:3159 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden" -#: apply.c:3163 +#: apply.c:3170 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -1105,427 +1106,427 @@ msgstr "" "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande " "innehållet." -#: apply.c:3171 +#: apply.c:3178 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "patchen appliceras på en tom \"%s\", men den är inte tom" -#: apply.c:3189 +#: apply.c:3196 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas" -#: apply.c:3202 +#: apply.c:3209 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: apply.c:3209 +#: apply.c:3216 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)" -#: apply.c:3230 +#: apply.c:3237 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: apply.c:3353 +#: apply.c:3360 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214 -#: setup.c:309 +#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214 +#: setup.c:310 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" -#: apply.c:3413 +#: apply.c:3420 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk" -#: apply.c:3442 apply.c:3711 +#: apply.c:3449 apply.c:3721 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: apply.c:3549 apply.c:3726 +#: apply.c:3559 apply.c:3736 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: apply.c:3558 apply.c:3734 apply.c:3978 +#: apply.c:3568 apply.c:3744 apply.c:3960 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: apply.c:3595 +#: apply.c:3605 msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "arkivet saknar objekt som behövs för att utföra 3-vägssammanslagning." -#: apply.c:3598 +#: apply.c:3608 #, c-format msgid "Performing three-way merge...\n" msgstr "Utför trevägssammanslagning...\n" -#: apply.c:3614 apply.c:3618 +#: apply.c:3624 apply.c:3628 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kunde inte läsa aktuellt innehåll i \"%s\"" -#: apply.c:3630 +#: apply.c:3640 #, c-format msgid "Failed to perform three-way merge...\n" msgstr "Misslyckades utföra trevägssammanslagning...\n" -#: apply.c:3644 +#: apply.c:3654 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Applicerade patchen på \"%s\" med konflikter.\n" -#: apply.c:3649 +#: apply.c:3659 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Tillämpade patchen på \"%s\" rent.\n" -#: apply.c:3666 +#: apply.c:3676 #, c-format msgid "Falling back to direct application...\n" msgstr "Faller tillbaka på direkt tillämpning...\n" -#: apply.c:3678 +#: apply.c:3688 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: apply.c:3751 +#: apply.c:3761 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: apply.c:3753 +#: apply.c:3763 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918 -#: read-cache.c:1381 +#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932 +#: read-cache.c:1399 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg \"%s\"" -#: apply.c:3976 +#: apply.c:3958 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: apply.c:3980 +#: apply.c:3962 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: apply.c:4000 +#: apply.c:3982 #, 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:4005 +#: apply.c:3987 #, 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:4025 +#: apply.c:4007 #, 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:4029 +#: apply.c:4011 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: apply.c:4044 +#: apply.c:4026 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: apply.c:4136 +#: apply.c:4118 #, 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:4143 +#: apply.c:4125 #, 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:4146 +#: apply.c:4128 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller är oanvändbar (%s)." -#: apply.c:4155 +#: apply.c:4137 #, c-format msgid "could not add %s to temporary index" msgstr "kunde inte lägga till %s till temporärt index" -#: apply.c:4165 +#: apply.c:4147 #, c-format msgid "could not write temporary index to %s" msgstr "kunde inte skriva temporärt index till %s" -#: apply.c:4303 +#: apply.c:4285 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: apply.c:4337 +#: apply.c:4319 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: apply.c:4343 +#: apply.c:4325 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: apply.c:4351 +#: apply.c:4333 #, 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:4357 apply.c:4502 +#: apply.c:4339 apply.c:4484 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258 +#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258 #: builtin/gc.c:2293 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" -#: apply.c:4404 +#: apply.c:4386 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: apply.c:4474 +#: apply.c:4456 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: apply.c:4572 +#: apply.c:4554 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: apply.c:4580 +#: apply.c:4562 msgid "internal error" msgstr "internt fel" -#: apply.c:4583 +#: apply.c:4565 #, 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:4594 +#: apply.c:4576 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4602 +#: apply.c:4584 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" -#: apply.c:4616 +#: apply.c:4598 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: apply.c:4620 +#: apply.c:4602 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4749 +#: apply.c:4731 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4758 +#: apply.c:4740 msgid "No valid patches in input (allow with \"--allow-empty\")" msgstr "Inga giltiga patchar i indata (tillåt med \"--allow-empty\")" -#: apply.c:4779 +#: apply.c:4761 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4936 +#: apply.c:4918 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4963 +#: apply.c:4945 #, 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:4969 apply.c:4984 +#: apply.c:4951 apply.c:4966 #, 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:4977 +#: apply.c:4959 #, 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:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430 +#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: apply.c:5021 +#: apply.c:5003 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:5024 +#: apply.c:5006 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:5026 builtin/am.c:2376 +#: apply.c:5008 builtin/am.c:2379 msgid "num" msgstr "antal" -#: apply.c:5027 +#: apply.c:5009 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:5030 +#: apply.c:5012 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:5032 +#: apply.c:5014 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:5036 +#: apply.c:5018 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:5038 +#: apply.c:5020 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:5040 +#: apply.c:5022 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:5042 +#: apply.c:5024 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:5044 +#: apply.c:5026 msgid "mark new files with `git add --intent-to-add`" msgstr "markera nya filer med \"git add --intent-to-add\"" -#: apply.c:5046 +#: apply.c:5028 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:5048 +#: apply.c:5030 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:5051 +#: apply.c:5033 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:5053 +#: apply.c:5035 msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "" "försök en trevägssammanslagning, fall tillbaka på normal patch om det " "misslyckas" -#: apply.c:5055 +#: apply.c:5037 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:5058 builtin/checkout-index.c:196 +#: apply.c:5040 builtin/checkout-index.c:230 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: apply.c:5060 +#: apply.c:5042 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355 +#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960 -#: builtin/rebase.c:1051 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983 +#: builtin/rebase.c:1079 msgid "action" msgstr "åtgärd" -#: apply.c:5062 +#: apply.c:5044 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:5065 apply.c:5068 +#: apply.c:5047 apply.c:5050 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:5071 +#: apply.c:5053 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:5073 +#: apply.c:5055 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:5075 +#: apply.c:5057 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:5077 +#: apply.c:5059 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:5080 +#: apply.c:5062 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:5083 +#: apply.c:5065 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:5085 builtin/am.c:2364 +#: apply.c:5067 builtin/am.c:2367 msgid "root" msgstr "rot" -#: apply.c:5086 +#: apply.c:5068 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" -#: apply.c:5089 +#: apply.c:5071 msgid "don't return error for empty patches" msgstr "ge inte någon felkod för tomma patchar" -#: archive-tar.c:125 archive-zip.c:345 +#: archive-tar.c:125 archive-zip.c:346 #, c-format msgid "cannot stream blob %s" msgstr "kan inte strömma blob:en %s" -#: archive-tar.c:265 archive-zip.c:358 +#: archive-tar.c:265 archive-zip.c:359 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "filens läge stöds ej: 0%o (SHA1: %s)" @@ -1544,22 +1545,22 @@ msgstr "kan inte omdirigera handtag" msgid "'%s' filter reported error" msgstr "filtret \"%s\" rapporterade fel" -#: archive-zip.c:318 +#: 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:322 +#: 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:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368 +#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: archive-zip.c:603 +#: archive-zip.c:604 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>" @@ -1568,10 +1569,6 @@ msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>" msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]" -#: archive.c:15 -msgid "git archive --list" -msgstr "git archive --list" - #: archive.c:16 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" @@ -1584,12 +1581,12 @@ msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" #: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238 -#: builtin/tag.c:578 +#: builtin/tag.c:579 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334 +#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" @@ -1631,7 +1628,7 @@ msgstr "fmt" msgid "archive format" msgstr "arkivformat" -#: archive.c:552 builtin/log.c:1790 +#: archive.c:552 builtin/log.c:1809 msgid "prefix" msgstr "prefix" @@ -1639,12 +1636,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:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884 -#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135 +#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885 +#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135 #: builtin/fast-export.c:1181 builtin/fast-export.c:1183 -#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103 +#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104 #: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410 -#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190 +#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195 msgid "file" msgstr "fil" @@ -1672,8 +1669,8 @@ msgstr "välj komprimeringsgrad" msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513 +#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125 +#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718 msgid "repo" msgstr "arkiv" @@ -1694,11 +1691,12 @@ msgstr "sökväg till kommandot git-upload-archive på fjärren" msgid "Unexpected option --remote" msgstr "Oväntad flagga --remote" -#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544 -#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370 -#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115 -#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281 -#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144 +#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530 +#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099 +#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230 +#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442 +#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708 +#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144 #: http-fetch.c:153 #, c-format msgid "the option '%s' requires '%s'" @@ -1718,17 +1716,17 @@ msgstr "Okänt arkivformat \"%s\"" msgid "Argument not supported for format '%s': -%d" msgstr "Argumentet stöd inte för formatet \"%s\": -%d" -#: attr.c:203 +#: attr.c:202 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%-*s är inte ett giltigt namn på attribut" -#: attr.c:364 +#: attr.c:363 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s inte tillåtet: %s:%d" -#: attr.c:404 +#: attr.c:403 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1746,12 +1744,12 @@ msgstr "Felaktigt citerat innehåll i filen \"%s\": %s" msgid "We cannot bisect more!\n" msgstr "Det finns inte mer att göra \"bisect\" på!\n" -#: bisect.c:764 +#: bisect.c:765 #, c-format msgid "Not a valid commit name %s" msgstr "Namnet på incheckningen är inte giltigt: %s" -#: bisect.c:789 +#: bisect.c:790 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1760,7 +1758,7 @@ msgstr "" "Sammanslagningsbasen %s är trasig.\n" "Det betyder att felet har rättats mellan %s och [%s].\n" -#: bisect.c:794 +#: bisect.c:795 #, c-format msgid "" "The merge base %s is new.\n" @@ -1769,7 +1767,7 @@ msgstr "" "Sammanslagningsbasen %s är ny.\n" "Egenskapen har ändrats mellan %s och [%s].\n" -#: bisect.c:799 +#: bisect.c:800 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1778,7 +1776,7 @@ msgstr "" "Sammanslagningsbasen %s är %s.\n" "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n" -#: bisect.c:807 +#: bisect.c:808 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1789,7 +1787,7 @@ msgstr "" "git bisect kan inte fungera korrekt i detta fall.\n" "Kanske du skrev fel %s- och %s-revisioner?\n" -#: bisect.c:820 +#: bisect.c:821 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1801,36 +1799,36 @@ msgstr "" "%s.\n" "Vi fortsätter ändå." -#: bisect.c:859 +#: bisect.c:860 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisect: en sammanslagningsbas måste testas\n" -#: bisect.c:909 +#: bisect.c:910 #, c-format msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:939 +#: bisect.c:940 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: bisect.c:985 builtin/merge.c:155 +#: bisect.c:986 builtin/merge.c:155 #, c-format msgid "could not read file '%s'" msgstr "kunde inte läsa filen \"%s\"" -#: bisect.c:1025 +#: bisect.c:1026 msgid "reading bisect refs failed" msgstr "misslyckades läsa bisect-referenser" -#: bisect.c:1055 +#: bisect.c:1056 #, c-format msgid "%s was both %s and %s\n" msgstr "%s var både %s och %s\n" -#: bisect.c:1064 +#: bisect.c:1065 #, c-format msgid "" "No testable commit found.\n" @@ -1839,7 +1837,7 @@ msgstr "" "Ingen testbar incheckning hittades.\n" "Kanske du startade med felaktiga sökvägsargument?\n" -#: bisect.c:1093 +#: bisect.c:1094 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1849,54 +1847,54 @@ msgstr[1] "(ungefär %d steg)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1099 +#: bisect.c:1100 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n" msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n" -#: blame.c:2776 +#: blame.c:2773 msgid "--contents and --reverse do not blend well." msgstr "--contents och --reverse fungerar inte så bra tillsammans." -#: blame.c:2790 +#: blame.c:2787 msgid "cannot use --contents with final commit object name" msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt" -#: blame.c:2811 +#: blame.c:2808 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158 -#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114 -#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071 -#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373 -#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790 +#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157 +#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118 +#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096 +#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381 +#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796 #: builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" -#: blame.c:2838 +#: blame.c:2835 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent tillsammans kräver ett intervall på första-förälder-" "kedjan" -#: blame.c:2849 +#: blame.c:2846 #, c-format msgid "no such path %s in %s" msgstr "sökvägen %s i %s finns inte" -#: blame.c:2860 +#: blame.c:2857 #, c-format msgid "cannot read blob %s for path %s" msgstr "kan inte läsa objektet %s för sökvägen %s" -#: branch.c:77 +#: branch.c:93 msgid "" "cannot inherit upstream tracking configuration of multiple refs when " "rebasing is requested" @@ -1904,31 +1902,31 @@ msgstr "" "kan inte ärva uppströmsspårningsinformation från flera referenser när " "ombasering är vald" -#: branch.c:88 +#: branch.c:104 #, c-format msgid "not setting branch '%s' as its own upstream" msgstr "ställer inte in grenen %s som sin egen uppströmsgren" -#: branch.c:144 +#: branch.c:160 #, c-format msgid "branch '%s' set up to track '%s' by rebasing." msgstr "grenen \"%s\" inställd på att spåra \"%s\" genom ombasering." -#: branch.c:145 +#: branch.c:161 #, c-format msgid "branch '%s' set up to track '%s'." msgstr "grenen \"%s\" inställd på att spåra \"%s\"." -#: branch.c:148 +#: branch.c:164 #, c-format msgid "branch '%s' set up to track:" msgstr "grenen \"%s\" inställd på att spåra:" -#: branch.c:160 +#: branch.c:176 msgid "unable to write upstream branch configuration" msgstr "kan inte skriva inställningar för uppströmsgren" -#: branch.c:162 +#: branch.c:178 msgid "" "\n" "After fixing the error cause you may try to fix up\n" @@ -1938,51 +1936,89 @@ msgstr "" "När du har rättat felorsaken kan du försöka rätta\n" "fjärrspårningsinformationen genom att utföra:" -#: branch.c:203 +#: branch.c:219 #, c-format msgid "asked to inherit tracking from '%s', but no remote is set" msgstr "bad om att ärva spårning från \"%s\", men ingen fjärr är vald" -#: branch.c:209 +#: branch.c:225 #, c-format msgid "asked to inherit tracking from '%s', but no merge configuration is set" msgstr "" "bad om att ärva spårning från \"%s\", men ingen sammanslagningsinställning " "är vald" -#: branch.c:252 +#: branch.c:277 #, c-format -msgid "not tracking: ambiguous information for ref %s" -msgstr "spårar inte: tvetydig information för referensen %s" +msgid "not tracking: ambiguous information for ref '%s'" +msgstr "spårar inte: tvetydig information för referensen \"%s\"" -#: branch.c:287 +#. TRANSLATORS: This is a line listing a remote with duplicate +#. refspecs in the advice message below. For RTL languages you'll +#. probably want to swap the "%s" and leading " " space around. +#. +#. TRANSLATORS: This is line item of ambiguous object output +#. from describe_ambiguous_object() above. For RTL languages +#. you'll probably want to swap the "%s" and leading " " space +#. around. +#. +#: branch.c:289 object-name.c:464 +#, c-format +msgid " %s\n" +msgstr " %s\n" + +#. TRANSLATORS: The second argument is a \n-delimited list of +#. duplicate refspecs, composed above. +#. +#: branch.c:295 +#, c-format +msgid "" +"There are multiple remotes whose fetch refspecs map to the remote\n" +"tracking ref '%s':\n" +"%s\n" +"This is typically a configuration error.\n" +"\n" +"To support setting up tracking branches, ensure that\n" +"different remotes' fetch refspecs map into different\n" +"tracking namespaces." +msgstr "" +"Flera fjärrars hämtnings-referensspecifikationer motsvarar fjärr-\n" +"spårningsreferensen \"%s\":\n" +"%s\n" +"Detta är vanligtvis ett fel i konfigurationen.\n" +"\n" +"För att möjliggöra konfiguration av spårande grenar, se till att\n" +"olika fjärrars hämtnings-referensspecifikationer kopplas till\n" +"olika spårningsnamnrymder." + +#: branch.c:344 #, c-format msgid "'%s' is not a valid branch name" msgstr "\"%s\" är inte ett giltigt grennamn" -#: branch.c:307 +#: branch.c:364 #, c-format msgid "a branch named '%s' already exists" msgstr "det finns redan en gren som heter \"%s\"" -#: branch.c:313 +#: branch.c:370 #, c-format msgid "cannot force update the branch '%s' checked out at '%s'" msgstr "" "kan inte tvinga uppdatering av grenen \"%s\" som är utcheckad på \"%s\"" -#: branch.c:336 +#: branch.c:393 #, c-format msgid "cannot set up tracking information; starting point '%s' is not a branch" msgstr "" "kan inte ställa in spårningsinformation; startpunkten \"%s\" är inte en gren" -#: branch.c:338 +#: branch.c:395 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte" -#: branch.c:340 +#: branch.c:397 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -2002,126 +2038,145 @@ msgstr "" "spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n" "för att ställa in uppströmskonfigurationen när du sänder in." -#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377 +#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377 #: builtin/replace.c:423 builtin/replace.c:453 #, c-format msgid "not a valid object name: '%s'" msgstr "objektnamnet är inte giltigt: \"%s\"" -#: branch.c:404 +#: branch.c:465 #, c-format msgid "ambiguous object name: '%s'" msgstr "objektnamnet är tvetydigt: \"%s\"" -#: branch.c:409 +#: branch.c:470 #, c-format msgid "not a valid branch point: '%s'" msgstr "avgreningspunkten är inte giltig: \"%s\"" -#: branch.c:469 +#: branch.c:658 +#, c-format +msgid "submodule '%s': unable to find submodule" +msgstr "undermodulen \"%s\": kan inte hitta undermodulen" + +#: branch.c:661 +#, c-format +msgid "" +"You may try updating the submodules using 'git checkout %s && git submodule " +"update --init'" +msgstr "" +"Du kan försöka uppdatera undermodulerna med \"git checkout %s && git " +"submodule update --init\"" + +#: branch.c:672 branch.c:698 +#, c-format +msgid "submodule '%s': cannot create branch '%s'" +msgstr "undermodulen \"%s\": kan inte skapa grenen \"%s\"" + +#: branch.c:730 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "\"%s\" är redan utcheckad på \"%s\"" -#: branch.c:494 +#: branch.c:755 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD i arbetskatalogen %s har inte uppdaterats" -#: bundle.c:44 +#: bundle.c:45 #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "okänd hashningsalgoritm för bunt: \"%s\"" -#: bundle.c:48 +#: bundle.c:53 #, c-format msgid "unknown capability '%s'" msgstr "okänd kapabilitet \"%s\"" -#: bundle.c:74 +#: bundle.c:79 #, c-format msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "'%s' ser inte ut som en v2- eller v3-bunt-fil" -#: bundle.c:113 +#: bundle.c:118 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406 -#: builtin/commit.c:862 +#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402 +#: builtin/commit.c:865 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" -#: bundle.c:198 +#: bundle.c:203 msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:201 +#: bundle.c:206 msgid "need a repository to verify a bundle" msgstr "behöver ett arkiv för att bekräfta en bunt." -#: bundle.c:257 +#: bundle.c:264 #, c-format msgid "The bundle contains this ref:" -msgid_plural "The bundle contains these %d refs:" +msgid_plural "The bundle contains these %<PRIuMAX> refs:" msgstr[0] "Bunten innehåller denna referens:" -msgstr[1] "Bunten innehåller dessa %d referenser:" +msgstr[1] "Bunten innehåller dessa %<PRIuMAX> referenser:" -#: bundle.c:264 +#: bundle.c:272 msgid "The bundle records a complete history." msgstr "Bunten beskriver en komplett historik." -#: bundle.c:266 +#: bundle.c:274 #, c-format msgid "The bundle requires this ref:" -msgid_plural "The bundle requires these %d refs:" +msgid_plural "The bundle requires these %<PRIuMAX> refs:" msgstr[0] "Bunten kräver denna referens:" -msgstr[1] "Bunten kräver dessa %d referenser:" +msgstr[1] "Bunten kräver dessa %<PRIuMAX> referenser:" -#: bundle.c:333 +#: bundle.c:350 msgid "unable to dup bundle descriptor" msgstr "kan inte duplicera bunthandtag" -#: bundle.c:340 +#: bundle.c:357 msgid "Could not spawn pack-objects" msgstr "Kunde inte starta pack-objects" -#: bundle.c:351 +#: bundle.c:368 msgid "pack-objects died" msgstr "pack-objects misslyckades" -#: bundle.c:400 +#: bundle.c:417 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:504 +#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400 +#, c-format +msgid "unrecognized argument: %s" +msgstr "okänt argument: %s" + +#: bundle.c:548 #, c-format msgid "unsupported bundle version %d" msgstr "version %d för bunt stöds ej" -#: bundle.c:506 +#: bundle.c:550 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "kan inte skriva bunt med version %d med algoritmen %s" -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399 -#, c-format -msgid "unrecognized argument: %s" -msgstr "okänt argument: %s" - -#: bundle.c:553 +#: bundle.c:600 msgid "Refusing to create empty bundle." msgstr "Vägrar skapa en tom bunt." -#: bundle.c:563 +#: bundle.c:610 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:588 +#: bundle.c:639 msgid "index-pack died" msgstr "index-pack dog" @@ -2149,7 +2204,7 @@ msgstr "avslutande stycke har id %<PRIx32> som inte är noll" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit-graph.c:204 midx.c:51 +#: commit-graph.c:204 midx.c:52 msgid "invalid hash version" msgstr "felaktig hashnings-version" @@ -2177,207 +2232,208 @@ msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X" msgid "commit-graph file is too small to hold %u chunks" msgstr "incheckningsgraffilen är för liten för att innehålla %u stycken" -#: commit-graph.c:482 +#: commit-graph.c:485 msgid "commit-graph has no base graphs chunk" msgstr "incheckningsgrafen har inga bas-graf-stycken" -#: commit-graph.c:492 +#: commit-graph.c:495 msgid "commit-graph chain does not match" msgstr "incheckningsgrafens kedja stämmer inte" -#: commit-graph.c:540 +#: commit-graph.c:543 #, 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:564 +#: commit-graph.c:567 msgid "unable to find all commit-graph files" msgstr "kan inte hitta alla incheckingsgraffiler" -#: commit-graph.c:749 commit-graph.c:786 +#: commit-graph.c:752 commit-graph.c:789 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig" -#: commit-graph.c:770 +#: commit-graph.c:773 #, c-format msgid "could not find commit %s" msgstr "kunde inte hitta incheckningen %s" -#: commit-graph.c:803 +#: commit-graph.c:806 msgid "commit-graph requires overflow generation data but has none" msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen" -#: commit-graph.c:1108 builtin/am.c:1369 +#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775 +#: builtin/clone.c:705 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: commit-graph.c:1370 builtin/pack-objects.c:3070 +#: commit-graph.c:1373 builtin/pack-objects.c:3078 #, c-format msgid "unable to get type of object %s" msgstr "kunde inte hämta typ för objektet %s" -#: commit-graph.c:1401 +#: commit-graph.c:1404 msgid "Loading known commits in commit graph" msgstr "Läser in kända incheckningar i incheckningsgraf" -#: commit-graph.c:1418 +#: commit-graph.c:1421 msgid "Expanding reachable commits in commit graph" msgstr "Expanderar nåbara incheckningar i incheckningsgraf" -#: commit-graph.c:1438 +#: commit-graph.c:1441 msgid "Clearing commit marks in commit graph" msgstr "Rensar incheckningsmärken i incheckningsgraf" -#: commit-graph.c:1457 +#: commit-graph.c:1460 msgid "Computing commit graph topological levels" msgstr "Beräknar topografiska nivåer för incheckningsgraf" -#: commit-graph.c:1510 +#: commit-graph.c:1513 msgid "Computing commit graph generation numbers" msgstr "Beräknar generationsvärden för incheckningsgraf" -#: commit-graph.c:1591 +#: commit-graph.c:1598 msgid "Computing commit changed paths Bloom filters" msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen" -#: commit-graph.c:1668 +#: commit-graph.c:1675 msgid "Collecting referenced commits" msgstr "Samlar refererade incheckningar" -#: commit-graph.c:1693 +#: commit-graph.c:1701 #, c-format -msgid "Finding commits for commit graph in %d pack" -msgid_plural "Finding commits for commit graph in %d packs" -msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket" -msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket" +msgid "Finding commits for commit graph in %<PRIuMAX> pack" +msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs" +msgstr[0] "Söker incheckningar för incheckingsgraf i %<PRIuMAX> paket" +msgstr[1] "Söker incheckningar för incheckingsgraf i %<PRIuMAX> paket" -#: commit-graph.c:1706 +#: commit-graph.c:1714 #, c-format msgid "error adding pack %s" msgstr "fel vid tillägg av paketet %s" -#: commit-graph.c:1710 +#: commit-graph.c:1718 #, c-format msgid "error opening index for %s" msgstr "fel vid öppning av indexet för %s" -#: commit-graph.c:1747 +#: commit-graph.c:1756 msgid "Finding commits for commit graph among packed objects" msgstr "Söker incheckningar för incheckingsgraf i packade objekt" -#: commit-graph.c:1765 +#: commit-graph.c:1774 msgid "Finding extra edges in commit graph" msgstr "Söker ytterligare kanter i incheckingsgraf" -#: commit-graph.c:1814 +#: commit-graph.c:1823 msgid "failed to write correct number of base graph ids" msgstr "kunde inte skriva korrekt antal bas-graf-id:n" -#: commit-graph.c:1845 midx.c:1149 +#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475 #, c-format msgid "unable to create leading directories of %s" msgstr "kunde inte skapa inledande kataloger för %s" -#: commit-graph.c:1858 +#: commit-graph.c:1868 msgid "unable to create temporary graph layer" msgstr "kan inte skapa temporärt graflager" -#: commit-graph.c:1863 +#: commit-graph.c:1873 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "kan inte justera delade behörigheter för \"%s\"" -#: commit-graph.c:1920 +#: commit-graph.c:1930 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Skriver ut incheckningsgraf i %d pass" msgstr[1] "Skriver ut incheckningsgraf i %d pass" -#: commit-graph.c:1956 +#: commit-graph.c:1967 msgid "unable to open commit-graph chain file" msgstr "Kunde inte öppna incheckningsgrafkedjefilen" -#: commit-graph.c:1972 +#: commit-graph.c:1983 msgid "failed to rename base commit-graph file" msgstr "kunde inte byta namn på bas-incheckingsgraffilen" -#: commit-graph.c:1992 +#: commit-graph.c:2004 msgid "failed to rename temporary commit-graph file" msgstr "kunde inte byta namn på temporär incheckningsgraffil" -#: commit-graph.c:2125 +#: commit-graph.c:2137 msgid "Scanning merged commits" msgstr "Söker sammanslagna incheckningar" -#: commit-graph.c:2169 +#: commit-graph.c:2181 msgid "Merging commit-graph" msgstr "Slår ihop incheckningsgraf" -#: commit-graph.c:2277 +#: commit-graph.c:2289 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" "försöker skriva en incheckningsgraf, men \"core.commitGraph\" är inaktiverad" -#: commit-graph.c:2384 +#: commit-graph.c:2396 msgid "too many commits to write graph" msgstr "för många incheckningar för att skriva graf" -#: commit-graph.c:2482 +#: commit-graph.c:2494 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "filen med incheckningsgraf har felaktig kontrollsumma och är troligtvis " "trasig" -#: commit-graph.c:2492 +#: commit-graph.c:2504 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s" -#: commit-graph.c:2502 commit-graph.c:2517 +#: commit-graph.c:2514 commit-graph.c:2529 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u" -#: commit-graph.c:2509 +#: commit-graph.c:2521 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "kunde inte tolka incheckning %s från incheckningsgraf" -#: commit-graph.c:2527 +#: commit-graph.c:2539 msgid "Verifying commits in commit graph" msgstr "Bekräftar incheckningar i incheckningsgrafen" -#: commit-graph.c:2542 +#: commit-graph.c:2554 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf" -#: commit-graph.c:2549 +#: commit-graph.c:2561 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s" -#: commit-graph.c:2559 +#: commit-graph.c:2571 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång" -#: commit-graph.c:2568 +#: commit-graph.c:2580 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "incheckningsgrafens förälder för %s är %s != %s" -#: commit-graph.c:2582 +#: commit-graph.c:2594 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt" -#: commit-graph.c:2587 +#: commit-graph.c:2599 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2385,7 +2441,7 @@ msgstr "" "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-" "noll på annan plats" -#: commit-graph.c:2591 +#: commit-graph.c:2603 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2393,32 +2449,32 @@ msgstr "" "incheckningsgrafen har generationsnummer skilt från noll för incheckningen " "%s, men noll på annan plats" -#: commit-graph.c:2608 +#: commit-graph.c:2620 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "" "incheckningsgrafens generation för incheckningen %s är %<PRIuMAX> < " "%<PRIuMAX>" -#: commit-graph.c:2614 +#: commit-graph.c:2626 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "incheckningsdatumet för incheckningen %s i incheckningsgrafen är %<PRIuMAX> !" "= %<PRIuMAX>" -#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444 -#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456 +#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445 +#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" -#: commit.c:55 +#: commit.c:56 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s är inte en incheckning!" -#: commit.c:196 +#: commit.c:197 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -2438,29 +2494,29 @@ msgstr "" "Slå av detta meddelande genom att skriva\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1241 +#: commit.c:1252 #, 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:1245 +#: commit.c:1256 #, 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:1248 +#: commit.c:1259 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: commit.c:1251 +#: commit.c:1262 #, 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:1505 +#: commit.c:1516 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" @@ -2474,7 +2530,15 @@ msgstr "" msgid "memory exhausted" msgstr "minnet slut" -#: config.c:125 +#: compat/terminal.c:167 +msgid "cannot resume in the background, please use 'fg' to resume" +msgstr "kan inte fortsätta i bakgrunden, använd \"fg\" för att återuppta" + +#: compat/terminal.c:168 +msgid "cannot restore terminal settings" +msgstr "kan inte återställa terminalinställningar" + +#: config.c:143 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -2489,341 +2553,368 @@ msgstr "" "\t%s\n" "Det kan bero på cirkulära inkluderingar." -#: config.c:141 +#: config.c:159 #, c-format msgid "could not expand include path '%s'" msgstr "kunde inte expandera inkluderingssökväg \"%s\"" -#: config.c:152 +#: config.c:170 msgid "relative config includes must come from files" msgstr "relativa konfigureringsinkluderingar måste komma från filer" -#: config.c:201 +#: config.c:219 msgid "relative config include conditionals must come from files" msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer" -#: config.c:398 +#: config.c:364 +msgid "" +"remote URLs cannot be configured in file directly or indirectly included by " +"includeIf.hasconfig:remote.*.url" +msgstr "" +"fjärr-URL:er kan inte konfigureras direkt eller indirekt i en fil inkluderad " +"med includeIf.hasconfig:remote.*.url" + +#: config.c:508 #, c-format msgid "invalid config format: %s" msgstr "felaktigt konfigurationsformat: %s" -#: config.c:402 +#: config.c:512 #, c-format msgid "missing environment variable name for configuration '%.*s'" msgstr "miljövariabelnamn saknas för konfigurationen \"%.*s\"" -#: config.c:407 +#: config.c:517 #, c-format msgid "missing environment variable '%s' for configuration '%.*s'" msgstr "miljövariabeln \"%s\" saknas för konfigurationen \"%.*s\"" -#: config.c:443 +#: config.c:553 #, c-format msgid "key does not contain a section: %s" msgstr "nyckeln innehåller inte ett stycke: %s" -#: config.c:448 +#: config.c:558 #, c-format msgid "key does not contain variable name: %s" msgstr "nyckeln innehåller inte variabelnamn: %s" -#: config.c:470 sequencer.c:2806 +#: config.c:580 sequencer.c:2802 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" -#: config.c:475 +#: config.c:585 #, c-format msgid "invalid key (newline): %s" msgstr "ogiltig nyckel (nyradstecken): %s" -#: config.c:495 +#: config.c:605 msgid "empty config key" msgstr "tom konfigurationsnyckel" -#: config.c:513 config.c:525 +#: config.c:623 config.c:635 #, c-format msgid "bogus config parameter: %s" msgstr "falsk konfigureringsparameter: %s" -#: config.c:539 config.c:556 config.c:563 config.c:572 +#: config.c:649 config.c:666 config.c:673 config.c:682 #, c-format msgid "bogus format in %s" msgstr "felaktigt format i %s" -#: config.c:606 +#: config.c:716 #, c-format msgid "bogus count in %s" msgstr "felaktigt antal i %s" -#: config.c:610 +#: config.c:720 #, c-format msgid "too many entries in %s" msgstr "för många poster i %s" -#: config.c:620 +#: config.c:730 #, c-format msgid "missing config key %s" msgstr "konfigurationsnyckel saknas för %s" -#: config.c:628 +#: config.c:738 #, c-format msgid "missing config value %s" msgstr "konfigurationsvärde saknas för %s" -#: config.c:979 +#: config.c:1089 #, c-format msgid "bad config line %d in blob %s" msgstr "felaktig konfigurationsfil rad %d i blob:en %s" -#: config.c:983 +#: config.c:1093 #, c-format msgid "bad config line %d in file %s" msgstr "felaktig konfigurationsfil rad %d i filen %s" -#: config.c:987 +#: config.c:1097 #, c-format msgid "bad config line %d in standard input" msgstr "felaktig konfigurationsfil rad %d i standard in" -#: config.c:991 +#: config.c:1101 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s" -#: config.c:995 +#: config.c:1105 #, c-format msgid "bad config line %d in command line %s" msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s" -#: config.c:999 +#: config.c:1109 #, c-format msgid "bad config line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:1136 +#: config.c:1246 msgid "out of range" msgstr "utanför intervallet" -#: config.c:1136 +#: config.c:1246 msgid "invalid unit" msgstr "ogiltig enhet" -#: config.c:1137 +#: config.c:1247 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:1147 +#: config.c:1257 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s" -#: config.c:1150 +#: config.c:1260 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s" -#: config.c:1153 +#: config.c:1263 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s" -#: config.c:1156 +#: config.c:1266 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:" "en %s: %s" -#: config.c:1159 +#: config.c:1269 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden " "%s: %s" -#: config.c:1162 +#: config.c:1272 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s" -#: config.c:1241 +#: config.c:1368 +#, c-format +msgid "invalid value for variable %s" +msgstr "ogiltigt värde för variabeln %s" + +#: config.c:1389 +#, c-format +msgid "ignoring unknown core.fsync component '%s'" +msgstr "ignorerar okänd core.fsync-komponent \"%s\"" + +#: config.c:1425 #, c-format msgid "bad boolean config value '%s' for '%s'" msgstr "felaktigt booleskt konfigurationsvärde \"%s\" för \"%s\"" -#: config.c:1259 +#: config.c:1443 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:1268 +#: config.c:1452 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" -#: config.c:1361 +#: config.c:1545 #, c-format msgid "abbrev length out of range: %d" msgstr "förkortningslängd utanför intervallet: %d" -#: config.c:1375 config.c:1386 +#: config.c:1559 config.c:1570 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:1476 +#: config.c:1660 msgid "core.commentChar should only be one character" msgstr "core.commentChar kan bara vara ett tecken" -#: config.c:1509 +#: config.c:1692 +#, c-format +msgid "ignoring unknown core.fsyncMethod value '%s'" +msgstr "ignorerar okänt core.fsyncMethod-värde \"%s\"" + +#: config.c:1698 +msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead" +msgstr "core.fsyncObjectFiles avråds från; använd core.fsync istället" + +#: config.c:1714 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1584 +#: config.c:1800 #, c-format msgid "malformed value for %s" msgstr "felformat värde för %s" -#: config.c:1610 +#: config.c:1826 #, c-format msgid "malformed value for %s: %s" msgstr "felformat värde för %s: %s" -#: config.c:1611 +#: config.c:1827 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:1672 builtin/pack-objects.c:4053 +#: config.c:1888 builtin/pack-objects.c:4078 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1795 +#: config.c:2014 #, c-format msgid "unable to load config blob object '%s'" msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\"" -#: config.c:1798 +#: config.c:2017 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referensen \"%s\" pekar inte på en blob" -#: config.c:1816 +#: config.c:2035 #, c-format msgid "unable to resolve config blob '%s'" msgstr "kan inte slå upp konfigurerings-bloben \"%s\"" -#: config.c:1861 +#: config.c:2080 #, c-format msgid "failed to parse %s" msgstr "kunde inte tolka %s" -#: config.c:1917 +#: config.c:2136 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:2285 +#: config.c:2512 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2459 +#: config.c:2686 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:2504 +#: config.c:2731 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100" -#: config.c:2550 +#: config.c:2763 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2552 +#: config.c:2765 #, 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:2637 +#: config.c:2850 #, c-format msgid "invalid section name '%s'" msgstr "felaktigt sektionsnamn \"%s\"" -#: config.c:2669 +#: config.c:2882 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2698 +#: config.c:2911 #, c-format msgid "failed to write new configuration file %s" msgstr "kan inte skriva nya konfigurationsfilen \"%s\"" -#: config.c:2950 config.c:3277 +#: config.c:3177 config.c:3518 #, c-format msgid "could not lock config file %s" msgstr "kunde inte låsa konfigurationsfilen %s" -#: config.c:2961 +#: config.c:3188 #, c-format msgid "opening %s" msgstr "öppnar %s" -#: config.c:2998 builtin/config.c:361 +#: config.c:3225 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "ogiltigt mönster: %s" -#: config.c:3023 +#: config.c:3250 #, c-format msgid "invalid config file %s" msgstr "ogiltig konfigurationsfil: \"%s\"" -#: config.c:3036 config.c:3290 +#: config.c:3263 config.c:3531 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:3047 +#: config.c:3274 #, c-format msgid "unable to mmap '%s'%s" msgstr "kunde inte utföra mmap på \"%s\"%s" -#: config.c:3057 config.c:3295 +#: config.c:3284 config.c:3536 #, c-format msgid "chmod on %s failed" msgstr "chmod misslyckades på %s" -#: config.c:3142 config.c:3392 +#: config.c:3369 config.c:3633 #, c-format msgid "could not write config file %s" msgstr "kunde inte skriva konfigurationsfilen %s" -#: config.c:3176 +#: config.c:3403 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868 +#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" -#: config.c:3268 +#: config.c:3509 #, c-format msgid "invalid section name: %s" msgstr "felaktigt namn på stycke: %s" -#: config.c:3435 +#: config.c:3676 #, c-format msgid "missing value for '%s'" msgstr "värde saknas för \"%s\"" @@ -3159,68 +3250,68 @@ msgstr "vägrar arbeta med inloggningsuppgifter utan värdfält" msgid "refusing to work with credential missing protocol field" msgstr "vägrar arbeta med inloggningsuppgifter utan protokollfält" -#: credential.c:395 +#: credential.c:396 #, c-format msgid "url contains a newline in its %s component: %s" msgstr "url innehåller radbrytning i komponenten %s: %s" -#: credential.c:439 +#: credential.c:440 #, c-format msgid "url has no scheme: %s" msgstr "url saknar protokoll: %s" -#: credential.c:512 +#: credential.c:513 #, c-format msgid "credential url cannot be parsed: %s" msgstr "kan inte tolka url för inloggingsuppgifter: %s" -#: date.c:138 +#: date.c:139 msgid "in the future" msgstr "i framtiden" -#: date.c:144 +#: date.c:145 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "%<PRIuMAX> sekund sedan" msgstr[1] "%<PRIuMAX> sekunder sedan" -#: date.c:151 +#: date.c:152 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "%<PRIuMAX> minut sedan" msgstr[1] "%<PRIuMAX> minuter sedan" -#: date.c:158 +#: date.c:159 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "%<PRIuMAX> timme sedan" msgstr[1] "%<PRIuMAX> timmar sedan" -#: date.c:165 +#: date.c:166 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "%<PRIuMAX> dag sedan" msgstr[1] "%<PRIuMAX> dagar sedan" -#: date.c:171 +#: date.c:172 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "%<PRIuMAX> vecka sedan" msgstr[1] "%<PRIuMAX> veckor sedan" -#: date.c:178 +#: date.c:179 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "%<PRIuMAX> månad sedan" msgstr[1] "%<PRIuMAX> månader sedan" -#: date.c:189 +#: date.c:190 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -3228,14 +3319,14 @@ msgstr[0] "%<PRIuMAX> år" msgstr[1] "%<PRIuMAX> år" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:192 +#: date.c:193 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "%s, %<PRIuMAX> månad sedan" msgstr[1] "%s, %<PRIuMAX> månader sedan" -#: date.c:197 date.c:202 +#: date.c:198 date.c:203 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -3266,10 +3357,14 @@ msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)" msgid "Marked %d islands, done.\n" msgstr "Markerade %d öar, klar.\n" -#: diff-merges.c:70 +#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37 +#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203 +#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742 +#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45 +#: builtin/pull.c:47 builtin/pull.c:321 #, c-format -msgid "unknown value for --diff-merges: %s" -msgstr "okänt värde för --diff-merges: %s" +msgid "invalid value for '%s': '%s'" +msgstr "felaktigt värde för \"%s\": \"%s\"" #: diff-lib.c:561 msgid "--merge-base does not work with ranges" @@ -3303,17 +3398,17 @@ msgstr "" "Inte ett git-arkiv. Använd --no-index för att jämföra två sökvägar utanför " "en arbetskatalog." -#: diff.c:158 +#: diff.c:159 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n" -#: diff.c:163 +#: diff.c:164 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Okänd dirstat-parameter \"%s\"\n" -#: diff.c:299 +#: diff.c:300 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -3321,7 +3416,7 @@ msgstr "" "färginställningen för flyttade block måste vara en av \"no\", \"default\", " "\"blocks\", \"zebra\", \"dimmed-zebra\", \"plain\"" -#: diff.c:327 +#: diff.c:328 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " @@ -3331,7 +3426,7 @@ msgstr "" "\", \"ignore-space-at-eol\", \"ignore-all-space\", \"allow-indentation-change" "\"" -#: diff.c:335 +#: diff.c:336 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" @@ -3339,12 +3434,12 @@ msgstr "" "color-moved-ws: allow-indentation-change kan inte kombineras med andra " "blankstegslägen" -#: diff.c:412 +#: diff.c:413 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:472 +#: diff.c:473 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -3353,30 +3448,30 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:4237 +#: diff.c:4282 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:4589 +#: diff.c:4677 parse-options.c:1114 #, c-format msgid "options '%s', '%s', '%s', and '%s' cannot be used together" msgstr "" "flaggorna \"%s\", \"%s\", \"%s\" och \"%s\" kan inte användas samtidigt" -#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506 +#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578 #, c-format msgid "options '%s', '%s', and '%s' cannot be used together" msgstr "flaggorna \"%s\", \"%s\" och \"%s\" kan inte användas samtidigt" -#: diff.c:4597 +#: diff.c:4685 #, c-format msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'" msgstr "" "flaggorna \"%s\" och \"%s\" kan inte användas samtidigt, använd \"%s\" med " "\"%s\"" -#: diff.c:4601 +#: diff.c:4689 #, c-format msgid "" "options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'" @@ -3384,22 +3479,22 @@ msgstr "" "flaggorna \"%s\" och \"%s\" kan inte användas samtidigt, använd \"%s\" med " "\"%s\" och \"%s\"" -#: diff.c:4681 +#: diff.c:4769 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:4729 +#: diff.c:4823 #, c-format msgid "invalid --stat value: %s" msgstr "ogiltigt värde för --stat: %s" -#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277 +#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319 #: parse-options.c:217 parse-options.c:221 #, c-format msgid "%s expects a numerical value" msgstr "%s förväntar ett numeriskt värde" -#: diff.c:4766 +#: diff.c:4860 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3408,42 +3503,42 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:4851 +#: diff.c:4893 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s" -#: diff.c:4875 +#: diff.c:4917 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "okänt värde efter ws-error-highlight=%.*s" -#: diff.c:4889 +#: diff.c:4931 #, c-format msgid "unable to resolve '%s'" msgstr "kunde inte slå upp \"%s\"" -#: diff.c:4939 diff.c:4945 +#: diff.c:4981 diff.c:4987 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s förväntar formen <n>/<m>" -#: diff.c:4957 +#: diff.c:4999 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s förväntar ett tecken, fick \"%s\"" -#: diff.c:4978 +#: diff.c:5020 #, c-format msgid "bad --color-moved argument: %s" msgstr "felaktigt argument till --color-moved: %s" -#: diff.c:4997 +#: diff.c:5039 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "ogiltigt läge %s\" i --color-moved-ws" -#: diff.c:5037 +#: diff.c:5079 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3451,154 +3546,154 @@ msgstr "" "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och " "\"histogram\"" -#: diff.c:5073 diff.c:5093 +#: diff.c:5115 diff.c:5135 #, c-format msgid "invalid argument to %s" msgstr "ogiltigt argument för %s" -#: diff.c:5197 +#: diff.c:5239 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\"" -#: diff.c:5246 +#: diff.c:5288 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:5302 +#: diff.c:5344 #, c-format msgid "bad --word-diff argument: %s" msgstr "felaktigt argument --word-diff: %s" -#: diff.c:5338 +#: diff.c:5380 msgid "Diff output format options" msgstr "Formatflaggor för diff-utdata" -#: diff.c:5340 diff.c:5346 +#: diff.c:5382 diff.c:5388 msgid "generate patch" msgstr "skapar patch" -#: diff.c:5343 builtin/log.c:179 +#: diff.c:5385 builtin/log.c:180 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: diff.c:5348 diff.c:5462 diff.c:5469 +#: diff.c:5390 diff.c:5504 diff.c:5511 msgid "<n>" msgstr "<n>" -#: diff.c:5349 diff.c:5352 +#: diff.c:5391 diff.c:5394 msgid "generate diffs with <n> lines context" msgstr "skapa diffar med <n> rader sammanhang" -#: diff.c:5354 +#: diff.c:5396 msgid "generate the diff in raw format" msgstr "generera diff i råformat" -#: diff.c:5357 +#: diff.c:5399 msgid "synonym for '-p --raw'" msgstr "synonym till \"-p --raw\"" -#: diff.c:5361 +#: diff.c:5403 msgid "synonym for '-p --stat'" msgstr "synonym till \"-p --stat\"" -#: diff.c:5365 +#: diff.c:5407 msgid "machine friendly --stat" msgstr "maskinläsbar --stat" -#: diff.c:5368 +#: diff.c:5410 msgid "output only the last line of --stat" msgstr "skriv bara ut den sista raden för --stat" -#: diff.c:5370 diff.c:5378 +#: diff.c:5412 diff.c:5420 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5371 +#: diff.c:5413 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:5375 +#: diff.c:5417 msgid "synonym for --dirstat=cumulative" msgstr "synonym för --dirstat=cumulative" -#: diff.c:5379 +#: diff.c:5421 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonym för --dirstat=filer,param1,param2..." -#: diff.c:5383 +#: diff.c:5425 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel" -#: diff.c:5386 +#: diff.c:5428 msgid "condensed summary such as creations, renames and mode changes" msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen" -#: diff.c:5389 +#: diff.c:5431 msgid "show only names of changed files" msgstr "visa endast namnen på ändrade filer" -#: diff.c:5392 +#: diff.c:5434 msgid "show only names and status of changed files" msgstr "visa endast namn och status för ändrade filer" -#: diff.c:5394 +#: diff.c:5436 msgid "<width>[,<name-width>[,<count>]]" msgstr "<bredd>[,<namn-bredd>[,<antal>]]" -#: diff.c:5395 +#: diff.c:5437 msgid "generate diffstat" msgstr "skapa diffstat" -#: diff.c:5397 diff.c:5400 diff.c:5403 +#: diff.c:5439 diff.c:5442 diff.c:5445 msgid "<width>" msgstr "<bredd>" -#: diff.c:5398 +#: diff.c:5440 msgid "generate diffstat with a given width" msgstr "generera en diffstat med given bredd" -#: diff.c:5401 +#: diff.c:5443 msgid "generate diffstat with a given name width" msgstr "generera en diffstat med given namnbredd" -#: diff.c:5404 +#: diff.c:5446 msgid "generate diffstat with a given graph width" msgstr "generera en diffstat med given grafbredd" -#: diff.c:5406 +#: diff.c:5448 msgid "<count>" msgstr "<antal>" -#: diff.c:5407 +#: diff.c:5449 msgid "generate diffstat with limited lines" msgstr "generera diffstat med begränsade rader" -#: diff.c:5410 +#: diff.c:5452 msgid "generate compact summary in diffstat" msgstr "skapa kompakt översikt i diffstat" -#: diff.c:5413 +#: diff.c:5455 msgid "output a binary diff that can be applied" msgstr "skapa en binärdiff som kan appliceras" -#: diff.c:5416 +#: diff.c:5458 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:5418 +#: diff.c:5460 msgid "show colored diff" msgstr "visa färgad diff" -#: diff.c:5419 +#: diff.c:5461 msgid "<kind>" msgstr "<typ>" -#: diff.c:5420 +#: diff.c:5462 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3606,7 +3701,7 @@ msgstr "" "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller " "\"new\" (nya) rader i diffen" -#: diff.c:5423 +#: diff.c:5465 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3614,87 +3709,87 @@ msgstr "" "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw " "eller --numstat" -#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541 +#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583 msgid "<prefix>" msgstr "<prefix>" -#: diff.c:5427 +#: diff.c:5469 msgid "show the given source prefix instead of \"a/\"" msgstr "visa givet källprefix istället för \"a/\"" -#: diff.c:5430 +#: diff.c:5472 msgid "show the given destination prefix instead of \"b/\"" msgstr "visa givet målprefix istället för \"b/\"" -#: diff.c:5433 +#: diff.c:5475 msgid "prepend an additional prefix to every line of output" msgstr "lägg till ytterligare prefix på alla rader i utdata" -#: diff.c:5436 +#: diff.c:5478 msgid "do not show any source or destination prefix" msgstr "visa inte käll- eller målprefix" -#: diff.c:5439 +#: diff.c:5481 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:5443 diff.c:5448 diff.c:5453 +#: diff.c:5485 diff.c:5490 diff.c:5495 msgid "<char>" msgstr "<tecken>" -#: diff.c:5444 +#: diff.c:5486 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:5449 +#: diff.c:5491 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:5454 +#: diff.c:5496 msgid "specify the character to indicate a context instead of ' '" msgstr "ange tecken för att ange sammanhang istället för \" \"" -#: diff.c:5457 +#: diff.c:5499 msgid "Diff rename options" msgstr "Diff-namnbytesflaggor" -#: diff.c:5458 +#: diff.c:5500 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5459 +#: diff.c:5501 msgid "break complete rewrite changes into pairs of delete and create" msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par" -#: diff.c:5463 +#: diff.c:5505 msgid "detect renames" msgstr "detektera namnändringar" -#: diff.c:5467 +#: diff.c:5509 msgid "omit the preimage for deletes" msgstr "ta bort för-version för borttagningar" -#: diff.c:5470 +#: diff.c:5512 msgid "detect copies" msgstr "detektera kopior" -#: diff.c:5474 +#: diff.c:5516 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:5476 +#: diff.c:5518 msgid "disable rename detection" msgstr "inaktivera detektering av namnbyten" -#: diff.c:5479 +#: diff.c:5521 msgid "use empty blobs as rename source" msgstr "använd tomma blob:ar som namnändringskälla" -#: diff.c:5481 +#: diff.c:5523 msgid "continue listing the history of a file beyond renames" msgstr "fortsätt lista historiken för en fil bortom namnändringar" -#: diff.c:5484 +#: diff.c:5526 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3702,163 +3797,163 @@ msgstr "" "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver " "given gräns" -#: diff.c:5486 +#: diff.c:5528 msgid "Diff algorithm options" msgstr "Alternativ för diff-algoritm" -#: diff.c:5488 +#: diff.c:5530 msgid "produce the smallest possible diff" msgstr "skapa minsta möjliga diff" -#: diff.c:5491 +#: diff.c:5533 msgid "ignore whitespace when comparing lines" msgstr "ignorera blanktecken vid radjämförelse" -#: diff.c:5494 +#: diff.c:5536 msgid "ignore changes in amount of whitespace" msgstr "ignorera ändringar i antal blanktecken vid radjämförelse" -#: diff.c:5497 +#: diff.c:5539 msgid "ignore changes in whitespace at EOL" msgstr "ignorera blanktecken vid radslut" -#: diff.c:5500 +#: diff.c:5542 msgid "ignore carrier-return at the end of line" msgstr "ignorera CR-tecken vid radslut" -#: diff.c:5503 +#: diff.c:5545 msgid "ignore changes whose lines are all blank" msgstr "ignorera ändringar i rader som är helt blanka" -#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575 +#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617 msgid "<regex>" msgstr "<reguttr>" -#: diff.c:5506 +#: diff.c:5548 msgid "ignore changes whose all lines match <regex>" msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>" -#: diff.c:5509 +#: diff.c:5551 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:5512 +#: diff.c:5554 msgid "generate diff using the \"patience diff\" algorithm" msgstr "skapa diffar med algoritmen \"patience diff\"" -#: diff.c:5516 +#: diff.c:5558 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "skapa diffar med algoritmen \"histogram diff\"" -#: diff.c:5518 +#: diff.c:5560 msgid "<algorithm>" msgstr "<algoritm>" -#: diff.c:5519 +#: diff.c:5561 msgid "choose a diff algorithm" msgstr "välj en diff-algoritm" -#: diff.c:5521 +#: diff.c:5563 msgid "<text>" msgstr "<text>" -#: diff.c:5522 +#: diff.c:5564 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "skapa diffar med algoritmen \"anchored diff\"" -#: diff.c:5524 diff.c:5533 diff.c:5536 +#: diff.c:5566 diff.c:5575 diff.c:5578 msgid "<mode>" msgstr "<läge>" -#: diff.c:5525 +#: diff.c:5567 msgid "show word diff, using <mode> to delimit changed words" msgstr "visa orddiff, där <läge> avgränsar ändrade ord" -#: diff.c:5528 +#: diff.c:5570 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:5531 +#: diff.c:5573 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>" -#: diff.c:5534 +#: diff.c:5576 msgid "moved lines of code are colored differently" msgstr "flyttade kodrader färgas på annat sätt" -#: diff.c:5537 +#: diff.c:5579 msgid "how white spaces are ignored in --color-moved" msgstr "hur blanktecken ignoreras i --color-moved" -#: diff.c:5540 +#: diff.c:5582 msgid "Other diff options" msgstr "Andra diff-flaggor" -#: diff.c:5542 +#: diff.c:5584 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:5546 +#: diff.c:5588 msgid "treat all files as text" msgstr "hantera alla filer som text" -#: diff.c:5548 +#: diff.c:5590 msgid "swap two inputs, reverse the diff" msgstr "växla två indatafiler, vänd diffen" -#: diff.c:5550 +#: diff.c:5592 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "avsluta med 1 vid ändringar, annars 0" -#: diff.c:5552 +#: diff.c:5594 msgid "disable all output of the program" msgstr "slå av alla utdata från programmet" -#: diff.c:5554 +#: diff.c:5596 msgid "allow an external diff helper to be executed" msgstr "tillåt köra en extern diff-hjälpare" -#: diff.c:5556 +#: diff.c:5598 msgid "run external text conversion filters when comparing binary files" msgstr "kör externt textkonverteringsfiler när binärfiler jämförs" -#: diff.c:5558 +#: diff.c:5600 msgid "<when>" msgstr "<när>" -#: diff.c:5559 +#: diff.c:5601 msgid "ignore changes to submodules in the diff generation" msgstr "ignorera ändringar i undermoduler när diffen skapas" -#: diff.c:5562 +#: diff.c:5604 msgid "<format>" msgstr "<format>" -#: diff.c:5563 +#: diff.c:5605 msgid "specify how differences in submodules are shown" msgstr "ange hur ändringar i undermoduler visas" -#: diff.c:5567 +#: diff.c:5609 msgid "hide 'git add -N' entries from the index" msgstr "dölj \"git add -N\"-poster från indexet" -#: diff.c:5570 +#: diff.c:5612 msgid "treat 'git add -N' entries as real in the index" msgstr "tolka \"git add -N\"-poster som äkta i indexet" -#: diff.c:5572 +#: diff.c:5614 msgid "<string>" msgstr "<sträng>" -#: diff.c:5573 +#: diff.c:5615 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:5576 +#: diff.c:5618 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3866,66 +3961,66 @@ msgstr "" "se efter ändringar som ändrar antalet förekomster av angivet reguljärt " "uttryck" -#: diff.c:5579 +#: diff.c:5621 msgid "show all changes in the changeset with -S or -G" msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G" -#: diff.c:5582 +#: diff.c:5624 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:5585 +#: diff.c:5627 msgid "control the order in which files appear in the output" msgstr "styr ordningen i vilken filer visas i utdata" -#: diff.c:5586 diff.c:5589 +#: diff.c:5628 diff.c:5631 msgid "<path>" msgstr "<sökväg>" -#: diff.c:5587 +#: diff.c:5629 msgid "show the change in the specified path first" msgstr "visa ändringen i angiven sökväg först" -#: diff.c:5590 +#: diff.c:5632 msgid "skip the output to the specified path" msgstr "hoppa över utdata fram till angiven sökväg" -#: diff.c:5592 +#: diff.c:5634 msgid "<object-id>" msgstr "<objekt-id>" -#: diff.c:5593 +#: diff.c:5635 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:5595 +#: diff.c:5637 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5596 +#: diff.c:5638 msgid "select files by diff type" msgstr "välj filter efter diff-typ" -#: diff.c:5598 +#: diff.c:5640 msgid "<file>" msgstr "<fil>" -#: diff.c:5599 -msgid "Output to a specific file" -msgstr "Skriv utdata till en specifik fil" +#: diff.c:5641 +msgid "output to a specific file" +msgstr "skriv utdata till en specifik fil" -#: diff.c:6257 +#: diff.c:6321 msgid "exhaustive rename detection was skipped due to too many files." msgstr "" "uttömmande namnbytesdetektering hoppades över på grund av för många filer." -#: diff.c:6260 +#: diff.c:6324 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:6263 +#: diff.c:6327 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3977,20 +4072,20 @@ msgstr "inaktiverar konmönstermatchning" msgid "cannot use %s as an exclude file" msgstr "kan inte använda %s som exkluderingsfil" -#: dir.c:2418 +#: dir.c:2419 #, c-format msgid "could not open directory '%s'" msgstr "kunde inte öppna katalogen \"%s\"" -#: dir.c:2720 +#: dir.c:2721 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:2844 +#: dir.c:2846 msgid "untracked cache is disabled on this system or location" msgstr "ospårad cache är inaktiverad på systemet eller platsen" -#: dir.c:3112 +#: dir.c:3119 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -3998,17 +4093,17 @@ msgstr "" "Kunde inte gissa katalognamn.\n" "Ange en katalog på kommandoraden" -#: dir.c:3800 +#: dir.c:3807 #, c-format msgid "index file corrupt in repo %s" msgstr "indexfilen trasig i arkivet %s" -#: dir.c:3847 dir.c:3852 +#: dir.c:3854 dir.c:3859 #, c-format msgid "could not create directories for %s" msgstr "kunde inte skapa kataloger för %s" -#: dir.c:3881 +#: dir.c:3888 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" @@ -4027,7 +4122,7 @@ msgstr "Filtrerar innehåll" msgid "could not stat file '%s'" msgstr "kunde inte ta status på filen \"%s\"" -#: environment.c:145 +#: environment.c:147 #, c-format msgid "bad git namespace path \"%s\"" msgstr "felaktig git-namnrymdssökväg \"%s\"" @@ -4058,248 +4153,275 @@ msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\"" msgid "unable to write to remote" msgstr "kunde inte skriva till fjärren" -#: fetch-pack.c:395 fetch-pack.c:1439 +#: fetch-pack.c:397 fetch-pack.c:1460 #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" -#: fetch-pack.c:401 fetch-pack.c:1445 +#: fetch-pack.c:403 fetch-pack.c:1466 #, c-format msgid "invalid unshallow line: %s" msgstr "ogiltig \"unshallow\"-rad: %s" -#: fetch-pack.c:403 fetch-pack.c:1447 +#: fetch-pack.c:405 fetch-pack.c:1468 #, c-format msgid "object not found: %s" msgstr "objektet hittades inte: %s" -#: fetch-pack.c:406 fetch-pack.c:1450 +#: fetch-pack.c:408 fetch-pack.c:1471 #, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" -#: fetch-pack.c:408 fetch-pack.c:1452 +#: fetch-pack.c:410 fetch-pack.c:1473 #, c-format msgid "no shallow found: %s" msgstr "ingen \"shallow\" hittades: %s" -#: fetch-pack.c:411 fetch-pack.c:1456 +#: fetch-pack.c:413 fetch-pack.c:1477 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "förväntade shallow/unshallow, fick %s" -#: fetch-pack.c:451 +#: fetch-pack.c:453 #, c-format msgid "got %s %d %s" msgstr "fick %s %d %s" -#: fetch-pack.c:468 +#: fetch-pack.c:470 #, c-format msgid "invalid commit %s" msgstr "ogiltig incheckning %s" -#: fetch-pack.c:499 +#: fetch-pack.c:501 msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:512 progress.c:339 +#: fetch-pack.c:514 progress.h:25 msgid "done" msgstr "klart" -#: fetch-pack.c:524 +#: fetch-pack.c:526 #, c-format msgid "got %s (%d) %s" msgstr "fick %s (%d) %s" -#: fetch-pack.c:560 +#: fetch-pack.c:562 #, c-format msgid "Marking %s as complete" msgstr "Markerar %s som komplett" -#: fetch-pack.c:775 +#: fetch-pack.c:784 #, c-format msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:861 +#: fetch-pack.c:870 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:869 +#: fetch-pack.c:878 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:965 +#: fetch-pack.c:974 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-patch: kunde inte grena av %s" -#: fetch-pack.c:971 +#: fetch-pack.c:980 msgid "fetch-pack: invalid index-pack output" msgstr "fetch-patch: ogiltig utdata från index-pack" -#: fetch-pack.c:988 +#: fetch-pack.c:997 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:990 +#: fetch-pack.c:999 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:1035 +#: fetch-pack.c:1048 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058 -#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 -#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090 -#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112 +#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071 +#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087 +#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103 +#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125 #, c-format msgid "Server supports %s" msgstr "Servern stöder %s" -#: fetch-pack.c:1045 +#: fetch-pack.c:1058 msgid "Server does not support shallow clients" msgstr "Servern stöder inte klienter med grunda arkiv" -#: fetch-pack.c:1105 +#: fetch-pack.c:1118 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:1110 +#: fetch-pack.c:1123 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:1114 +#: fetch-pack.c:1127 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:1116 +#: fetch-pack.c:1129 msgid "Server does not support this repository's object format" msgstr "Servern stöder inte det här arkivets objektformat" -#: fetch-pack.c:1129 +#: fetch-pack.c:1142 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130 +#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166 msgid "source repository is shallow, reject to clone." msgstr "källarkivet är grunt, tillåter inte kloning." -#: fetch-pack.c:1144 fetch-pack.c:1681 +#: fetch-pack.c:1157 fetch-pack.c:1705 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: hämtning misslyckades." -#: fetch-pack.c:1258 +#: fetch-pack.c:1271 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "omaka algoritmer: klient %s; server %s" -#: fetch-pack.c:1262 +#: fetch-pack.c:1275 #, c-format msgid "the server does not support algorithm '%s'" msgstr "servern stöder inte algoritmen \"%s\"" -#: fetch-pack.c:1295 +#: fetch-pack.c:1308 msgid "Server does not support shallow requests" msgstr "Servern stöder inte grunda förfrågningar" -#: fetch-pack.c:1302 +#: fetch-pack.c:1315 msgid "Server supports filter" msgstr "Servern stöder filter" -#: fetch-pack.c:1345 fetch-pack.c:2063 +#: fetch-pack.c:1358 fetch-pack.c:2087 msgid "unable to write request to remote" msgstr "kunde inte skriva anrop till fjärren" -#: fetch-pack.c:1363 +#: fetch-pack.c:1376 #, c-format msgid "error reading section header '%s'" msgstr "fel vid läsning av styckehuvudet \"%s\"" -#: fetch-pack.c:1369 +#: fetch-pack.c:1382 #, c-format msgid "expected '%s', received '%s'" msgstr "förväntade \"%s\", tog emot \"%s\"" -#: fetch-pack.c:1403 +#: fetch-pack.c:1416 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "oväntad bekräftelserad: \"%s\"" -#: fetch-pack.c:1408 +#: fetch-pack.c:1421 #, c-format msgid "error processing acks: %d" msgstr "fel vid hantering av bekräftelser: %d" -#: fetch-pack.c:1418 -msgid "expected packfile to be sent after 'ready'" -msgstr "väntade att paketfil skulle sändas efter \"ready\"" +#. TRANSLATORS: The parameter will be 'ready', a protocol +#. keyword. +#. +#: fetch-pack.c:1435 +#, c-format +msgid "expected packfile to be sent after '%s'" +msgstr "väntade att paketfil skulle sändas efter \"%s\"" -#: fetch-pack.c:1420 -msgid "expected no other sections to be sent after no 'ready'" +#. TRANSLATORS: The parameter will be 'ready', a protocol +#. keyword. +#. +#: fetch-pack.c:1441 +#, c-format +msgid "expected no other sections to be sent after no '%s'" msgstr "" -"väntade inte att några ytterligare sektioner skulle sändas efter \"ready\"" +"väntade inte att några ytterligare sektioner skulle sändas efter \"%s\"" -#: fetch-pack.c:1461 +#: fetch-pack.c:1482 #, c-format msgid "error processing shallow info: %d" msgstr "fel vid hantering av grund (\"shallow\") info: %d" -#: fetch-pack.c:1510 +#: fetch-pack.c:1531 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "förväntade wanted-ref, fick %s" -#: fetch-pack.c:1515 +#: fetch-pack.c:1536 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "oväntad wanted-ref: \"%s\"" -#: fetch-pack.c:1520 +#: fetch-pack.c:1541 #, c-format msgid "error processing wanted refs: %d" msgstr "fel vid hantering av önskade referenser: %d" -#: fetch-pack.c:1550 +#: fetch-pack.c:1571 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: förväntade svarsavslutningspaket" -#: fetch-pack.c:1959 +#: fetch-pack.c:1983 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1982 builtin/clone.c:581 +#: fetch-pack.c:2006 builtin/clone.c:587 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: fetch-pack.c:2085 +#: fetch-pack.c:2109 msgid "unexpected 'ready' from remote" msgstr "oväntat \"ready\" från fjärr" -#: fetch-pack.c:2108 +#: fetch-pack.c:2132 #, c-format msgid "no such remote ref %s" msgstr "ingen sådan fjärreferens: %s" -#: fetch-pack.c:2111 +#: fetch-pack.c:2135 #, 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:329 gpg-interface.c:457 gpg-interface.c:974 -#: gpg-interface.c:990 +#: fsmonitor-ipc.c:119 +#, c-format +msgid "fsmonitor_ipc__send_query: invalid path '%s'" +msgstr "fsmonitor_ipc__send_query: ogilitg sökväg \"%s\"" + +#: fsmonitor-ipc.c:125 +#, c-format +msgid "fsmonitor_ipc__send_query: unspecified error on '%s'" +msgstr "fsmonitor_ipc__send_query: ospecificerat fel på \"%s\"" + +#: fsmonitor-ipc.c:155 +msgid "fsmonitor--daemon is not running" +msgstr "fsmonitor--daemon kör inte" + +#: fsmonitor-ipc.c:164 +#, c-format +msgid "could not send '%s' command to fsmonitor--daemon" +msgstr "kunde inte sända kommandot \"%s\" till fsmonitor--daemon" + +#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995 +#: gpg-interface.c:1011 msgid "could not create temporary file" msgstr "kunde inte skapa temporära fil" -#: gpg-interface.c:332 gpg-interface.c:460 +#: gpg-interface.c:332 gpg-interface.c:459 #, c-format msgid "failed writing detached signature to '%s'" msgstr "misslyckades skriva fristående signatur till \"%s\"" -#: gpg-interface.c:451 +#: gpg-interface.c:450 msgid "" "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh " "signature verification" @@ -4307,7 +4429,7 @@ msgstr "" "gpg.ssh.allowedSignersFile måste ställas in och finnas för att bekräfta ssh-" "signaturer" -#: gpg-interface.c:480 +#: gpg-interface.c:479 msgid "" "ssh-keygen -Y find-principals/verify is needed for ssh signature " "verification (available in openssh version 8.2p1+)" @@ -4315,56 +4437,56 @@ msgstr "" "\"ssh-keygen -Y find-principals/verify\" behövs för att bekräfta ssh-" "signaturer (tillgängligt i openssh version 8.2p1+)" -#: gpg-interface.c:536 +#: gpg-interface.c:550 #, c-format msgid "ssh signing revocation file configured but not found: %s" msgstr "återkallningsfilen för ssh-signering inställd men saknas: %s" -#: gpg-interface.c:624 +#: gpg-interface.c:638 #, c-format msgid "bad/incompatible signature '%s'" msgstr "felaktig/inkompatibel signatur \"%s\"" -#: gpg-interface.c:801 gpg-interface.c:806 +#: gpg-interface.c:815 gpg-interface.c:820 #, c-format msgid "failed to get the ssh fingerprint for key '%s'" msgstr "misslyckades hämta ssh-fingeravtrycket för nyckeln \"%s\"" -#: gpg-interface.c:829 +#: gpg-interface.c:843 msgid "" "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" msgstr "" "måste konfigurera antingen user.signingkey eller gpg.ssh.defaultKeyCommand" -#: gpg-interface.c:851 +#: gpg-interface.c:865 #, c-format msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" msgstr "gpg.ssh.defaultKeyCommand lyckades men gav inga nycklar: %s %s" -#: gpg-interface.c:857 +#: gpg-interface.c:871 #, c-format msgid "gpg.ssh.defaultKeyCommand failed: %s %s" msgstr "gpg.ssh.defaultKeyCommand misslyckades: %s %s" -#: gpg-interface.c:945 +#: gpg-interface.c:966 msgid "gpg failed to sign the data" msgstr "gpg misslyckades signera data" -#: gpg-interface.c:967 +#: gpg-interface.c:988 msgid "user.signingkey needs to be set for ssh signing" msgstr "user.signingkey måste anges för ssh-signering" -#: gpg-interface.c:978 +#: gpg-interface.c:999 #, c-format msgid "failed writing ssh signing key to '%s'" msgstr "misslyckades skriva ssh-signeringsnyckel till \"%s\"" -#: gpg-interface.c:996 +#: gpg-interface.c:1017 #, c-format msgid "failed writing ssh signing key buffer to '%s'" msgstr "misslyckades skriva ssh-signeringsnyckelbuffert till \"%s\"" -#: gpg-interface.c:1014 +#: gpg-interface.c:1035 msgid "" "ssh-keygen -Y sign is needed for ssh signing (available in openssh version " "8.2p1+)" @@ -4372,7 +4494,7 @@ msgstr "" "\"ssh-keygen -Y sign\" behövs för ssh-signering (tillgängligt i openssh " "version 8.2p1+)" -#: gpg-interface.c:1026 +#: gpg-interface.c:1047 #, c-format msgid "failed reading ssh signing data buffer from '%s'" msgstr "misslyckades läsa ssh-signeringsdatabuffert från \"%s\"" @@ -4382,7 +4504,7 @@ msgstr "misslyckades läsa ssh-signeringsdatabuffert från \"%s\"" msgid "ignored invalid color '%.*s' in log.graphColors" msgstr "ignorerade felaktig färg \"%.*s\" i log.graphColors" -#: grep.c:531 +#: grep.c:446 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -4390,109 +4512,109 @@ msgstr "" "angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -" "P under PCRE v2" -#: grep.c:1942 +#: grep.c:1859 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90 +#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90 #: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:1970 +#: grep.c:1887 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" -#: help.c:24 +#: help.c:25 msgid "start a working area (see also: git help tutorial)" msgstr "starta arbetskatalog (se också: git help tutorial)" -#: help.c:25 +#: help.c:26 msgid "work on the current change (see also: git help everyday)" msgstr "jobba med aktuell förändring (se också: git help everyday)" -#: help.c:26 +#: help.c:27 msgid "examine the history and state (see also: git help revisions)" msgstr "utforska historiken och tillståndet (se också: git help revisions)" -#: help.c:27 +#: help.c:28 msgid "grow, mark and tweak your common history" msgstr "utöka, markera och justera din gemensamma historik" -#: help.c:28 +#: help.c:29 msgid "collaborate (see also: git help workflows)" msgstr "samarbeta (se också: git help workflows)" -#: help.c:32 +#: help.c:33 msgid "Main Porcelain Commands" msgstr "Huvudsakliga porslinskommandon" -#: help.c:33 +#: help.c:34 msgid "Ancillary Commands / Manipulators" msgstr "Tilläggskommandon / manipulerare" -#: help.c:34 +#: help.c:35 msgid "Ancillary Commands / Interrogators" msgstr "Tilläggskommandon / frågare" -#: help.c:35 +#: help.c:36 msgid "Interacting with Others" msgstr "Interaktion med andra" -#: help.c:36 +#: help.c:37 msgid "Low-level Commands / Manipulators" msgstr "Lågnivåkommandon / maniupulerare" -#: help.c:37 +#: help.c:38 msgid "Low-level Commands / Interrogators" msgstr "Lågnivåkommandon / frågare" -#: help.c:38 +#: help.c:39 msgid "Low-level Commands / Syncing Repositories" msgstr "Lågnivåkommandon / synka arkiv" -#: help.c:39 +#: help.c:40 msgid "Low-level Commands / Internal Helpers" msgstr "Lågnivåkommandon / interna hjälpare" -#: help.c:313 +#: help.c:316 #, c-format msgid "available git commands in '%s'" msgstr "git-kommandon tillgängliga i \"%s\"" -#: help.c:320 +#: help.c:323 msgid "git commands available from elsewhere on your $PATH" msgstr "git-kommandon från andra platser i din $PATH" -#: help.c:329 +#: help.c:332 msgid "These are common Git commands used in various situations:" msgstr "Dessa vanliga Git-kommandon används i olika situationer:" -#: help.c:378 git.c:100 +#: help.c:382 git.c:100 #, c-format msgid "unsupported command listing type '%s'" msgstr "okänd kommandolisttyp \"%s\"" -#: help.c:418 +#: help.c:422 msgid "The Git concept guides are:" msgstr "Vägledningar för Git-koncept:" -#: help.c:442 -msgid "See 'git help <command>' to read about a specific subcommand" -msgstr "Se \"git help <kommando>\" för att läsa om ett specifikt underkommando" - -#: help.c:447 +#: help.c:446 msgid "External commands" msgstr "Externa kommandon" -#: help.c:462 +#: help.c:468 msgid "Command aliases" msgstr "Kommadoalias" -#: help.c:543 +#: help.c:486 +msgid "See 'git help <command>' to read about a specific subcommand" +msgstr "Se \"git help <kommando>\" för att läsa om ett specifikt underkommando" + +#: help.c:563 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -4501,37 +4623,37 @@ msgstr "" "\"%s\" verkar vara ett git-kommando, men vi kan inte\n" "köra det. Kanske git-%s är trasigt?" -#: help.c:565 help.c:662 +#: help.c:585 help.c:682 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"." -#: help.c:613 +#: help.c:633 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls." -#: help.c:635 +#: help.c:655 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns." -#: help.c:640 +#: help.c:660 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Fortsätter under förutsättningen att du menade \"%s\"." -#: help.c:646 +#: help.c:666 #, c-format msgid "Run '%s' instead [y/N]? " msgstr "Köra \"%s\" istället (j/N)?" -#: help.c:654 +#: help.c:674 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" "Fortsätter om %0.1f sekunder, under förutsättningen att du menade \"%s\"." -#: help.c:666 +#: help.c:686 msgid "" "\n" "The most similar command is" @@ -4545,16 +4667,16 @@ msgstr[1] "" "\n" "Mest lika kommandon är" -#: help.c:706 +#: help.c:729 msgid "git version [<options>]" msgstr "git version [<flaggor>]" -#: help.c:761 +#: help.c:784 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:765 +#: help.c:788 msgid "" "\n" "Did you mean this?" @@ -4568,7 +4690,7 @@ msgstr[1] "" "\n" "Menade du ett av dessa?" -#: hook.c:27 +#: hook.c:28 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -4577,15 +4699,20 @@ msgstr "" "Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n" "Du kan inaktivera varningen med \"git config advice.ignoredHook false\"." -#: ident.c:353 +#: hook.c:87 +#, c-format +msgid "Couldn't start hook '%s'\n" +msgstr "Kunde inte starta kroken \"%s\"\n" + +#: ident.c:354 msgid "Author identity unknown\n" msgstr "Författar-identitet okänd\n" -#: ident.c:356 +#: ident.c:357 msgid "Committer identity unknown\n" msgstr "Incheckar-identitet okänd\n" -#: ident.c:362 +#: ident.c:363 msgid "" "\n" "*** Please tell me who you are.\n" @@ -4611,71 +4738,71 @@ msgstr "" "Kör utan --global för att endast ändra i aktuellt arkiv.\n" "\n" -#: ident.c:397 +#: ident.c:398 msgid "no email was given and auto-detection is disabled" msgstr "ingen e-post angavs och autodetektering är inaktiverad" -#: ident.c:402 +#: ident.c:403 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "kunde inte autodetektera e-postadress (fick \"%s\")" -#: ident.c:419 +#: ident.c:420 msgid "no name was given and auto-detection is disabled" msgstr "inget namn angavs och autodetektering är inaktiverad" -#: ident.c:425 +#: ident.c:426 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "kunde inte autodetektera namn (fick \"%s\")" -#: ident.c:433 +#: ident.c:434 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "tomt ident-namn (för <%s>) ej tillåtet" -#: ident.c:439 +#: ident.c:440 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "namnet består enbart av ej tillåtna tecken: %s" -#: ident.c:454 builtin/commit.c:648 +#: ident.c:455 builtin/commit.c:649 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" -#: list-objects-filter-options.c:83 +#: list-objects-filter-options.c:68 msgid "expected 'tree:<depth>'" msgstr "förväntade \"tree:<djup>\"" -#: list-objects-filter-options.c:98 +#: list-objects-filter-options.c:83 msgid "sparse:path filters support has been dropped" msgstr "sparse:sökväg-filter stöds inte längre" -#: list-objects-filter-options.c:105 +#: list-objects-filter-options.c:90 #, c-format msgid "'%s' for 'object:type=<type>' is not a valid object type" msgstr "\"%s\" för \"object:type=<typ>\" är inte en giltig objekttyp" -#: list-objects-filter-options.c:124 +#: list-objects-filter-options.c:109 #, c-format msgid "invalid filter-spec '%s'" msgstr "felaktig filterspecifikation: \"%s\"" -#: list-objects-filter-options.c:140 +#: list-objects-filter-options.c:125 #, c-format msgid "must escape char in sub-filter-spec: '%c'" msgstr "måste använda specialsekvens i delfilter-spec: \"%c\"" -#: list-objects-filter-options.c:182 +#: list-objects-filter-options.c:167 msgid "expected something after combine:" msgstr "förväntade någonting efter combine:" -#: list-objects-filter-options.c:264 +#: list-objects-filter-options.c:249 msgid "multiple filter-specs cannot be combined" msgstr "flera filterspecifikationer kan inte kombineras" -#: list-objects-filter-options.c:376 +#: list-objects-filter-options.c:365 msgid "unable to upgrade repository format to support partial clone" msgstr "kunde inte uppgradera arkivformat till att stöda delvis klon" @@ -4689,17 +4816,17 @@ msgstr "kunde inte nå gles blob på \"%s\"" msgid "unable to parse sparse filter data in %s" msgstr "kunde inte tolka gles filterdata i %s" -#: list-objects.c:127 +#: list-objects.c:144 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd" -#: list-objects.c:140 +#: list-objects.c:157 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "posten \"%s\" i trädet %s har blob-läge, men är inte en blob" -#: list-objects.c:398 +#: list-objects.c:415 #, c-format msgid "unable to load root tree for commit %s" msgstr "kunde inte läsa in rot-trädet för incheckningen %s" @@ -4729,17 +4856,12 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "Kunde inte skapa \"%s.lock\": %s" -#: ls-refs.c:37 -#, c-format -msgid "invalid value '%s' for lsrefs.unborn" -msgstr "ogiltigt värde \"%s\" för lsrefs.unborn" - -#: ls-refs.c:174 +#: ls-refs.c:175 #, c-format msgid "unexpected line: '%s'" msgstr "oväntad rad: \"%s\"" -#: ls-refs.c:178 +#: ls-refs.c:179 msgid "expected flush after ls-refs arguments" msgstr "förväntade \"flush\" efter ls-refs-argument" @@ -4747,39 +4869,39 @@ msgstr "förväntade \"flush\" efter ls-refs-argument" msgid "quoted CRLF detected" msgstr "citerad CRLF upptäcktes" -#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46 +#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46 #, c-format msgid "bad action '%s' for '%s'" msgstr "felaktig funktion \"%s\" för \"%s\"" -#: merge-ort.c:1584 merge-recursive.c:1211 +#: merge-ort.c:1630 merge-recursive.c:1214 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)" -#: merge-ort.c:1593 merge-recursive.c:1218 +#: merge-ort.c:1639 merge-recursive.c:1221 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)" -#: merge-ort.c:1602 merge-recursive.c:1225 +#: merge-ort.c:1648 merge-recursive.c:1228 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Misslyckades slå ihop undermodulen %s (incheckningar följer inte " "sammanslagningsbasen)" -#: merge-ort.c:1612 merge-ort.c:1620 +#: merge-ort.c:1658 merge-ort.c:1666 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "Obs: Snabbspolar undermodulen %s till %s" -#: merge-ort.c:1642 +#: merge-ort.c:1688 #, c-format msgid "Failed to merge submodule %s" msgstr "Misslyckades slå ihop undermodulen %s" -#: merge-ort.c:1649 +#: merge-ort.c:1695 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4788,7 +4910,7 @@ msgstr "" "Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns:\n" "%s\n" -#: merge-ort.c:1653 merge-recursive.c:1281 +#: merge-ort.c:1699 merge-recursive.c:1284 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4805,7 +4927,7 @@ msgstr "" "\n" "vilket godtar lösningen.\n" -#: merge-ort.c:1666 +#: merge-ort.c:1712 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4815,21 +4937,21 @@ msgstr "" "finns:\n" "%s" -#: merge-ort.c:1887 merge-recursive.c:1372 +#: merge-ort.c:1937 merge-recursive.c:1375 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-ort.c:1892 merge-recursive.c:1377 +#: merge-ort.c:1942 merge-recursive.c:1380 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-ort.c:1899 merge-recursive.c:1410 +#: merge-ort.c:1949 merge-recursive.c:1413 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-ort.c:2038 merge-recursive.c:2132 +#: merge-ort.c:2088 merge-recursive.c:2135 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4838,7 +4960,7 @@ msgstr "" "KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för " "implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s." -#: merge-ort.c:2048 merge-recursive.c:2142 +#: merge-ort.c:2098 merge-recursive.c:2145 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4847,7 +4969,7 @@ msgstr "" "KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till " "%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s" -#: merge-ort.c:2106 +#: merge-ort.c:2156 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4858,7 +4980,7 @@ msgstr "" "den har namnbytts till flera andra kataloger, utan att någon destination " "fick en majoritet av filerna." -#: merge-ort.c:2260 merge-recursive.c:2478 +#: merge-ort.c:2310 merge-recursive.c:2481 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4867,7 +4989,7 @@ msgstr "" "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har " "bytt namn." -#: merge-ort.c:2400 merge-recursive.c:3261 +#: merge-ort.c:2450 merge-recursive.c:3264 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4876,7 +4998,7 @@ msgstr "" "Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; " "flyttar den till %s." -#: merge-ort.c:2407 merge-recursive.c:3268 +#: merge-ort.c:2457 merge-recursive.c:3271 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4885,7 +5007,7 @@ msgstr "" "Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte " "namn i %s; flyttar den till %s." -#: merge-ort.c:2420 merge-recursive.c:3264 +#: merge-ort.c:2470 merge-recursive.c:3267 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4894,7 +5016,7 @@ msgstr "" "KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i " "%s, föreslår att den bör flyttas till%s." -#: merge-ort.c:2428 merge-recursive.c:3271 +#: merge-ort.c:2478 merge-recursive.c:3274 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4903,13 +5025,13 @@ msgstr "" "KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som " "bytte namn i %s; flyttar den till %s." -#: merge-ort.c:2584 +#: merge-ort.c:2634 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" "KONFLIKT (namnbyte/namnbyte): %s namnbytt till %s i %s och till %s i %s." -#: merge-ort.c:2679 +#: merge-ort.c:2729 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4920,23 +5042,23 @@ msgstr "" "innehållskonflikter OCH krockar med en annan sökväg; detta kan leda till " "nästlade konfliktmarkörer." -#: merge-ort.c:2698 merge-ort.c:2722 +#: merge-ort.c:2748 merge-ort.c:2772 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" "KONFLIKT (namnbyte/radera): %s namnbytt till %s i %s, men borttagen i %s." -#: merge-ort.c:3212 merge-recursive.c:3022 +#: merge-ort.c:3261 merge-recursive.c:3025 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-ort.c:3215 merge-recursive.c:3025 +#: merge-ort.c:3264 merge-recursive.c:3028 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-ort.c:3644 +#: merge-ort.c:3693 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " @@ -4945,7 +5067,7 @@ msgstr "" "KONFLIKT (fil/katalog): katalogen är i vägen för %s från %s; flyttar den " "till %s istället." -#: merge-ort.c:3721 +#: merge-ort.c:3770 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed both " @@ -4954,7 +5076,7 @@ msgstr "" "KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte bägge " "så att de kan protokollföras någonstans." -#: merge-ort.c:3728 +#: merge-ort.c:3777 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed one " @@ -4963,24 +5085,24 @@ msgstr "" "KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte den ena " "så att de kan protokollföras någonstans." -#: merge-ort.c:3819 merge-recursive.c:3101 +#: merge-ort.c:3866 merge-recursive.c:3104 msgid "content" msgstr "innehåll" -#: merge-ort.c:3821 merge-recursive.c:3105 +#: merge-ort.c:3868 merge-recursive.c:3108 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-ort.c:3823 merge-recursive.c:3150 +#: merge-ort.c:3870 merge-recursive.c:3153 msgid "submodule" msgstr "undermodul" -#: merge-ort.c:3825 merge-recursive.c:3151 +#: merge-ort.c:3872 merge-recursive.c:3154 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-ort.c:3869 +#: merge-ort.c:3916 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -4989,7 +5111,7 @@ msgstr "" "KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s " "lämnad i trädet." -#: merge-ort.c:4165 +#: merge-ort.c:4212 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -5001,12 +5123,12 @@ msgstr "" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:4534 +#: merge-ort.c:4586 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "samling av sammanslagningsinfo misslyckades för träden %s, %s, %s" -#: merge-ort-wrappers.c:13 merge-recursive.c:3716 +#: merge-ort-wrappers.c:13 merge-recursive.c:3723 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -5016,7 +5138,7 @@ msgstr "" "sammanslagning:\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405 +#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405 msgid "Already up to date." msgstr "Redan à jour." @@ -5056,7 +5178,7 @@ msgstr ": kanske en K/F-konflikt?" msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:956 builtin/cat-file.c:41 +#: merge-recursive.c:956 builtin/cat-file.c:47 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" @@ -5081,44 +5203,44 @@ msgstr "misslyckades skapa symboliska länken \"%s\": %s" msgid "do not know what to do with %06o %s '%s'" msgstr "vet inte hur %06o %s \"%s\" ska hanteras" -#: merge-recursive.c:1233 merge-recursive.c:1246 +#: merge-recursive.c:1236 merge-recursive.c:1249 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Snabbspolar undermodulen %s till följande incheckning:" -#: merge-recursive.c:1236 merge-recursive.c:1249 +#: merge-recursive.c:1239 merge-recursive.c:1252 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Snabbspolar undermodulen %s" -#: merge-recursive.c:1273 +#: merge-recursive.c:1276 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar " "hittades inte)" -#: merge-recursive.c:1277 +#: merge-recursive.c:1280 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)" -#: merge-recursive.c:1278 +#: merge-recursive.c:1281 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n" -#: merge-recursive.c:1290 +#: merge-recursive.c:1293 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)" -#: merge-recursive.c:1434 +#: merge-recursive.c:1437 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället." -#: merge-recursive.c:1506 +#: merge-recursive.c:1509 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5127,7 +5249,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet." -#: merge-recursive.c:1511 +#: merge-recursive.c:1514 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5136,7 +5258,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av " "%s lämnad i trädet." -#: merge-recursive.c:1518 +#: merge-recursive.c:1521 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5145,7 +5267,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet vid %s." -#: merge-recursive.c:1523 +#: merge-recursive.c:1526 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5154,40 +5276,40 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av " "%s lämnad i trädet vid %s." -#: merge-recursive.c:1558 +#: merge-recursive.c:1561 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1558 +#: merge-recursive.c:1561 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178 +#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Vägrar förlora lortig fil vid \"%s\"" -#: merge-recursive.c:1619 +#: merge-recursive.c:1622 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen." -#: merge-recursive.c:1677 +#: merge-recursive.c:1680 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s" -#: merge-recursive.c:1708 +#: merge-recursive.c:1711 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s är en katalog i %s lägger till som %s istället" -#: merge-recursive.c:1713 +#: merge-recursive.c:1716 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället" -#: merge-recursive.c:1740 +#: merge-recursive.c:1743 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5196,17 +5318,17 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1745 +#: merge-recursive.c:1748 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1837 +#: merge-recursive.c:1840 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s" -#: merge-recursive.c:2100 +#: merge-recursive.c:2103 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5217,7 +5339,7 @@ msgstr "" "katalogen %s bytte namn till flera andra kataloger, utan att någon " "destination fick en majoritet av filerna." -#: merge-recursive.c:2234 +#: merge-recursive.c:2237 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5226,79 +5348,79 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog " "%s->%s i %s" -#: merge-recursive.c:3089 +#: merge-recursive.c:3092 msgid "modify" msgstr "ändra" -#: merge-recursive.c:3089 +#: merge-recursive.c:3092 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:3128 +#: merge-recursive.c:3131 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:3181 +#: merge-recursive.c:3184 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:3385 +#: merge-recursive.c:3388 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:3408 +#: merge-recursive.c:3411 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:3413 +#: merge-recursive.c:3416 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:3420 +#: merge-recursive.c:3423 #, 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:3429 +#: merge-recursive.c:3432 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:3438 +#: merge-recursive.c:3441 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3491 +#: merge-recursive.c:3494 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:3585 +#: merge-recursive.c:3588 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:3598 +#: merge-recursive.c:3601 #, 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:3648 +#: merge-recursive.c:3651 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:3816 +#: merge-recursive.c:3823 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906 +#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912 #: builtin/stash.c:489 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -5307,222 +5429,226 @@ msgstr "Kunde inte skriva indexet." msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022 -#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706 +#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023 +#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714 #: builtin/stash.c:269 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: midx.c:78 +#: midx.c:79 msgid "multi-pack-index OID fanout is of the wrong size" msgstr "multi-pack-indexets OID-utbredning har fel storlek" -#: midx.c:111 +#: midx.c:112 #, c-format msgid "multi-pack-index file %s is too small" msgstr "multi-pack-indexfilen %s är för liten" -#: midx.c:127 +#: midx.c:128 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x" -#: midx.c:132 +#: midx.c:133 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-indexversionen %d stöds inte" -#: midx.c:137 +#: midx.c:138 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "multi-pack-index-hashversionen %u stämmer inte med versionen %u" -#: midx.c:154 +#: midx.c:155 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index saknar krävd paketnamn-stycke" -#: midx.c:156 +#: midx.c:157 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index saknar krävt OID-utbredningsstycke" -#: midx.c:158 +#: midx.c:159 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke" -#: midx.c:160 +#: midx.c:161 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index saknar krävt objekt-offsetstycke" -#: midx.c:176 +#: midx.c:180 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\"" -#: midx.c:224 +#: midx.c:228 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "bad pack-int-id: %u (%u paket totalt)" -#: midx.c:274 +#: midx.c:278 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten" -#: midx.c:505 +#: midx.c:509 #, c-format msgid "failed to add packfile '%s'" msgstr "misslyckades läsa paketfilen \"%s\"" -#: midx.c:511 +#: midx.c:515 #, c-format msgid "failed to open pack-index '%s'" msgstr "misslyckades öppna paketindexet \"%s\"" -#: midx.c:579 +#: midx.c:583 #, c-format msgid "failed to locate object %d in packfile" msgstr "misslyckades hitta objekt %d i paketfilen" -#: midx.c:895 +#: midx.c:911 msgid "cannot store reverse index file" msgstr "kan inte spara reverse-index-fil" -#: midx.c:993 +#: midx.c:1009 #, c-format msgid "could not parse line: %s" msgstr "kunde inte tolka rad: %s" -#: midx.c:995 +#: midx.c:1011 #, c-format msgid "malformed line: %s" msgstr "felaktig rad: %s" -#: midx.c:1162 +#: midx.c:1181 msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "ignorerar befintlig multi-pack-index; felaktig kontrollsumma" -#: midx.c:1187 +#: midx.c:1206 msgid "could not load pack" msgstr "kunde inte läsa paket{" -#: midx.c:1193 +#: midx.c:1212 #, c-format msgid "could not open index for %s" msgstr "kunde inte öppna indexet för %s" -#: midx.c:1204 +#: midx.c:1223 msgid "Adding packfiles to multi-pack-index" msgstr "Lägger till paketfiler till multi-pack-index" -#: midx.c:1247 +#: midx.c:1266 #, c-format msgid "unknown preferred pack: '%s'" msgstr "okänt föredraget paket: %s" -#: midx.c:1292 +#: midx.c:1311 #, c-format msgid "cannot select preferred pack %s with no objects" msgstr "kan inte välja föredraget paket %s som inte har några objekt" -#: midx.c:1324 +#: midx.c:1343 #, c-format msgid "did not see pack-file %s to drop" msgstr "såg inte paketfilen %s som skulle kastas" -#: midx.c:1370 +#: midx.c:1389 #, c-format msgid "preferred pack '%s' is expired" msgstr "föredraget paket \"%s\" har löpt ut" -#: midx.c:1383 +#: midx.c:1402 msgid "no pack files to index." msgstr "inga paketfiler att indexera." -#: midx.c:1420 +#: midx.c:1409 +msgid "refusing to write multi-pack .bitmap without any objects" +msgstr "kunde inte skriva fler-paketsbitkarta utan några objekt" + +#: midx.c:1451 msgid "could not write multi-pack bitmap" msgstr "kunde inte skriva fler-paketsbitkarta" -#: midx.c:1430 +#: midx.c:1461 msgid "could not write multi-pack-index" msgstr "kunde inte skriva flerpakets-index" -#: midx.c:1489 builtin/clean.c:37 +#: midx.c:1520 builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "misslyckades ta bort %s" -#: midx.c:1522 +#: midx.c:1553 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "misslyckades städa multi-pack-index på %s" -#: midx.c:1585 +#: midx.c:1616 msgid "multi-pack-index file exists, but failed to parse" msgstr "multi-pack-indexfilen finns, men kunde inte tolkas" -#: midx.c:1593 +#: midx.c:1624 msgid "incorrect checksum" msgstr "felaktig kontrollsumma" -#: midx.c:1596 +#: midx.c:1627 msgid "Looking for referenced packfiles" msgstr "Ser efter refererade packfiler" -#: midx.c:1611 +#: midx.c:1642 #, 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:1616 +#: midx.c:1647 msgid "the midx contains no oid" msgstr "midx saknar oid" -#: midx.c:1625 +#: midx.c:1656 msgid "Verifying OID order in multi-pack-index" msgstr "Bekräftar OID-ordning i multi-pack-index" -#: midx.c:1634 +#: midx.c:1665 #, 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:1654 +#: midx.c:1685 msgid "Sorting objects by packfile" msgstr "Sorterar objekt efter packfil" -#: midx.c:1661 +#: midx.c:1692 msgid "Verifying object offsets" msgstr "Bekräftar offset för objekt" -#: midx.c:1677 +#: midx.c:1708 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "misslyckades läsa paketpost för oid[%d] = %s" -#: midx.c:1683 +#: midx.c:1714 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "misslyckades läsa paketindex för paketfil %s" -#: midx.c:1692 +#: midx.c:1723 #, 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:1719 +#: midx.c:1750 msgid "Counting referenced objects" msgstr "Räknar refererade objekt" -#: midx.c:1729 +#: midx.c:1760 msgid "Finding and deleting unreferenced packfiles" msgstr "Ser efter och tar bort orefererade packfiler" -#: midx.c:1921 +#: midx.c:1952 msgid "could not start pack-objects" msgstr "kunde inte starta pack-objects" -#: midx.c:1941 +#: midx.c:1972 msgid "could not finish pack-objects" msgstr "kunde inte avsluta pack-objects" @@ -5541,7 +5667,7 @@ msgstr "misslyckades skapa lazy_name-tråd: %s" msgid "unable to join lazy_name thread: %s" msgstr "misslyckades utföra join på lazy_name-tråd: %s" -#: notes-merge.c:277 +#: notes-merge.c:276 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -5553,7 +5679,7 @@ msgstr "" "att checka in eller avbryta föregående sammanslagning innan du påbörjar en " "ny antecknings-sammanslagning." -#: notes-merge.c:284 +#: notes-merge.c:283 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)." @@ -5581,272 +5707,343 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Felaktigt värde på %s: \"%s\"" -#: object-file.c:456 +#: object-file.c:457 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates" -#: object-file.c:514 +#: object-file.c:515 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "kunde inte normalisera supplerande objektsökväg: %s" -#: object-file.c:588 +#: object-file.c:589 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: ignorerar supplerande objektlager, för djup nästling" -#: object-file.c:595 +#: object-file.c:596 #, c-format msgid "unable to normalize object directory: %s" msgstr "kan inte normalisera objektkatalogen: %s" -#: object-file.c:638 +#: object-file.c:639 msgid "unable to fdopen alternates lockfile" msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil" -#: object-file.c:656 +#: object-file.c:657 msgid "unable to read alternates file" msgstr "kan inte läsa \"alternates\"-filen" -#: object-file.c:663 +#: object-file.c:664 msgid "unable to move new alternates file into place" msgstr "kan inte flytta ny \"alternates\"-fil på plats" -#: object-file.c:741 +#: object-file.c:742 #, c-format msgid "path '%s' does not exist" msgstr "sökvägen \"%s\" finns inte" -#: object-file.c:762 +#: object-file.c:763 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu." -#: object-file.c:768 +#: object-file.c:769 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: object-file.c:774 +#: object-file.c:775 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: object-file.c:782 +#: object-file.c:783 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: object-file.c:813 +#: object-file.c:814 #, c-format msgid "could not find object directory matching %s" msgstr "kunde inte hitta objektkatalog för %s" -#: object-file.c:863 +#: object-file.c:864 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "felaktig rad vid tolkning av supplerande referenser: %s" -#: object-file.c:1013 +#: object-file.c:1014 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>" -#: object-file.c:1048 +#: object-file.c:1049 #, c-format msgid "mmap failed%s" msgstr "mmap misslyckades%s" -#: object-file.c:1214 +#: object-file.c:1230 #, c-format msgid "object file %s is empty" msgstr "objektfilen %s är tom" -#: object-file.c:1333 object-file.c:2542 +#: object-file.c:1349 object-file.c:2588 #, c-format msgid "corrupt loose object '%s'" msgstr "trasigt löst objekt \"%s\"" -#: object-file.c:1335 object-file.c:2546 +#: object-file.c:1351 object-file.c:2592 #, c-format msgid "garbage at end of loose object '%s'" msgstr "skräp i slutet av löst objekt \"%s\"" -#: object-file.c:1457 +#: object-file.c:1473 #, c-format msgid "unable to parse %s header" msgstr "kan inte tolka %s-huvud" -#: object-file.c:1459 +#: object-file.c:1475 msgid "invalid object type" msgstr "felaktig objekttyp" -#: object-file.c:1470 +#: object-file.c:1486 #, c-format msgid "unable to unpack %s header" msgstr "kan inte packa upp %s-huvudet" -#: object-file.c:1474 +#: object-file.c:1490 #, c-format msgid "header for %s too long, exceeds %d bytes" msgstr "huvudet för %s är för långt, mer än %d byte" -#: object-file.c:1704 +#: object-file.c:1720 #, c-format msgid "failed to read object %s" msgstr "misslyckades läsa objektet %s" -#: object-file.c:1708 +#: object-file.c:1724 #, c-format msgid "replacement %s not found for %s" msgstr "ersättningen %s hittades inte för %s" -#: object-file.c:1712 +#: object-file.c:1728 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "löst objekt %s (lagrat i %s) är trasigt" -#: object-file.c:1716 +#: object-file.c:1732 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "packat objekt %s (lagrat i %s) är trasigt" -#: object-file.c:1821 +#: object-file.c:1855 #, c-format msgid "unable to write file %s" msgstr "kunde inte skriva filen %s" -#: object-file.c:1828 +#: object-file.c:1862 #, c-format msgid "unable to set permission to '%s'" msgstr "kan inte sätta behörigheten till \"%s\"" -#: object-file.c:1835 +#: object-file.c:1869 msgid "file write error" msgstr "fel vid skrivning av fil" -#: object-file.c:1858 +#: object-file.c:1904 msgid "error when closing loose object file" msgstr "fel vid stängning av fil för löst objekt" -#: object-file.c:1925 +#: object-file.c:1971 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s" -#: object-file.c:1927 +#: object-file.c:1973 msgid "unable to create temporary file" msgstr "kan inte skapa temporär fil" -#: object-file.c:1951 +#: object-file.c:1997 msgid "unable to write loose object file" msgstr "kunde inte skriva fil för löst objekt" -#: object-file.c:1957 +#: object-file.c:2003 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)" -#: object-file.c:1961 +#: object-file.c:2007 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "\"deflateend\" på objektet %s misslyckades (%d)" -#: object-file.c:1965 +#: object-file.c:2011 #, c-format msgid "confused by unstable object source data for %s" msgstr "förvirrad av instabil objektkälldata för %s" -#: object-file.c:1976 builtin/pack-objects.c:1243 +#: object-file.c:2022 builtin/pack-objects.c:1251 #, c-format msgid "failed utime() on %s" msgstr "\"utime()\" misslyckades på %s" -#: object-file.c:2054 +#: object-file.c:2100 #, c-format msgid "cannot read object for %s" msgstr "kan inte läsa objekt för %s" -#: object-file.c:2105 +#: object-file.c:2151 msgid "corrupt commit" msgstr "trasik incheckning" -#: object-file.c:2113 +#: object-file.c:2159 msgid "corrupt tag" msgstr "trasig tagg" -#: object-file.c:2213 +#: object-file.c:2259 #, c-format msgid "read error while indexing %s" msgstr "läsfel vid indexering av %s" -#: object-file.c:2216 +#: object-file.c:2262 #, c-format msgid "short read while indexing %s" msgstr "för lite lästes vid indexering av %s" -#: object-file.c:2289 object-file.c:2299 +#: object-file.c:2335 object-file.c:2345 #, c-format msgid "%s: failed to insert into database" msgstr "%s: misslyckades lägga in i databasen" -#: object-file.c:2305 +#: object-file.c:2351 #, c-format msgid "%s: unsupported file type" msgstr "%s: filtypen stöds ej" -#: object-file.c:2329 builtin/fetch.c:1453 +#: object-file.c:2375 builtin/fetch.c:1494 #, c-format msgid "%s is not a valid object" msgstr "%s är inte ett giltigt objekt" -#: object-file.c:2331 +#: object-file.c:2377 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt \"%s\"-objekt" -#: object-file.c:2358 +#: object-file.c:2404 #, c-format msgid "unable to open %s" msgstr "kan inte öppna %s" -#: object-file.c:2553 +#: object-file.c:2599 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "hash stämmer inte för %s (förväntade %s)" -#: object-file.c:2576 +#: object-file.c:2622 #, c-format msgid "unable to mmap %s" msgstr "kan inte utföra \"mmap\" för %s" -#: object-file.c:2582 +#: object-file.c:2628 #, c-format msgid "unable to unpack header of %s" msgstr "kan inte packa upp huvud för %s" -#: object-file.c:2587 +#: object-file.c:2633 #, c-format msgid "unable to parse header of %s" msgstr "kan inte tolka huvud för %s" -#: object-file.c:2598 +#: object-file.c:2644 #, c-format msgid "unable to unpack contents of %s" msgstr "kan inte tolka innehåll i %s" -#: object-name.c:480 +#. TRANSLATORS: This is a line of ambiguous object +#. output shown when we cannot look up or parse the +#. object in question. E.g. "deadbeef [bad object]". +#. +#: object-name.c:382 +#, c-format +msgid "%s [bad object]" +msgstr "%s [felaktig objekt]." + +#. TRANSLATORS: This is a line of ambiguous commit +#. object output. E.g.: +#. * +#. "deadbeef commit 2021-01-01 - Some Commit Message" +#. +#: object-name.c:407 +#, c-format +msgid "%s commit %s - %s" +msgstr "%s incheckning %s - %s" + +#. TRANSLATORS: This is a line of ambiguous +#. tag object output. E.g.: +#. * +#. "deadbeef tag 2022-01-01 - Some Tag Message" +#. * +#. The second argument is the YYYY-MM-DD found +#. in the tag. +#. * +#. The third argument is the "tag" string +#. from object.c. +#. +#: object-name.c:428 +#, c-format +msgid "%s tag %s - %s" +msgstr "%s tagg %s - %s" + +#. TRANSLATORS: This is a line of ambiguous +#. tag object output where we couldn't parse +#. the tag itself. E.g.: +#. * +#. "deadbeef [bad tag, could not parse it]" +#. +#: object-name.c:439 +#, c-format +msgid "%s [bad tag, could not parse it]" +msgstr "%s [felaktig tagg, kunde inte tolka]" + +#. TRANSLATORS: This is a line of ambiguous <type> +#. object output. E.g. "deadbeef tree". +#. +#: object-name.c:447 +#, c-format +msgid "%s tree" +msgstr "%s-träd" + +#. TRANSLATORS: This is a line of ambiguous <type> +#. object output. E.g. "deadbeef blob". +#. +#: object-name.c:453 +#, c-format +msgid "%s blob" +msgstr "%s blob" + +#: object-name.c:569 #, c-format msgid "short object ID %s is ambiguous" msgstr "kort objekt-ID %s är tvetydigt" -#: object-name.c:491 -msgid "The candidates are:" -msgstr "Kandidaterna är:" +#. TRANSLATORS: The argument is the list of ambiguous +#. objects composed in show_ambiguous_object(). See +#. its "TRANSLATORS" comments for details. +#. +#: object-name.c:591 +#, c-format +msgid "" +"The candidates are:\n" +"%s" +msgstr "" +"Kandidaterna är:\n" +"%s" -#: object-name.c:790 +#: object-name.c:888 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -5868,22 +6065,22 @@ msgstr "" "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n" "genom att köra \"git config advice.objectNameWarning false\"" -#: object-name.c:910 +#: object-name.c:1008 #, c-format msgid "log for '%.*s' only goes back to %s" msgstr "loggen för \"%.*s\" räcker bara tillbaka till %s" -#: object-name.c:918 +#: object-name.c:1016 #, c-format msgid "log for '%.*s' only has %d entries" msgstr "loggen för \"%.*s\" har bara %d poster" -#: object-name.c:1696 +#: object-name.c:1794 #, c-format msgid "path '%s' exists on disk, but not in '%.*s'" msgstr "Sökvägen \"%s\" finns på disken, men inte i \"%.*s\"" -#: object-name.c:1702 +#: object-name.c:1800 #, c-format msgid "" "path '%s' exists, but not '%s'\n" @@ -5892,12 +6089,12 @@ msgstr "" "sökvägen \"%s\" finns, men inte i \"%s\"\n" "tips: Menade du \"%.*s:%s\", även känd som \"%.*s:./%s\"?" -#: object-name.c:1711 +#: object-name.c:1809 #, c-format msgid "path '%s' does not exist in '%.*s'" msgstr "sökvägen \"%s\" finns inte i \"%.*s\"" -#: object-name.c:1739 +#: object-name.c:1837 #, c-format msgid "" "path '%s' is in the index, but not at stage %d\n" @@ -5906,7 +6103,7 @@ msgstr "" "sökvägen \"%s\" finns i indexet men inte i etapp %d\n" "tips: Menade du \":%d:%s\"?" -#: object-name.c:1755 +#: object-name.c:1853 #, c-format msgid "" "path '%s' is in the index, but not '%s'\n" @@ -5915,21 +6112,26 @@ msgstr "" "sökvägen \"%s\" finns i indexet, men inte i \"%s\"\n" "tips: Menade du \":%d:%s\", även känd som \":%d:./%s\"?" -#: object-name.c:1763 +#: object-name.c:1861 #, c-format msgid "path '%s' exists on disk, but not in the index" msgstr "sökvägen \"%s\" finns på disk, men inte i indexet" -#: object-name.c:1765 +#: object-name.c:1863 #, c-format msgid "path '%s' does not exist (neither on disk nor in the index)" msgstr "sökvägen \"%s\" finns inte (varken i disken eller i indexet)" -#: object-name.c:1778 +#: object-name.c:1876 msgid "relative path syntax can't be used outside working tree" msgstr "relativ sökväg kan inte användas utanför arbetskatalogen" -#: object-name.c:1916 +#: object-name.c:1901 +#, c-format +msgid "<object>:<path> required, only <object> '%s' given" +msgstr "<objekt>:<sökväg> krävs, endast <objekt> \"%s\" har angivits" + +#: object-name.c:2014 #, c-format msgid "invalid object name '%.*s'." msgstr "felaktigt objektnamn \"%.*s\"." @@ -5954,7 +6156,7 @@ msgstr "objektet %s har okänd typ-id %d" msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" -#: object.c:283 object.c:295 +#: object.c:283 object.c:294 #, c-format msgid "hash mismatch %s" msgstr "hashvärde stämmer inte överens %s" @@ -5963,21 +6165,21 @@ msgstr "hashvärde stämmer inte överens %s" msgid "multi-pack bitmap is missing required reverse index" msgstr "flerpaketsbitkarta saknar nödvändigt omvänt index" -#: pack-bitmap.c:429 +#: pack-bitmap.c:433 msgid "load_reverse_index: could not open pack" msgstr "load_reverse_index: kunde inte öppna paket" -#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424 +#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432 #, c-format msgid "unable to get size of %s" msgstr "kan inte hämta storlek på %s" -#: pack-bitmap.c:1935 +#: pack-bitmap.c:1937 #, c-format msgid "could not find %s in pack %s at offset %<PRIuMAX>" msgstr "kunde inte hitta %s i paketet %s på offset %<PRIuMAX>" -#: pack-bitmap.c:1971 builtin/rev-list.c:92 +#: pack-bitmap.c:1973 builtin/rev-list.c:91 #, c-format msgid "unable to get disk usage of %s" msgstr "kan inte hämta diskanvändning för %s" @@ -6021,7 +6223,7 @@ msgstr "kunde inte ta status: %s" msgid "failed to make %s readable" msgstr "kunde inte göra %s läsbar" -#: pack-write.c:520 +#: pack-write.c:521 #, c-format msgid "could not write '%s' promisor file" msgstr "kunde inte skriva kontraktsfilen \"%s\"" @@ -6360,20 +6562,20 @@ msgstr "object-info: förväntade \"flush\" efter argument" msgid "Removing duplicate objects" msgstr "Tar bort duplicerade objekt" -#: range-diff.c:67 +#: range-diff.c:68 msgid "could not start `log`" msgstr "kunde inte starta \"log\"" -#: range-diff.c:69 +#: range-diff.c:70 msgid "could not read `log` output" msgstr "kunde inte läsa utdata från \"log\"" -#: range-diff.c:97 sequencer.c:5602 +#: range-diff.c:98 sequencer.c:5575 #, c-format msgid "could not parse commit '%s'" msgstr "kunde inte tolka incheckningen \"%s\"" -#: range-diff.c:111 +#: range-diff.c:109 #, c-format msgid "" "could not parse first line of `log` output: did not start with 'commit ': " @@ -6382,65 +6584,65 @@ msgstr "" "kunde inte tolka första raden i \"log\"-updata: börjar inte med \"commit \": " "\"%s\"" -#: range-diff.c:137 +#: range-diff.c:132 #, c-format msgid "could not parse git header '%.*s'" msgstr "kunde inte tolka git-huvudet \"%.*s\"" -#: range-diff.c:304 +#: range-diff.c:300 msgid "failed to generate diff" msgstr "misslyckades skapa diff" -#: range-diff.c:562 range-diff.c:564 +#: range-diff.c:558 range-diff.c:560 #, c-format msgid "could not parse log for '%s'" msgstr "kunde inte tolka loggen för \"%s\"" -#: read-cache.c:723 +#: read-cache.c:737 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "lägger inte till filalias \"%s\" (\"%s\" finns redan i indexet)" -#: read-cache.c:739 +#: read-cache.c:753 msgid "cannot create an empty blob in the object database" msgstr "kan inte skapa tom blob i objektdatabasen" -#: read-cache.c:761 +#: read-cache.c:775 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" "%s: kan bara lägga till vanliga filer, symboliska länkar och git-kataloger" -#: read-cache.c:766 builtin/submodule--helper.c:3242 +#: read-cache.c:780 builtin/submodule--helper.c:3359 #, c-format msgid "'%s' does not have a commit checked out" msgstr "\"%s\" har inte någon utcheckad incheckning" -#: read-cache.c:818 +#: read-cache.c:832 #, c-format msgid "unable to index file '%s'" msgstr "kan inte indexera filen \"%s\"" -#: read-cache.c:837 +#: read-cache.c:851 #, c-format msgid "unable to add '%s' to index" msgstr "kan inte lägga till \"%s\" till indexet" -#: read-cache.c:848 +#: read-cache.c:862 #, c-format msgid "unable to stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: read-cache.c:1386 +#: read-cache.c:1404 #, 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:1601 +#: read-cache.c:1619 msgid "Refresh index" msgstr "Uppdatera indexet" -#: read-cache.c:1733 +#: read-cache.c:1751 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -6449,7 +6651,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1743 +#: read-cache.c:1761 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6458,143 +6660,147 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1799 +#: read-cache.c:1817 #, c-format msgid "bad signature 0x%08x" msgstr "felaktig signatur 0x%08x" -#: read-cache.c:1802 +#: read-cache.c:1820 #, c-format msgid "bad index version %d" msgstr "felaktig indexversion %d" -#: read-cache.c:1811 +#: read-cache.c:1829 msgid "bad index file sha1 signature" msgstr "felaktig sha1-signatur för indexfil" -#: read-cache.c:1845 +#: read-cache.c:1863 #, 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:1847 +#: read-cache.c:1865 #, c-format msgid "ignoring %.4s extension" msgstr "ignorerar filtillägget %.4s" -#: read-cache.c:1884 +#: read-cache.c:1902 #, c-format msgid "unknown index entry format 0x%08x" msgstr "okänt format 0x%08x på indexpost" -#: read-cache.c:1900 +#: read-cache.c:1918 #, 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:1957 +#: read-cache.c:1975 msgid "unordered stage entries in index" msgstr "osorterade köposter i index" -#: read-cache.c:1960 +#: read-cache.c:1978 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "flera köposter för den sammanslagna filen \"%s\"" -#: read-cache.c:1963 +#: read-cache.c:1981 #, c-format msgid "unordered stage entries for '%s'" msgstr "osorterade köposter för \"%s\"" -#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183 -#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013 -#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519 -#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293 -#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202 +#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096 +#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183 +#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016 +#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521 +#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293 +#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319 msgid "index file corrupt" msgstr "indexfilen trasig" -#: read-cache.c:2222 +#: read-cache.c:2240 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "kunde inte skapa tråd för load_cache_entries: %s" -#: read-cache.c:2235 +#: read-cache.c:2253 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "kunde inte ansluta till tråden för load_cache_entries: %s" -#: read-cache.c:2268 +#: read-cache.c:2286 #, c-format msgid "%s: index file open failed" msgstr "%s: öppning av indexfilen misslyckades" -#: read-cache.c:2272 +#: read-cache.c:2290 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: kan inte ta startus på det öppna indexet" -#: read-cache.c:2276 +#: read-cache.c:2294 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: indexfilen mindre än förväntat" -#: read-cache.c:2280 +#: read-cache.c:2298 #, c-format msgid "%s: unable to map index file%s" msgstr "%s: kan inte koppla indexfilen%s" -#: read-cache.c:2323 +#: read-cache.c:2341 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "kunde inte skapa load_index_extensions-tråden: %s" -#: read-cache.c:2350 +#: read-cache.c:2368 #, 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:2396 +#: read-cache.c:2414 #, c-format msgid "could not freshen shared index '%s'" msgstr "kunde inte uppdatera delat index \"%s\"" -#: read-cache.c:2455 +#: read-cache.c:2473 #, 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:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150 +#: read-cache.c:3032 +msgid "cannot write split index for a sparse index" +msgstr "kan inte skriva delat index för ett glest index" + +#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: read-cache.c:3129 +#: read-cache.c:3157 msgid "failed to convert to a sparse-index" msgstr "misslyckades omvandla till glest index" -#: read-cache.c:3200 +#: read-cache.c:3228 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" -#: read-cache.c:3213 +#: read-cache.c:3241 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte öppna git-katalog: %s" -#: read-cache.c:3225 +#: read-cache.c:3253 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort länken: %s" -#: read-cache.c:3254 +#: read-cache.c:3282 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "kan inte rätta behörighetsbitar på \"%s\"" -#: read-cache.c:3411 +#: read-cache.c:3439 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: kan inte återgå till kö 0" @@ -6718,9 +6924,9 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883 -#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791 -#: builtin/rebase.c:190 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879 +#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791 +#: builtin/rebase.c:191 #, c-format msgid "could not write '%s'" msgstr "kunde inte skriva \"%s\"" @@ -6764,7 +6970,7 @@ msgstr "" msgid "%s: 'preserve' superseded by 'merges'" msgstr "%s: \"preserve\" har ersatts av \"merges\"" -#: ref-filter.c:42 wt-status.c:2048 +#: ref-filter.c:42 wt-status.c:2057 msgid "gone" msgstr "försvunnen" @@ -6931,81 +7137,91 @@ msgstr "kommandot förkastar atom %%(%.*s)" msgid "--format=%.*s cannot be used with --python, --shell, --tcl" msgstr "--format=%.*s kan inte användas med --python, --shell, --tcl" -#: ref-filter.c:1706 +#: ref-filter.c:1707 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: ref-filter.c:1709 +#: ref-filter.c:1710 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)" -#: ref-filter.c:1712 +#: ref-filter.c:1713 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" -#: ref-filter.c:1716 +#: ref-filter.c:1717 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD frånkopplat vid %s)" -#: ref-filter.c:1719 +#: ref-filter.c:1720 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD frånkopplat från %s)" -#: ref-filter.c:1722 +#: ref-filter.c:1723 msgid "(no branch)" msgstr "(ingen gren)" -#: ref-filter.c:1754 ref-filter.c:1972 +#: ref-filter.c:1755 ref-filter.c:1973 #, c-format msgid "missing object %s for %s" msgstr "objektet %s saknas för %s" -#: ref-filter.c:1764 +#: ref-filter.c:1765 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer misslyckades på %s för %s" -#: ref-filter.c:2155 +#: ref-filter.c:2156 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:2245 +#: ref-filter.c:2246 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:2250 refs.c:676 +#: ref-filter.c:2251 refs.c:672 #, c-format msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" -#: ref-filter.c:2629 +#: ref-filter.c:2630 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:2740 +#: ref-filter.c:2741 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: ref-filter.c:2745 +#: ref-filter.c:2746 #, c-format msgid "option `%s' must point to a commit" msgstr "flaggan \"%s\" måste peka på en incheckning" -#: refs.c:261 +#: reflog.c:407 +#, c-format +msgid "not a reflog: %s" +msgstr "inte en referenslogg: %s" + +#: reflog.c:410 +#, c-format +msgid "no reflog for '%s'" +msgstr "ingen referenslogg för \"%s\"" + +#: refs.c:262 #, c-format msgid "%s does not point to a valid object!" msgstr "\"%s\" pekar inte på ett giltigt objekt!" -#: refs.c:563 +#: refs.c:561 #, c-format msgid "" "Using '%s' as the name for the initial branch. This default branch name\n" @@ -7030,81 +7246,81 @@ msgstr "" "\n" "\tgit branch -m <namn>\n" -#: refs.c:585 +#: refs.c:583 #, c-format msgid "could not retrieve `%s`" msgstr "kunde inte hämta \"%s\"" -#: refs.c:595 +#: refs.c:593 #, c-format msgid "invalid branch name: %s = %s" msgstr "felaktigt namn på gren: %s = %s" -#: refs.c:674 +#: refs.c:670 #, c-format msgid "ignoring dangling symref %s" msgstr "ignorerar dinglande symbolisk referens %s" -#: refs.c:925 +#: refs.c:919 #, c-format msgid "log for ref %s has gap after %s" msgstr "loggen för referensen %s har lucka efter %s" -#: refs.c:932 +#: refs.c:926 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "loggen för referensen %s slutade oväntat på %s" -#: refs.c:997 +#: refs.c:991 #, c-format msgid "log for %s is empty" msgstr "loggen för %s är tom" -#: refs.c:1090 +#: refs.c:1086 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "vägrar uppdatera referens med trasigt namn \"%s\"" -#: refs.c:1168 +#: refs.c:1164 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref misslyckades för referensen \"%s\": %s" -#: refs.c:2067 +#: refs.c:2059 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "flera uppdateringar för referensen \"%s\" tillåts inte" -#: refs.c:2150 +#: refs.c:2145 msgid "ref updates forbidden inside quarantine environment" msgstr "referensuppdateringar förbjudna i karantänmiljö" -#: refs.c:2161 +#: refs.c:2156 msgid "ref updates aborted by hook" msgstr "referensuppdateringar avbrutna av krok" -#: refs.c:2269 refs.c:2299 +#: refs.c:2264 refs.c:2294 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "\"%s\" finns; kan inte skapa \"%s\"" -#: refs.c:2275 refs.c:2310 +#: refs.c:2270 refs.c:2305 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt" -#: refs/files-backend.c:1267 +#: refs/files-backend.c:1295 #, c-format msgid "could not remove reference %s" msgstr "kunde inte ta bort referensen %s" -#: refs/files-backend.c:1281 refs/packed-backend.c:1549 -#: refs/packed-backend.c:1559 +#: refs/files-backend.c:1310 refs/packed-backend.c:1565 +#: refs/packed-backend.c:1575 #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" -#: refs/files-backend.c:1284 refs/packed-backend.c:1562 +#: refs/files-backend.c:1313 refs/packed-backend.c:1578 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" @@ -7127,37 +7343,37 @@ msgstr "mer än en receivepack angavs, använder den första" msgid "more than one uploadpack given, using the first" msgstr "mer än en uploadpack angavs, använder den första" -#: remote.c:699 +#: remote.c:698 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Kan inte hämta både %s och %s till %s" -#: remote.c:703 +#: remote.c:702 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spårar vanligtvis %s, inte %s" -#: remote.c:707 +#: remote.c:706 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#: remote.c:775 +#: remote.c:774 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\"" -#: remote.c:785 +#: remote.c:784 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\"" -#: remote.c:1192 +#: remote.c:1191 #, c-format msgid "src refspec %s does not match any" msgstr "käll-referensspecifikationen %s motsvarar ingen" -#: remote.c:1197 +#: remote.c:1196 #, c-format msgid "src refspec %s matches more than one" msgstr "käll-referensspecifikationen %s motsvarar mer än en" @@ -7166,7 +7382,7 @@ msgstr "käll-referensspecifikationen %s motsvarar mer än en" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1212 +#: remote.c:1211 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -7189,7 +7405,7 @@ msgstr "" "\n" "Inget av dem fungerade, så vi gav upp. Ange fullständig referens." -#: remote.c:1232 +#: remote.c:1231 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -7200,7 +7416,7 @@ msgstr "" "Var det meningen att skapa en ny gren genom att sända\n" "till \"%s:refs/heads/%s\"?" -#: remote.c:1237 +#: remote.c:1236 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -7211,7 +7427,7 @@ msgstr "" "Var det meningen att skapa en ny tagg genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1242 +#: remote.c:1241 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -7222,7 +7438,7 @@ msgstr "" "Var det meningen att tagga ett nytt träd genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1247 +#: remote.c:1246 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -7233,114 +7449,114 @@ msgstr "" "Var det meningen att tagga en ny blob genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1283 +#: remote.c:1282 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s kan inte slås upp till en gren" -#: remote.c:1294 +#: remote.c:1293 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte" -#: remote.c:1306 +#: remote.c:1305 #, c-format msgid "dst refspec %s matches more than one" msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en" -#: remote.c:1313 +#: remote.c:1312 #, c-format msgid "dst ref %s receives from more than one src" msgstr "fjärr-referensen \"%s\" hämtar från mer än en källa" -#: remote.c:1834 remote.c:1941 +#: remote.c:1833 remote.c:1940 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: remote.c:1843 +#: remote.c:1842 #, c-format msgid "no such branch: '%s'" msgstr "okänd gren: \"%s\"" -#: remote.c:1846 +#: remote.c:1845 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppström angiven för grenen \"%s\"" -#: remote.c:1852 +#: remote.c:1851 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren" -#: remote.c:1867 +#: remote.c:1866 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren" -#: remote.c:1882 +#: remote.c:1881 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "grenen \"%s\" har ingen fjärr för \"push\"" -#: remote.c:1892 +#: remote.c:1891 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\"" -#: remote.c:1905 +#: remote.c:1904 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mål (push.default är \"ingenting\")" -#: remote.c:1927 +#: remote.c:1926 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mål" -#: remote.c:2060 +#: remote.c:2059 #, c-format msgid "couldn't find remote ref %s" msgstr "Kunde inte hitta fjärr-referensen %s" -#: remote.c:2073 +#: remote.c:2072 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignorerar märklig referens \"%s\" lokalt" -#: remote.c:2236 +#: remote.c:2235 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n" -#: remote.c:2240 +#: remote.c:2239 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:2243 +#: remote.c:2242 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:2247 +#: remote.c:2246 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n" -#: remote.c:2250 +#: remote.c:2249 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (använd \"%s\" för detaljer)\n" -#: remote.c:2254 +#: remote.c:2253 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n" msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n" -#: remote.c:2260 +#: remote.c:2259 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n" -#: remote.c:2263 +#: remote.c:2262 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -7350,11 +7566,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2271 +#: remote.c:2270 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n" -#: remote.c:2274 +#: remote.c:2273 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -7369,11 +7585,11 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2284 +#: remote.c:2283 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n" -#: remote.c:2476 +#: remote.c:2475 #, c-format msgid "cannot parse expected object name '%s'" msgstr "kan inte tolka förväntat objektnamn \"%s\"" @@ -7411,104 +7627,108 @@ msgstr "fel vid skrivning av \"%s\" (%s)" msgid "failed to flush '%s'" msgstr "misslyckades spola \"%s\"" -#: rerere.c:487 rerere.c:1023 +#: rerere.c:487 rerere.c:1024 #, c-format msgid "could not parse conflict hunks in '%s'" msgstr "kunde inte tolka konflikt-stycket i \"%s\"" -#: rerere.c:668 +#: rerere.c:669 #, c-format msgid "failed utime() on '%s'" msgstr "\"utime()\" misslyckades på \"%s\"" -#: rerere.c:678 +#: rerere.c:679 #, c-format msgid "writing '%s' failed" msgstr "misslyckades skriva \"%s\"" -#: rerere.c:698 +#: rerere.c:699 #, c-format msgid "Staged '%s' using previous resolution." msgstr "Köade \"%s\" med sparad lösning." -#: rerere.c:737 +#: rerere.c:738 #, c-format msgid "Recorded resolution for '%s'." msgstr "Sparade lösning för \"%s\"." -#: rerere.c:772 +#: rerere.c:773 #, c-format msgid "Resolved '%s' using previous resolution." msgstr "Löste \"%s\" med tidigare lösning." -#: rerere.c:787 +#: rerere.c:788 #, c-format msgid "cannot unlink stray '%s'" msgstr "kan inte ta bort lös länk \"%s\"" -#: rerere.c:791 +#: rerere.c:792 #, c-format msgid "Recorded preimage for '%s'" msgstr "Sparade förhandsbild för \"%s\"" -#: rerere.c:865 submodule.c:2121 builtin/log.c:2017 -#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820 +#: rerere.c:866 submodule.c:2290 builtin/log.c:2042 +#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: rerere.c:1041 +#: rerere.c:1042 #, c-format msgid "failed to update conflicted state in '%s'" msgstr "misslyckades uppdatera tillstånd för sammanslagningsproblem i \"%s\"" -#: rerere.c:1052 rerere.c:1059 +#: rerere.c:1053 rerere.c:1060 #, c-format msgid "no remembered resolution for '%s'" msgstr "inget sparat sammanslagningsresultat för \"%s\"" -#: rerere.c:1061 +#: rerere.c:1062 #, c-format msgid "cannot unlink '%s'" msgstr "kan inte ta bort länken \"%s\"" -#: rerere.c:1071 +#: rerere.c:1072 #, c-format msgid "Updated preimage for '%s'" msgstr "Uppdaterade förhandsbild för \"%s\"" -#: rerere.c:1080 +#: rerere.c:1081 #, c-format msgid "Forgot resolution for '%s'\n" msgstr "Glömde lösning för \"%s\"\n" -#: rerere.c:1191 +#: rerere.c:1192 msgid "unable to open rr-cache directory" msgstr "kan inte uppdatera katalogen rr-cache" -#: reset.c:42 +#: reset.c:112 msgid "could not determine HEAD revision" msgstr "kunde inte bestämma HEAD-revision" -#: reset.c:70 reset.c:76 sequencer.c:3700 +#: reset.c:141 reset.c:147 sequencer.c:3696 #, c-format msgid "failed to find tree of %s" msgstr "kunde inte hitta trädet för %s." -#: revision.c:2347 +#: revision.c:2358 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<paketfil> stöds inte längre" -#: revision.c:2686 +#: revision.c:2712 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2689 +#: revision.c:2715 #, 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:2891 +#: revision.c:2901 +msgid "object filtering requires --objects" +msgstr "objektfiltrering kräver --objects" + +#: revision.c:2918 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" @@ -7577,7 +7797,7 @@ msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\"" msgid "could not delete '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297 +#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326 #: builtin/rm.c:409 #, c-format msgid "could not remove '%s'" @@ -7640,13 +7860,13 @@ msgstr "" "För att avbryta och återgå till där du var före \"git revert\",\n" "kör \"git revert --abort\"." -#: sequencer.c:448 sequencer.c:3292 +#: sequencer.c:448 sequencer.c:3288 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310 -#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639 +#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306 +#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" @@ -7656,14 +7876,14 @@ msgstr "kunde inte skriva till \"%s\"" msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312 -#: sequencer.c:3569 +#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308 +#: sequencer.c:3565 #, c-format msgid "failed to finalize '%s'" msgstr "misslyckades färdigställa \"%s\"" -#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551 -#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148 +#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547 +#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" @@ -7682,7 +7902,7 @@ msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta." msgid "%s: fast-forward" msgstr "%s: snabbspola" -#: sequencer.c:574 builtin/tag.c:614 +#: sequencer.c:574 builtin/tag.c:615 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" @@ -7713,8 +7933,8 @@ msgstr "ingen nyckel i \"%.*s\"" msgid "unable to dequote value of '%s'" msgstr "kan inte ta bort citering av värdet \"%s\"" -#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756 -#: builtin/am.c:848 builtin/rebase.c:694 +#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757 +#: builtin/am.c:849 builtin/rebase.c:699 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" @@ -7833,351 +8053,346 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1288 +#: sequencer.c:1287 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: sequencer.c:1290 +#: sequencer.c:1289 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: sequencer.c:1339 +#: sequencer.c:1336 msgid "unable to resolve HEAD after creating commit" msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning" -#: sequencer.c:1342 +#: sequencer.c:1338 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: sequencer.c:1346 +#: sequencer.c:1342 msgid " (root-commit)" msgstr " (rotincheckning)" -#: sequencer.c:1367 +#: sequencer.c:1363 msgid "could not parse HEAD" msgstr "kunde inte tolka HEAD" -#: sequencer.c:1369 +#: sequencer.c:1365 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s är inte en incheckning!" -#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708 +#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: sequencer.c:1429 sequencer.c:2314 +#: sequencer.c:1425 sequencer.c:2310 msgid "unable to parse commit author" msgstr "kunde inte tolka incheckningens författare" -#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710 +#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: sequencer.c:1473 sequencer.c:1593 +#: sequencer.c:1469 sequencer.c:1589 #, c-format msgid "unable to read commit message from '%s'" msgstr "kunde inte läsa incheckningsmeddelande från \"%s\"" -#: sequencer.c:1504 sequencer.c:1536 +#: sequencer.c:1500 sequencer.c:1532 #, c-format msgid "invalid author identity '%s'" msgstr "ogiltig författar-identitet \"%s\"" -#: sequencer.c:1510 +#: sequencer.c:1506 msgid "corrupt author: missing date information" msgstr "trasig författare: saknar datuminformation" -#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915 -#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921 +#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199 +#: sequencer.c:1572 sequencer.c:4496 t/helper/test-fast-rebase.c:199 #: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:1625 +#: sequencer.c:1621 #, c-format msgid "could not parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: sequencer.c:1630 +#: sequencer.c:1626 #, c-format msgid "could not parse parent commit %s" msgstr "kunde inte tolka föräldraincheckningen %s" -#: sequencer.c:1713 sequencer.c:1994 +#: sequencer.c:1709 sequencer.c:1990 #, c-format msgid "unknown command: %d" msgstr "okänt kommando: %d" -#: sequencer.c:1755 +#: sequencer.c:1751 msgid "This is the 1st commit message:" msgstr "Det här är 1:a incheckningsmeddelandet:" -#: sequencer.c:1756 +#: sequencer.c:1752 #, c-format msgid "This is the commit message #%d:" msgstr "Det här är incheckningsmeddelande %d:" -#: sequencer.c:1757 +#: sequencer.c:1753 msgid "The 1st commit message will be skipped:" msgstr "1:a incheckningsmeddelandet kommer hoppas över:" -#: sequencer.c:1758 +#: sequencer.c:1754 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Incheckningsmeddelande %d kommer hoppas över:" -#: sequencer.c:1759 +#: sequencer.c:1755 #, c-format msgid "This is a combination of %d commits." msgstr "Det här är en kombination av %d incheckningar." -#: sequencer.c:1906 sequencer.c:1963 +#: sequencer.c:1902 sequencer.c:1959 #, c-format msgid "cannot write '%s'" msgstr "kan inte skriva \"%s\"" -#: sequencer.c:1953 +#: sequencer.c:1949 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:1955 sequencer.c:3596 +#: sequencer.c:1951 sequencer.c:3592 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:1957 +#: sequencer.c:1953 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:1981 +#: sequencer.c:1977 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:2091 +#: sequencer.c:2087 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:2098 +#: sequencer.c:2094 msgid "cannot fixup root commit" msgstr "kan inte göra \"fixup\" på rotincheckning" -#: sequencer.c:2117 +#: sequencer.c:2113 #, 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:2125 sequencer.c:2133 +#: sequencer.c:2121 sequencer.c:2129 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:2139 +#: sequencer.c:2135 #, 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:2158 +#: sequencer.c:2154 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:2224 +#: sequencer.c:2220 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:2284 +#: sequencer.c:2280 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:2285 +#: sequencer.c:2281 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:2306 +#: sequencer.c:2302 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "utelämnar %s %s -- patchinnehållet finns redan uppströms\n" -#: sequencer.c:2364 +#: sequencer.c:2360 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:2372 +#: sequencer.c:2368 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:2452 +#: sequencer.c:2448 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s tar inte argument: \"%s\"" -#: sequencer.c:2461 +#: sequencer.c:2457 #, c-format msgid "missing arguments for %s" msgstr "argument saknas för %s" -#: sequencer.c:2504 +#: sequencer.c:2500 #, c-format msgid "could not parse '%s'" msgstr "kunde inte tolka \"%s\"" -#: sequencer.c:2565 +#: sequencer.c:2561 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:2576 +#: sequencer.c:2572 #, c-format msgid "cannot '%s' without a previous commit" msgstr "kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:2624 builtin/rebase.c:184 +#: sequencer.c:2620 builtin/rebase.c:185 #, c-format msgid "could not read '%s'." msgstr "kunde inte läsa \"%s\"." -#: sequencer.c:2662 +#: sequencer.c:2658 msgid "cancelling a cherry picking in progress" msgstr "avbryter pågående \"cherry-pick\"" -#: sequencer.c:2671 +#: sequencer.c:2667 msgid "cancelling a revert in progress" msgstr "avbryter pågående \"revert\"" -#: sequencer.c:2711 +#: sequencer.c:2707 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:2713 +#: sequencer.c:2709 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: \"%s\"" -#: sequencer.c:2718 +#: sequencer.c:2714 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:2729 +#: sequencer.c:2725 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:2731 +#: sequencer.c:2727 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:2809 -#, c-format -msgid "invalid value for %s: %s" -msgstr "felaktigt värde för %s: %s" - -#: sequencer.c:2918 +#: sequencer.c:2914 msgid "unusable squash-onto" msgstr "oanvändbar squash-onto" -#: sequencer.c:2938 +#: sequencer.c:2934 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: \"%s\"" -#: sequencer.c:3033 sequencer.c:4902 +#: sequencer.c:3029 sequencer.c:4875 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:3050 +#: sequencer.c:3046 msgid "revert is already in progress" msgstr "en \"revert\" pågår redan" -#: sequencer.c:3052 +#: sequencer.c:3048 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "testa \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:3055 +#: sequencer.c:3051 msgid "cherry-pick is already in progress" msgstr "en \"cherry-pick\" pågår redan" -#: sequencer.c:3057 +#: sequencer.c:3053 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:3071 +#: sequencer.c:3067 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:3086 +#: sequencer.c:3082 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:3146 sequencer.c:4612 +#: sequencer.c:3142 sequencer.c:4585 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:3148 sequencer.c:3159 +#: sequencer.c:3144 sequencer.c:3155 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:3150 sequencer.c:3194 +#: sequencer.c:3146 sequencer.c:3190 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:3180 builtin/fetch.c:1004 builtin/fetch.c:1416 -#: builtin/grep.c:772 +#: sequencer.c:3176 builtin/fetch.c:1030 builtin/fetch.c:1457 +#: builtin/grep.c:774 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:3182 +#: sequencer.c:3178 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:3183 +#: sequencer.c:3179 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:3189 +#: sequencer.c:3185 #, 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:3200 +#: sequencer.c:3196 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:3241 +#: sequencer.c:3237 msgid "no revert in progress" msgstr "ingen \"revers\" pågår" -#: sequencer.c:3250 +#: sequencer.c:3246 msgid "no cherry-pick in progress" msgstr "ingen \"cherry-pick\" pågår" -#: sequencer.c:3260 +#: sequencer.c:3256 msgid "failed to skip the commit" msgstr "kunde inte hoppa över incheckningen" -#: sequencer.c:3267 +#: sequencer.c:3263 msgid "there is nothing to skip" msgstr "ingenting att hoppa över" -#: sequencer.c:3270 +#: sequencer.c:3266 #, c-format msgid "" "have you committed already?\n" @@ -8186,16 +8401,16 @@ msgstr "" "har du redan checkat in?\n" "testa \"git %s --continue\"" -#: sequencer.c:3432 sequencer.c:4503 +#: sequencer.c:3428 sequencer.c:4476 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:3449 +#: sequencer.c:3445 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "kan inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3457 +#: sequencer.c:3453 #, c-format msgid "" "You can amend the commit now, with\n" @@ -8214,27 +8429,27 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:3467 +#: sequencer.c:3463 #, c-format msgid "Could not apply %s... %.*s" msgstr "Kunde inte tillämpa %s... %.*s" -#: sequencer.c:3474 +#: sequencer.c:3470 #, c-format msgid "Could not merge %.*s" msgstr "Kunde inte slå ihop %.*s" -#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633 +#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3503 +#: sequencer.c:3499 #, c-format msgid "Executing: %s\n" msgstr "Kör: %s\n" -#: sequencer.c:3514 +#: sequencer.c:3510 #, c-format msgid "" "execution failed: %s\n" @@ -8249,11 +8464,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3520 +#: sequencer.c:3516 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:3526 +#: sequencer.c:3522 #, c-format msgid "" "execution succeeded: %s\n" @@ -8270,90 +8485,90 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3586 +#: sequencer.c:3582 #, c-format msgid "illegal label name: '%.*s'" msgstr "ogiltigt etikettnamn: \"%.*s\"" -#: sequencer.c:3659 +#: sequencer.c:3655 msgid "writing fake root commit" msgstr "skriver fejkad rotincheckning" -#: sequencer.c:3664 +#: sequencer.c:3660 msgid "writing squash-onto" msgstr "skriver squash-onto" -#: sequencer.c:3743 +#: sequencer.c:3739 #, c-format msgid "could not resolve '%s'" msgstr "kunde inte upplösa \"%s\"" -#: sequencer.c:3775 +#: sequencer.c:3771 msgid "cannot merge without a current revision" msgstr "kan inte slå ihop utan en aktuell incheckning" -#: sequencer.c:3797 +#: sequencer.c:3793 #, c-format msgid "unable to parse '%.*s'" msgstr "kan inte tolka \"%.*s\"" -#: sequencer.c:3806 +#: sequencer.c:3802 #, c-format msgid "nothing to merge: '%.*s'" msgstr "inget att slå samman: \"%.*s\"" -#: sequencer.c:3818 +#: sequencer.c:3814 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:3873 +#: sequencer.c:3869 #, c-format msgid "could not get commit message of '%s'" msgstr "kunde inte läsa incheckningsmeddelande för \"%s\"" -#: sequencer.c:4019 +#: sequencer.c:4013 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "kunde inte ens försöka slå ihop \"%.*s\"" -#: sequencer.c:4035 +#: sequencer.c:4029 msgid "merge: Unable to write new index file" msgstr "sammanslagning: Kunde inte skriva ny indexfil" -#: sequencer.c:4116 +#: sequencer.c:4110 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: sequencer.c:4119 +#: sequencer.c:4113 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Oväntat svar från stash: \"%s\"" -#: sequencer.c:4125 +#: sequencer.c:4119 #, c-format msgid "Could not create directory for '%s'" msgstr "Kunde inte skapa katalog för \"%s\"" -#: sequencer.c:4128 +#: sequencer.c:4122 #, c-format msgid "Created autostash: %s\n" msgstr "Skapade autostash: %s\n" -#: sequencer.c:4132 +#: sequencer.c:4124 msgid "could not reset --hard" msgstr "kunde inte utföra \"reset --hard\"" -#: sequencer.c:4157 +#: sequencer.c:4148 #, c-format msgid "Applied autostash.\n" msgstr "Tillämpade autostash.\n" -#: sequencer.c:4169 +#: sequencer.c:4160 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:4172 +#: sequencer.c:4163 #, c-format msgid "" "%s\n" @@ -8364,29 +8579,29 @@ msgstr "" "Dina ändringar är säkra i stashen.\n" "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" -#: sequencer.c:4177 +#: sequencer.c:4168 msgid "Applying autostash resulted in conflicts." msgstr "Tillämpning av autostash gav konflikter." -#: sequencer.c:4178 +#: sequencer.c:4169 msgid "Autostash exists; creating a new stash entry." msgstr "Autostash finns; skapar ny stash-post." -#: sequencer.c:4252 +#: sequencer.c:4225 msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" -#: sequencer.c:4267 +#: sequencer.c:4240 #, c-format msgid "Stopped at HEAD\n" msgstr "Stoppade på HEAD\n" -#: sequencer.c:4269 +#: sequencer.c:4242 #, c-format msgid "Stopped at %s\n" msgstr "Stoppade på %s\n" -#: sequencer.c:4301 +#: sequencer.c:4274 #, c-format msgid "" "Could not execute the todo command\n" @@ -8407,58 +8622,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4347 +#: sequencer.c:4320 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Ombaserar (%d/%d)%s" -#: sequencer.c:4393 +#: sequencer.c:4366 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:4463 +#: sequencer.c:4436 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:4511 +#: sequencer.c:4484 msgid "could not read orig-head" msgstr "kunde inte läsa orig-head" -#: sequencer.c:4516 +#: sequencer.c:4489 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:4530 +#: sequencer.c:4503 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:4590 +#: sequencer.c:4563 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Lyckades ombasera och uppdatera %s.\n" -#: sequencer.c:4642 +#: sequencer.c:4615 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:4651 +#: sequencer.c:4624 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:4653 +#: sequencer.c:4626 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:4655 +#: sequencer.c:4628 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:4658 +#: sequencer.c:4631 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -8468,68 +8683,68 @@ 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:4694 sequencer.c:4733 +#: sequencer.c:4667 sequencer.c:4706 #, c-format msgid "could not write file: '%s'" msgstr "kunde inte skriva fil: \"%s\"" -#: sequencer.c:4749 +#: sequencer.c:4722 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:4759 +#: sequencer.c:4732 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:4879 +#: sequencer.c:4852 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:4883 +#: sequencer.c:4856 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:4918 +#: sequencer.c:4891 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" -#: sequencer.c:5189 sequencer.c:5418 +#: sequencer.c:5162 sequencer.c:5391 #, c-format msgid "skipped previously applied commit %s" msgstr "hoppade över tidigare applicerad incheckning %s" -#: sequencer.c:5259 sequencer.c:5434 +#: sequencer.c:5232 sequencer.c:5407 msgid "use --reapply-cherry-picks to include skipped commits" msgstr "använd --reapply-cherry-picks för att ta med överhoppade incheckningar" -#: sequencer.c:5405 +#: sequencer.c:5378 msgid "make_script: unhandled options" msgstr "make_script: flaggor som inte stöds" -#: sequencer.c:5408 +#: sequencer.c:5381 msgid "make_script: error preparing revisions" msgstr "make_script: fel när revisioner skulle förberedas" -#: sequencer.c:5666 sequencer.c:5683 +#: sequencer.c:5639 sequencer.c:5656 msgid "nothing to do" msgstr "inget att göra" -#: sequencer.c:5702 +#: sequencer.c:5675 msgid "could not skip unnecessary pick commands" msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon" -#: sequencer.c:5802 +#: sequencer.c:5775 msgid "the script was already rearranged." msgstr "skriptet har redan omordnats." -#: setup.c:134 +#: setup.c:135 #, c-format msgid "'%s' is outside repository at '%s'" msgstr "\"%s\" är utanför arkivet på \"%s\"" -#: setup.c:186 +#: setup.c:187 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -8539,7 +8754,7 @@ msgstr "" "Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns " "lokalt." -#: setup.c:199 +#: setup.c:200 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -8551,12 +8766,12 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:265 +#: setup.c:266 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "flaggan \"%s\" måste anges före argument som inte är flaggor" -#: setup.c:284 +#: setup.c:285 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -8567,100 +8782,100 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:420 +#: setup.c:421 msgid "unable to set up work tree using invalid config" msgstr "kan inte skapa arbetskatalog med felaktig konfiguration" -#: setup.c:424 builtin/rev-parse.c:895 +#: setup.c:425 builtin/rev-parse.c:895 msgid "this operation must be run in a work tree" msgstr "funktionen måste köras i en arbetskatalog" -#: setup.c:722 +#: setup.c:724 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Förväntade git-arkivversion <= %d, hittade %d" -#: setup.c:730 +#: setup.c:732 msgid "unknown repository extension found:" msgid_plural "unknown repository extensions found:" msgstr[0] "okänd arkivutökning hittades:" msgstr[1] "okända arkivutökningar hittades:" -#: setup.c:744 +#: setup.c:746 msgid "repo version is 0, but v1-only extension found:" msgid_plural "repo version is 0, but v1-only extensions found:" msgstr[0] "arkivversionen är 0, men utökning som bara finns i v1 upptäcktes:" msgstr[1] "arkivversionen är 0, men utökningar som bara finns i v1 upptäcktes:" -#: setup.c:765 +#: setup.c:767 #, c-format msgid "error opening '%s'" msgstr "fel vid öppning av \"%s\"" -#: setup.c:767 +#: setup.c:769 #, c-format msgid "too large to be a .git file: '%s'" msgstr "för stor för att vara en .git-fil: \"%s\"" -#: setup.c:769 +#: setup.c:771 #, c-format msgid "error reading %s" msgstr "fel vid läsning av %s" -#: setup.c:771 +#: setup.c:773 #, c-format msgid "invalid gitfile format: %s" msgstr "ogiltigt gitfilformat: %s" -#: setup.c:773 +#: setup.c:775 #, c-format msgid "no path in gitfile: %s" msgstr "ingen sökväg i gitfil: %s" -#: setup.c:775 +#: setup.c:777 #, c-format msgid "not a git repository: %s" msgstr "inte ett git-arkiv: %s" -#: setup.c:877 +#: setup.c:879 #, c-format msgid "'$%s' too big" msgstr "\"$%s\" för stor" -#: setup.c:891 +#: setup.c:893 #, c-format msgid "not a git repository: '%s'" msgstr "inte ett git-arkiv: \"%s\"" -#: setup.c:920 setup.c:922 setup.c:953 +#: setup.c:922 setup.c:924 setup.c:955 #, c-format msgid "cannot chdir to '%s'" msgstr "kan inte byta katalog (chdir) till \"%s\"" -#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038 +#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040 msgid "cannot come back to cwd" msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)" -#: setup.c:1052 +#: setup.c:1054 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "misslyckades ta status på \"%*ss%s%s\"" -#: setup.c:1295 +#: setup.c:1338 msgid "Unable to read current working directory" msgstr "Kan inte läsa aktuell arbetskatalog" -#: setup.c:1304 setup.c:1310 +#: setup.c:1347 setup.c:1353 #, c-format msgid "cannot change to '%s'" msgstr "kan inte byta till \"%s\"" -#: setup.c:1315 +#: setup.c:1358 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "inte ett git-arkiv (eller någon av föräldrakatalogerna): %s" -#: setup.c:1321 +#: setup.c:1364 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -8670,7 +8885,20 @@ msgstr "" "monteringspunkten %s)\n" "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." -#: setup.c:1446 +#: setup.c:1374 +#, c-format +msgid "" +"unsafe repository ('%s' is owned by someone else)\n" +"To add an exception for this directory, call:\n" +"\n" +"\tgit config --global --add safe.directory %s" +msgstr "" +"osäkert arkiv (\"%s\" ägs av någon annan)\n" +"För att lägga till ett undantag för denna katalog, kör:\n" +"\n" +"\tgit config --global --add safe.directory %s" + +#: setup.c:1502 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -8679,57 +8907,61 @@ msgstr "" "problem med filläges-värdet i core.sharedRepository (0%.3o).\n" "Ägaren av filerna måste alltid ha läs- och skrivbehörighet." -#: setup.c:1508 +#: setup.c:1564 msgid "fork failed" msgstr "\"fork\" misslyckades" -#: setup.c:1513 +#: setup.c:1569 msgid "setsid failed" msgstr "\"setsid\" misslyckades" -#: sparse-index.c:289 +#: sparse-index.c:285 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "indexposten är en katalog, men inte gles (%08x)" +#: split-index.c:9 +msgid "cannot use split index with a sparse index" +msgstr "kan inte dela indexet med ett glest index" + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:850 +#: strbuf.c:851 #, c-format msgid "%u.%2.2u GiB" msgstr "%u,%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:852 +#: strbuf.c:853 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u,%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:860 +#: strbuf.c:861 #, c-format msgid "%u.%2.2u MiB" msgstr "%u,%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:862 +#: strbuf.c:863 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u,%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:869 +#: strbuf.c:870 #, c-format msgid "%u.%2.2u KiB" msgstr "%u,%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:871 +#: strbuf.c:872 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u,%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:877 +#: strbuf.c:878 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -8737,84 +8969,84 @@ msgstr[0] "%u byte" msgstr[1] "%u bytes" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:879 +#: strbuf.c:880 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u byte/s" msgstr[1] "%u bytes/s" -#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765 -#: builtin/rebase.c:650 +#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766 +#: builtin/rebase.c:653 #, c-format msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" -#: strbuf.c:1195 +#: strbuf.c:1196 #, c-format msgid "could not edit '%s'" msgstr "kunde inte redigera \"%s\"" -#: submodule-config.c:237 +#: submodule-config.c:238 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "ignorerar misstänkt undermodulnamn: %s" -#: submodule-config.c:304 +#: submodule-config.c:305 msgid "negative values not allowed for submodule.fetchjobs" msgstr "negativa värden är inte tillåtna för submodule.fetchjobs" -#: submodule-config.c:402 +#: submodule-config.c:403 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "ignorerar \"%s\" som kan tolkas som en kommandoradsflagga: %s" -#: submodule-config.c:499 +#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148 #, c-format -msgid "invalid value for %s" -msgstr "ogiltigt värde för %s" +msgid "invalid value for '%s'" +msgstr "ogiltigt värde för \"%s\"" -#: submodule-config.c:767 +#: submodule-config.c:828 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Kunde inte uppdatera .gitmodules-posten %s" -#: submodule.c:114 submodule.c:143 +#: submodule.c:115 submodule.c:144 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Kan inte ändra .gitmodules-fil som inte slagits ihop, lös " "sammanslagningskonflikter först" -#: submodule.c:118 submodule.c:147 +#: submodule.c:119 submodule.c:148 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s" -#: submodule.c:154 +#: submodule.c:155 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Kunde inte ta bort .gitmodules-posten för %s" -#: submodule.c:165 +#: submodule.c:166 msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:358 +#: submodule.c:346 #, c-format msgid "in unpopulated submodule '%s'" msgstr "i ej utcheckad undermodul \"%s\"" -#: submodule.c:389 +#: submodule.c:377 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" -#: submodule.c:466 +#: submodule.c:454 #, c-format msgid "bad --ignore-submodules argument: %s" msgstr "felaktigt argument till --ignore-submodules: %s" -#: submodule.c:844 +#: submodule.c:866 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " @@ -8823,12 +9055,12 @@ msgstr "" "Undermodulen i incheckning %s på sökvägen: \"%s\" krockar med en undermodul " "med samma namn. Hoppar över den." -#: submodule.c:954 +#: submodule.c:987 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning" -#: submodule.c:1042 +#: submodule.c:1069 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " @@ -8837,36 +9069,46 @@ msgstr "" "kunde inte köra \"git rev-list <incheckningar> --not --remotes -n 1\" i " "undermodulen \"%s\"" -#: submodule.c:1165 +#: submodule.c:1192 #, c-format msgid "process for submodule '%s' failed" msgstr "process för undermodulen \"%s\" misslyckades" -#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714 +#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens." -#: submodule.c:1205 +#: submodule.c:1232 #, c-format msgid "Pushing submodule '%s'\n" msgstr "Sänder undermodulen \"%s\"\n" -#: submodule.c:1208 +#: submodule.c:1235 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "Kunde inte sända undermodulen \"%s\"\n" -#: submodule.c:1491 +#: submodule.c:1567 #, c-format msgid "Fetching submodule %s%s\n" msgstr "Hämtar undermodulen %s%s\n" -#: submodule.c:1525 +#: submodule.c:1589 #, c-format msgid "Could not access submodule '%s'\n" msgstr "Kunde inte komma åt undermodulen \"%s\"\n" -#: submodule.c:1680 +#: submodule.c:1618 +#, c-format +msgid "Could not access submodule '%s' at commit %s\n" +msgstr "Kunde inte komma åt undermodulen \"%s\" vid incheckningen %s\n" + +#: submodule.c:1629 +#, c-format +msgid "Fetching submodule %s%s at commit %s\n" +msgstr "Hämtar undermodulen %s%s vvid incheckningen %s\n" + +#: submodule.c:1849 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8875,61 +9117,61 @@ msgstr "" "Fel vid hämtning av undermodul:\n" "%s" -#: submodule.c:1705 +#: submodule.c:1874 #, c-format msgid "'%s' not recognized as a git repository" msgstr "\"%s\" känns inte igen som ett git-arkiv" -#: submodule.c:1722 +#: submodule.c:1891 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "Kunde inte köra \"git status --porcelain=2\" i undermodulen \"%s\"" -#: submodule.c:1763 +#: submodule.c:1932 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\"" -#: submodule.c:1838 +#: submodule.c:2007 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "kunde inte starta \"git status\" i undermodulen \"%s\"" -#: submodule.c:1851 +#: submodule.c:2020 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "kunde inte köra \"git status\" i undermodulen \"%s\"" -#: submodule.c:1868 +#: submodule.c:2037 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Kunde inte ta bort inställningen core.worktree i undermodulen \"%s\"" -#: submodule.c:1895 submodule.c:2210 +#: submodule.c:2064 submodule.c:2379 #, c-format msgid "could not recurse into submodule '%s'" msgstr "kunde inte rekursera in i undermodulen \"%s\"" -#: submodule.c:1917 +#: submodule.c:2086 msgid "could not reset submodule index" msgstr "kunde inte återställa indexet i undermodul" -#: submodule.c:1959 +#: submodule.c:2128 #, c-format msgid "submodule '%s' has dirty index" msgstr "undermodulen \"%s\" har ett smutsigt index" -#: submodule.c:2013 +#: submodule.c:2182 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Undermoduler \"%s\" kunde inte uppdateras." -#: submodule.c:2081 +#: submodule.c:2250 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\"" -#: submodule.c:2102 +#: submodule.c:2271 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8937,17 +9179,17 @@ msgstr "" "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " "stöds ej" -#: submodule.c:2114 submodule.c:2174 +#: submodule.c:2283 submodule.c:2343 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" -#: submodule.c:2118 +#: submodule.c:2287 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog" -#: submodule.c:2124 +#: submodule.c:2293 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8958,11 +9200,11 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:2255 +#: submodule.c:2424 msgid "could not start ls-files in .." msgstr "kunde inte starta ls-files i .." -#: submodule.c:2295 +#: submodule.c:2464 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en oväntad returkod %d" @@ -8983,8 +9225,8 @@ msgstr "misslyckades utföra släpradskommandot \"%s\"" msgid "unknown value '%s' for key '%s'" msgstr "okänt värde \"%s\" för nyckeln \"%s\"" -#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299 -#: builtin/remote.c:327 +#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300 +#: builtin/remote.c:328 #, c-format msgid "more than one %s" msgstr "mer än en %s" @@ -8999,11 +9241,11 @@ msgstr "tom släpradssymbol i släpraden \"%.*s\"" msgid "could not read input file '%s'" msgstr "kunde inte läsa indatafilen \"%s\"" -#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573 +#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563 msgid "could not read from stdin" msgstr "kunde inte läsa från standard in" -#: trailer.c:1024 wrapper.c:684 +#: trailer.c:1024 wrapper.c:760 #, c-format msgid "could not stat %s" msgstr "kunde inte ta status på %s" @@ -9073,7 +9315,7 @@ msgstr "kunde inte köra fast-import" msgid "error while running fast-import" msgstr "fel när fast-import kördes" -#: transport-helper.c:549 transport-helper.c:1251 +#: transport-helper.c:549 transport-helper.c:1254 #, c-format msgid "could not read ref %s" msgstr "kunde inte läsa referensen %s" @@ -9091,7 +9333,7 @@ msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst" msgid "invalid remote service path" msgstr "felaktig sökväg till fjärrtjänst" -#: transport-helper.c:661 transport.c:1479 +#: transport-helper.c:661 transport.c:1496 msgid "operation not supported by protocol" msgstr "funktionen stöds inte av protokollet" @@ -9100,72 +9342,72 @@ msgstr "funktionen stöds inte av protokollet" msgid "can't connect to subservice %s" msgstr "kan inte ansluta till undertjänsten %s" -#: transport-helper.c:693 transport.c:404 +#: transport-helper.c:693 transport.c:415 msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only kräver protokoll v2" -#: transport-helper.c:755 +#: transport-helper.c:758 msgid "'option' without a matching 'ok/error' directive" msgstr "\"option\" utan mostsvarande \"ok/error\"-direktiv" -#: transport-helper.c:798 +#: transport-helper.c:801 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\"" -#: transport-helper.c:859 +#: transport-helper.c:862 #, c-format msgid "helper reported unexpected status of %s" msgstr "hjälparen returnerade oväntad status %s" -#: transport-helper.c:942 +#: transport-helper.c:945 #, c-format msgid "helper %s does not support dry-run" msgstr "hjälparen %s stöder inte dry-run" -#: transport-helper.c:945 +#: transport-helper.c:948 #, c-format msgid "helper %s does not support --signed" msgstr "hjälparen %s stöder inte --signed" -#: transport-helper.c:948 +#: transport-helper.c:951 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "hjälparen %s stöder inte --signed=if-asked" -#: transport-helper.c:953 +#: transport-helper.c:956 #, c-format msgid "helper %s does not support --atomic" msgstr "hjälparen %s stöder inte --atomic" -#: transport-helper.c:957 +#: transport-helper.c:960 #, c-format msgid "helper %s does not support --%s" msgstr "hjälparen %s stöder inte --%s" -#: transport-helper.c:964 +#: transport-helper.c:967 #, c-format msgid "helper %s does not support 'push-option'" msgstr "hjälparen %s stöder inte \"push-option\"" -#: transport-helper.c:1064 +#: transport-helper.c:1067 msgid "remote-helper doesn't support push; refspec needed" msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs" -#: transport-helper.c:1069 +#: transport-helper.c:1072 #, c-format msgid "helper %s does not support 'force'" msgstr "hjälparen %s stöder inte \"force\"" -#: transport-helper.c:1116 +#: transport-helper.c:1119 msgid "couldn't run fast-export" msgstr "kunde inte köra fast-export" -#: transport-helper.c:1121 +#: transport-helper.c:1124 msgid "error while running fast-export" msgstr "fel vid körning av fast-export" -#: transport-helper.c:1146 +#: transport-helper.c:1149 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -9174,52 +9416,52 @@ msgstr "" "Inga gemensamma referenser och inga angavs; gör inget.\n" "Du kanske borde ange en gren.\n" -#: transport-helper.c:1228 +#: transport-helper.c:1231 #, c-format msgid "unsupported object format '%s'" msgstr "objektformatet \"%s\" stöds ej" -#: transport-helper.c:1237 +#: transport-helper.c:1240 #, c-format msgid "malformed response in ref list: %s" msgstr "felformat svar i referenslistan: %s" -#: transport-helper.c:1389 +#: transport-helper.c:1392 #, c-format msgid "read(%s) failed" msgstr "läs(%s) misslyckades" -#: transport-helper.c:1416 +#: transport-helper.c:1419 #, c-format msgid "write(%s) failed" msgstr "skriv(%s) misslyckades" -#: transport-helper.c:1465 +#: transport-helper.c:1468 #, c-format msgid "%s thread failed" msgstr "%s-tråden misslyckades" -#: transport-helper.c:1469 +#: transport-helper.c:1472 #, c-format msgid "%s thread failed to join: %s" msgstr "%s-tråden misslyckades ansluta: %s" -#: transport-helper.c:1488 transport-helper.c:1492 +#: transport-helper.c:1491 transport-helper.c:1495 #, 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:1529 +#: transport-helper.c:1532 #, c-format msgid "%s process failed to wait" msgstr "processen %s misslyckades vänta" -#: transport-helper.c:1533 +#: transport-helper.c:1536 #, c-format msgid "%s process failed" msgstr "processen %s misslyckades" -#: transport-helper.c:1551 transport-helper.c:1560 +#: transport-helper.c:1554 transport-helper.c:1563 msgid "can't start thread for copying data" msgstr "kan inte skapa tråd för kopiering av data" @@ -9228,51 +9470,51 @@ msgstr "kan inte skapa tråd för kopiering av data" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n" -#: transport.c:145 +#: transport.c:138 #, c-format msgid "could not read bundle '%s'" msgstr "kunde inte läsa bunten \"%s\"" -#: transport.c:227 +#: transport.c:234 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: ogiltig flagga för depth: \"%s\"" -#: transport.c:279 +#: transport.c:289 msgid "see protocol.version in 'git help config' for more details" msgstr "se protocol.version i \"git help config\" för mer information" -#: transport.c:280 +#: transport.c:290 msgid "server options require protocol version 2 or later" msgstr "serverflaggor kräver protokollversion 2 eller senare" -#: transport.c:407 +#: transport.c:418 msgid "server does not support wait-for-done" msgstr "servern stöder inte wait-for-done" -#: transport.c:759 +#: transport.c:770 msgid "could not parse transport.color.* config" msgstr "kunde inte tolka inställningen för transport.color.*" -#: transport.c:834 +#: transport.c:845 msgid "support for protocol v2 not implemented yet" msgstr "stöd för protokoll v2 ännu ej implementerat" -#: transport.c:967 +#: transport.c:978 #, c-format msgid "unknown value for config '%s': %s" msgstr "okänt värde för inställningen \"%s\": %s" -#: transport.c:1033 +#: transport.c:1044 #, c-format msgid "transport '%s' not allowed" msgstr "transporten \"%s\" tillåts inte" -#: transport.c:1082 +#: transport.c:1093 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync stöds inte längre" -#: transport.c:1185 +#: transport.c:1196 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -9281,7 +9523,7 @@ msgstr "" "Följande undermodulsökvägar innehåller ändringar som\n" "inte kan hittas av fjärrarna:\n" -#: transport.c:1189 +#: transport.c:1200 #, c-format msgid "" "\n" @@ -9308,11 +9550,11 @@ msgstr "" "för att sända dem till fjärren.\n" "\n" -#: transport.c:1197 +#: transport.c:1208 msgid "Aborting." msgstr "Avbryter." -#: transport.c:1343 +#: transport.c:1354 msgid "failed to push all needed submodules" msgstr "kunde inte sända alla nödvändiga undermoduler" @@ -9596,16 +9838,16 @@ msgstr "" "sökvägar på ett okänsligt filsystem) och endast en från samma\n" "kollisionsgrupp finns i arbetskatalogen:\n" -#: unpack-trees.c:1636 +#: unpack-trees.c:1664 msgid "Updating index flags" msgstr "Uppdaterar indexflaggor" -#: unpack-trees.c:2803 +#: unpack-trees.c:2925 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "arbetskatalog och ospårad incheckning har dublettposter: %s" -#: upload-pack.c:1565 +#: upload-pack.c:1579 msgid "expected flush after fetch arguments" msgstr "förväntade \"flush\" efter \"fetch\"-argument" @@ -9642,123 +9884,137 @@ msgstr "felaktigt \"..\"-sökvägssegment" msgid "Fetching objects" msgstr "Hämtar objekt" -#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156 +#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156 #, c-format msgid "failed to read '%s'" msgstr "misslyckades läsa \"%s\"" -#: worktree.c:305 +#: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen" -#: worktree.c:316 +#: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen" -#: worktree.c:328 +#: worktree.c:327 #, c-format msgid "'%s' does not exist" msgstr "\"%s\" finns inte" -#: worktree.c:334 +#: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "\"%s\" är inte en .git-fil, felkod %d" -#: worktree.c:343 +#: worktree.c:342 #, c-format msgid "'%s' does not point back to '%s'" msgstr "\"%s\" pekar inte tillbaka till \"%s\"" -#: worktree.c:604 +#: worktree.c:600 msgid "not a directory" msgstr "inte en katalog" -#: worktree.c:613 +#: worktree.c:609 msgid ".git is not a file" msgstr ".git är inte en fil" -#: worktree.c:615 +#: worktree.c:611 msgid ".git file broken" msgstr ".git-filen är trasig" -#: worktree.c:617 +#: worktree.c:613 msgid ".git file incorrect" msgstr ".git-filen är felaktig" -#: worktree.c:723 +#: worktree.c:719 msgid "not a valid path" msgstr "inte en giltig sökväg" -#: worktree.c:729 +#: worktree.c:725 msgid "unable to locate repository; .git is not a file" msgstr "hittar inte arkivet; .git är inte en fil" -#: worktree.c:733 +#: worktree.c:729 msgid "unable to locate repository; .git file does not reference a repository" msgstr "hittar inte arkivet; .git-filen hänvisar inte till ett arkiv" -#: worktree.c:737 +#: worktree.c:733 msgid "unable to locate repository; .git file broken" msgstr "hittar inte arkivet; .git-filen är trasig" -#: worktree.c:743 +#: worktree.c:739 msgid "gitdir unreadable" msgstr "gitdir är oläsbar" -#: worktree.c:747 +#: worktree.c:743 msgid "gitdir incorrect" msgstr "gitdir är felaktig" -#: worktree.c:772 +#: worktree.c:768 msgid "not a valid directory" msgstr "inte i en giltig katalog" -#: worktree.c:778 +#: worktree.c:774 msgid "gitdir file does not exist" msgstr "gitdir-filen existerar inte" -#: worktree.c:783 worktree.c:792 +#: worktree.c:779 worktree.c:788 #, c-format msgid "unable to read gitdir file (%s)" msgstr "kunde inte läsa gitdir-filen (%s)" -#: worktree.c:802 +#: worktree.c:798 #, c-format msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "kort läsning (förväntade %<PRIuMAX> byte, läste %<PRIuMAX>)" -#: worktree.c:810 +#: worktree.c:806 msgid "invalid gitdir file" msgstr "ogiltig gitdir-fil" -#: worktree.c:818 +#: worktree.c:814 msgid "gitdir file points to non-existent location" msgstr "gitdir-filen pekar på en ickeexisterande plats" -#: wrapper.c:151 +#: worktree.c:830 +#, c-format +msgid "unable to set %s in '%s'" +msgstr "kan inte sätta %s i \"%s\"" + +#: worktree.c:832 +#, c-format +msgid "unable to unset %s in '%s'" +msgstr "kan inte slå av %s i \"%s\"" + +#: worktree.c:852 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "misslyckades ändra inställningen extensions.worktreeConfig" + +#: wrapper.c:161 #, c-format msgid "could not setenv '%s'" msgstr "kunde inte lagra miljövariabeln \"%s\"" -#: wrapper.c:203 +#: wrapper.c:213 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: wrapper.c:205 wrapper.c:375 +#: wrapper.c:215 wrapper.c:385 #, c-format msgid "could not open '%s' for reading and writing" msgstr "kunde inte öppna \"%s\" för läsning och skrivning" -#: wrapper.c:406 wrapper.c:607 +#: wrapper.c:416 wrapper.c:683 #, c-format msgid "unable to access '%s'" msgstr "kan inte komma åt \"%s\"" -#: wrapper.c:615 +#: wrapper.c:691 msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" @@ -9793,11 +10049,11 @@ msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning) msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:211 wt-status.c:1131 +#: wt-status.c:211 wt-status.c:1140 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:234 wt-status.c:1140 +#: wt-status.c:234 wt-status.c:1149 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" @@ -9900,22 +10156,22 @@ msgstr "ändrat innehåll, " msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:964 +#: wt-status.c:973 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Stashen innehåller just nu %d post" msgstr[1] "Stashen innehåller just nu %d poster" -#: wt-status.c:995 +#: wt-status.c:1004 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:997 +#: wt-status.c:1006 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:1079 +#: wt-status.c:1088 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9923,7 +10179,7 @@ msgstr "" "Raden ovan får inte ändras eller tas bort.\n" "Allt under den kommer tas bort." -#: wt-status.c:1171 +#: wt-status.c:1180 #, c-format msgid "" "\n" @@ -9934,114 +10190,114 @@ msgstr "" "Det tog %.2f sekunder att räkna före/bakom-värden.\n" "Du kan använda \"--no-ahead-behind\" för undvika detta.\n" -#: wt-status.c:1201 +#: wt-status.c:1210 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:1204 +#: wt-status.c:1213 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:1206 +#: wt-status.c:1215 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)" -#: wt-status.c:1210 +#: wt-status.c:1219 msgid "All conflicts fixed but you are still merging." msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning." -#: wt-status.c:1213 +#: wt-status.c:1222 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:1224 +#: wt-status.c:1233 msgid "You are in the middle of an am session." msgstr "Du är i mitten av en körning av \"git am\"." -#: wt-status.c:1227 +#: wt-status.c:1236 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:1232 +#: wt-status.c:1241 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:1234 +#: wt-status.c:1243 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:1237 +#: wt-status.c:1246 msgid "" " (use \"git am --allow-empty\" to record this patch as an empty commit)" msgstr "" " (använd \"git am --allow-empty\" för att registrera patchen som en tom " "incheckning)" -#: wt-status.c:1239 +#: wt-status.c:1248 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" -#: wt-status.c:1372 +#: wt-status.c:1381 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo saknas." -#: wt-status.c:1374 +#: wt-status.c:1383 msgid "No commands done." msgstr "Inga kommandon utförda." -#: wt-status.c:1377 +#: wt-status.c:1386 #, c-format -msgid "Last command done (%d command done):" -msgid_plural "Last commands done (%d commands done):" -msgstr[0] "Sista kommandot utfört (%d kommando utfört):" -msgstr[1] "Sista kommandot utfört (%d kommandon utfört):" +msgid "Last command done (%<PRIuMAX> command done):" +msgid_plural "Last commands done (%<PRIuMAX> commands done):" +msgstr[0] "Sista kommandot utfört (%<PRIuMAX> kommando utfört):" +msgstr[1] "Sista kommandot utfört (%<PRIuMAX> kommandon utfört):" -#: wt-status.c:1388 +#: wt-status.c:1397 #, c-format msgid " (see more in file %s)" msgstr " (se fler i filen %s)" -#: wt-status.c:1393 +#: wt-status.c:1402 msgid "No commands remaining." msgstr "Inga kommandon återstår." -#: wt-status.c:1396 +#: wt-status.c:1405 #, c-format -msgid "Next command to do (%d remaining command):" -msgid_plural "Next commands to do (%d remaining commands):" -msgstr[0] "Nästa kommando att utföra (%d kommando återstår):" -msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):" +msgid "Next command to do (%<PRIuMAX> remaining command):" +msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):" +msgstr[0] "Nästa kommando att utföra (%<PRIuMAX> kommando återstår):" +msgstr[1] "Följande kommandon att utföra (%<PRIuMAX> kommandon återstår):" -#: wt-status.c:1404 +#: wt-status.c:1413 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)" -#: wt-status.c:1416 +#: wt-status.c:1425 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"." -#: wt-status.c:1421 +#: wt-status.c:1430 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1434 +#: wt-status.c:1443 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1436 +#: wt-status.c:1445 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1438 +#: wt-status.c:1447 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)" -#: wt-status.c:1445 +#: wt-status.c:1454 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1449 +#: wt-status.c:1458 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -10049,159 +10305,159 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1454 +#: wt-status.c:1463 msgid "You are currently splitting a commit during a rebase." msgstr "Du håller på att dela upp en incheckning i en ombasering." -#: wt-status.c:1457 +#: wt-status.c:1466 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")" -#: wt-status.c:1461 +#: wt-status.c:1470 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1466 +#: wt-status.c:1475 msgid "You are currently editing a commit during a rebase." msgstr "Du håller på att redigera en incheckning under en ombasering." -#: wt-status.c:1469 +#: wt-status.c:1478 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)" -#: wt-status.c:1471 +#: wt-status.c:1480 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)" -#: wt-status.c:1482 +#: wt-status.c:1491 msgid "Cherry-pick currently in progress." msgstr "Cherry-pick pågår." -#: wt-status.c:1485 +#: wt-status.c:1494 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s." -#: wt-status.c:1492 +#: wt-status.c:1501 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1495 +#: wt-status.c:1504 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (kör \"git cherry-pick --continue\" för att fortsätta)" -#: wt-status.c:1498 +#: wt-status.c:1507 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1500 +#: wt-status.c:1509 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " (använd \"git cherry-pick --skip\" för att hoppa över patchen)" -#: wt-status.c:1502 +#: wt-status.c:1511 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-" "operationen)" -#: wt-status.c:1512 +#: wt-status.c:1521 msgid "Revert currently in progress." msgstr "Ångring pågår." -#: wt-status.c:1515 +#: wt-status.c:1524 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1521 +#: wt-status.c:1530 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1524 +#: wt-status.c:1533 msgid " (run \"git revert --continue\" to continue)" msgstr " (kör \"git revert --continue\" för att fortsätta)" -#: wt-status.c:1527 +#: wt-status.c:1536 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1529 +#: wt-status.c:1538 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (använd \"git revert --skip\" för att hoppa över patchen)" -#: wt-status.c:1531 +#: wt-status.c:1540 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1541 +#: wt-status.c:1550 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"." -#: wt-status.c:1545 +#: wt-status.c:1554 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1548 +#: wt-status.c:1557 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)" -#: wt-status.c:1559 +#: wt-status.c:1568 msgid "You are in a sparse checkout." msgstr "Du är i en gles utcheckning." -#: wt-status.c:1562 +#: wt-status.c:1571 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "Du är i en gles utcheckning med %d%% spårade filer på plats." -#: wt-status.c:1806 +#: wt-status.c:1815 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1813 +#: wt-status.c:1822 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå " -#: wt-status.c:1815 +#: wt-status.c:1824 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå " -#: wt-status.c:1820 +#: wt-status.c:1829 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1822 +#: wt-status.c:1831 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1825 +#: wt-status.c:1834 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1842 +#: wt-status.c:1851 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1843 +#: wt-status.c:1852 msgid "No commits yet" msgstr "Inga incheckningar ännu" -#: wt-status.c:1857 +#: wt-status.c:1866 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1859 +#: wt-status.c:1868 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1863 +#: wt-status.c:1872 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -10213,32 +10469,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1869 +#: wt-status.c:1878 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1871 +#: wt-status.c:1880 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1877 +#: wt-status.c:1886 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1882 +#: wt-status.c:1891 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a" "\")\n" -#: wt-status.c:1886 +#: wt-status.c:1895 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1890 +#: wt-status.c:1899 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -10247,62 +10503,62 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1894 +#: wt-status.c:1903 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "inget köat för incheckning, men ospårade filer finns\n" -#: wt-status.c:1898 +#: wt-status.c:1907 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n" -#: wt-status.c:1902 wt-status.c:1908 +#: wt-status.c:1911 wt-status.c:1917 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1905 +#: wt-status.c:1914 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "inget att checka in (använd -u för att visa ospårade filer)\n" -#: wt-status.c:1910 +#: wt-status.c:1919 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:2015 +#: wt-status.c:2024 msgid "No commits yet on " msgstr "Inga incheckningar ännu på " -#: wt-status.c:2019 +#: wt-status.c:2028 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:2050 +#: wt-status.c:2059 msgid "different" msgstr "olika" -#: wt-status.c:2052 wt-status.c:2060 +#: wt-status.c:2061 wt-status.c:2069 msgid "behind " msgstr "efter " -#: wt-status.c:2055 wt-status.c:2058 +#: wt-status.c:2064 wt-status.c:2067 msgid "ahead " msgstr "före " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2596 +#: wt-status.c:2605 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "kan inte %s: Du har oköade ändringar." -#: wt-status.c:2602 +#: wt-status.c:2611 msgid "additionally, your index contains uncommitted changes." msgstr "dessutom innehåller dit index ändringar som inte har checkats in." -#: wt-status.c:2604 +#: wt-status.c:2613 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in." @@ -10325,145 +10581,149 @@ msgstr "kunde inte ta status \"accept_thread\" \"%s\"" msgid "could not start worker[0] for '%s'" msgstr "kunde inte starta \"worker[0]\" för \"%s\"" -#: compat/precompose_utf8.c:58 builtin/clone.c:347 +#: compat/precompose_utf8.c:58 builtin/clone.c:353 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" +#: compat/fsmonitor/fsm-listen-darwin.c:355 +msgid "Unable to create FSEventStream." +msgstr "kunde inte skapa FSEventStream." + +#: compat/fsmonitor/fsm-listen-darwin.c:403 +msgid "Failed to start the FSEventStream" +msgstr "Misslyckades starta FSEventStream:en" + #: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<flaggor>] [--] <sökväg>..." -#: builtin/add.c:64 +#: builtin/add.c:63 #, c-format msgid "cannot chmod %cx '%s'" msgstr "kan inte utföra chmod %cx \"%s\"" -#: builtin/add.c:106 +#: builtin/add.c:105 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:111 builtin/commit.c:298 +#: builtin/add.c:110 builtin/commit.c:299 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:121 +#: builtin/add.c:120 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:205 +#: builtin/add.c:204 msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:313 builtin/rev-parse.c:993 +#: builtin/add.c:312 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:326 +#: builtin/add.c:325 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:329 +#: builtin/add.c:328 msgid "editing patch failed" msgstr "redigering av patch misslyckades" -#: builtin/add.c:332 +#: builtin/add.c:331 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:334 +#: builtin/add.c:333 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:340 +#: builtin/add.c:339 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:348 +#: builtin/add.c:347 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:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124 +#: builtin/add.c:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124 #: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550 -#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194 +#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484 -#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313 +#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483 +#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338 #: builtin/mv.c:123 builtin/read-tree.c:120 msgid "be verbose" msgstr "var pratsam" -#: builtin/add.c:371 +#: builtin/add.c:370 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409 +#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417 msgid "select hunks interactively" msgstr "välj stycken interaktivt" -#: builtin/add.c:373 +#: builtin/add.c:372 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:374 +#: builtin/add.c:373 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:375 +#: builtin/add.c:374 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:376 +#: builtin/add.c:375 msgid "renormalize EOL of tracked files (implies -u)" msgstr "åternormalisera radslut i spårade filer (implicerar -u)" -#: builtin/add.c:377 +#: builtin/add.c:376 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:378 +#: builtin/add.c:377 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:381 +#: builtin/add.c:380 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:383 +#: builtin/add.c:382 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:384 +#: builtin/add.c:383 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:385 +#: builtin/add.c:384 msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251 +#: builtin/add.c:385 builtin/mv.c:128 builtin/rm.c:251 msgid "allow updating entries outside of the sparse-checkout cone" msgstr "tillåt uppdatera poster utanför området angivet i \"sparse-checkout\"" -#: builtin/add.c:388 builtin/update-index.c:1004 +#: builtin/add.c:387 builtin/update-index.c:1023 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" -#: builtin/add.c:390 +#: builtin/add.c:389 msgid "warn when adding an embedded repository" msgstr "varna när ett inbyggt arkiv läggs till" -#: builtin/add.c:392 -msgid "backend for `git stash -p`" -msgstr "bakända för \"git stash -p\"" - -#: builtin/add.c:410 +#: builtin/add.c:407 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -10494,12 +10754,12 @@ msgstr "" "\n" "Se \"git help submodule\" för ytterligare information." -#: builtin/add.c:439 +#: builtin/add.c:436 #, c-format msgid "adding embedded git repository: %s" msgstr "lägger till inbäddat git-arkiv: %s" -#: builtin/add.c:459 +#: builtin/add.c:456 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -10509,27 +10769,27 @@ msgstr "" "Slå av detta meddelande med\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:474 +#: builtin/add.c:471 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:548 +#: builtin/add.c:534 #, 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:569 builtin/checkout.c:1751 builtin/commit.c:364 -#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713 +#: builtin/add.c:555 builtin/checkout.c:1770 builtin/commit.c:365 +#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702 #, c-format msgid "'%s' and pathspec arguments cannot be used together" msgstr "\"%s\" kan inte användas tillsammans med sökvägsangivelser" -#: builtin/add.c:580 +#: builtin/add.c:566 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:582 +#: builtin/add.c:568 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -10539,117 +10799,112 @@ msgstr "" "Slå av detta meddelande genom att köra\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:202 -#, c-format -msgid "Invalid value for --empty: %s" -msgstr "Felaktigt värde för --empty: %s" - -#: builtin/am.c:392 +#: builtin/am.c:393 msgid "could not parse author script" msgstr "kunde inte tolka författarskript" -#: builtin/am.c:482 +#: builtin/am.c:483 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "\"%s\" togs bort av kroken applypatch-msg" -#: builtin/am.c:524 +#: builtin/am.c:525 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/am.c:562 +#: builtin/am.c:563 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/am.c:588 +#: builtin/am.c:589 msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:776 +#: builtin/am.c:777 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:841 +#: builtin/am.c:842 msgid "Only one StGIT patch series can be applied at once" msgstr "Endast en StGIT-patchserie kan tillämpas åt gången" -#: builtin/am.c:889 +#: builtin/am.c:890 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:894 builtin/am.c:906 +#: builtin/am.c:895 builtin/am.c:907 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:901 +#: builtin/am.c:902 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:994 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:999 builtin/clone.c:300 +#: builtin/am.c:1000 builtin/clone.c:306 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:1004 +#: builtin/am.c:1005 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1153 +#: builtin/am.c:1154 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "När du har löst problemet, kör \"%s --continue\"." -#: builtin/am.c:1154 +#: builtin/am.c:1155 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället." -#: builtin/am.c:1159 +#: builtin/am.c:1160 #, c-format msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." msgstr "" "För att registrera den tomma patchen som en tom incheckning, kör \"%s --" "allow-empty\"." -#: builtin/am.c:1161 +#: builtin/am.c:1162 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"." -#: builtin/am.c:1256 +#: builtin/am.c:1257 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Patch sänd med format=flowed; blanksteg på slut av rader kan ha tappats." -#: builtin/am.c:1344 +#: builtin/am.c:1345 #, c-format msgid "missing author line in commit %s" msgstr "saknad \"author\"-rad i incheckningen %s" -#: builtin/am.c:1347 +#: builtin/am.c:1348 #, c-format msgid "invalid ident line: %.*s" msgstr "ogiltig ident-rad: %.*s" -#: builtin/am.c:1566 +#: builtin/am.c:1567 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: builtin/am.c:1568 +#: builtin/am.c:1569 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1587 +#: builtin/am.c:1588 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10657,25 +10912,25 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1593 +#: builtin/am.c:1594 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1619 +#: builtin/am.c:1620 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1651 +#: builtin/am.c:1652 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1703 builtin/am.c:1707 +#: builtin/am.c:1704 builtin/am.c:1708 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1725 +#: builtin/am.c:1726 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -10683,59 +10938,59 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1735 +#: builtin/am.c:1736 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: " -#: builtin/am.c:1781 builtin/commit.c:409 +#: builtin/am.c:1782 builtin/commit.c:410 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/am.c:1785 +#: builtin/am.c:1786 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1827 +#: builtin/am.c:1828 #, c-format msgid "Skipping: %.*s" msgstr "Hoppar över: %.*s" -#: builtin/am.c:1832 +#: builtin/am.c:1833 #, c-format msgid "Creating an empty commit: %.*s" msgstr "Skapar en tom incheckningar: %.*s" -#: builtin/am.c:1836 +#: builtin/am.c:1837 msgid "Patch is empty." msgstr "Patchen är tom." -#: builtin/am.c:1847 builtin/am.c:1916 +#: builtin/am.c:1848 builtin/am.c:1917 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1864 +#: builtin/am.c:1865 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1870 +#: builtin/am.c:1871 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1874 +#: builtin/am.c:1875 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" "Använd \"git am --show-current-patch=diff\" för att se patchen som " "misslyckades" -#: builtin/am.c:1920 +#: builtin/am.c:1921 msgid "No changes - recorded it as an empty commit." msgstr "Inga ändringar - sparat som en tom incheckning." -#: builtin/am.c:1922 +#: builtin/am.c:1923 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10745,7 +11000,7 @@ msgstr "" "Om det inte är något kvar att köa kan det hända att något annat redan\n" "introducerat samma ändringar; kanske du bör hoppa över patchen." -#: builtin/am.c:1930 +#: builtin/am.c:1931 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10757,17 +11012,17 @@ msgstr "" "lösta.\n" "Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den." -#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448 -#: builtin/reset.c:456 +#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455 +#: builtin/reset.c:463 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"." -#: builtin/am.c:2090 builtin/am.c:2166 +#: builtin/am.c:2091 builtin/am.c:2167 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2134 +#: builtin/am.c:2135 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10775,167 +11030,158 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2242 -#, c-format -msgid "Invalid value for --patch-format: %s" -msgstr "Felaktigt värde för --patch-format: %s" - -#: builtin/am.c:2285 -#, c-format -msgid "Invalid value for --show-current-patch: %s" -msgstr "Felaktigt värde för --show-current-patch: %s" - -#: builtin/am.c:2289 +#: builtin/am.c:2292 #, c-format msgid "options '%s=%s' and '%s=%s' cannot be used together" msgstr "flaggorna \"%s=%s\" och \"%s=%s\" kan inte användas samtidigt" -#: builtin/am.c:2320 +#: builtin/am.c:2323 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2321 +#: builtin/am.c:2324 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2327 +#: builtin/am.c:2330 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2329 +#: builtin/am.c:2332 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2331 +#: builtin/am.c:2334 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16 -#: builtin/repack.c:642 builtin/stash.c:962 +#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16 +#: builtin/repack.c:646 builtin/stash.c:946 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2334 +#: builtin/am.c:2337 msgid "add a Signed-off-by trailer to the commit message" msgstr "lägg till \"Signed-off-by\"-släprad i incheckningsmeddelandet" -#: builtin/am.c:2337 +#: builtin/am.c:2340 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2339 +#: builtin/am.c:2342 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2341 +#: builtin/am.c:2344 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2343 +#: builtin/am.c:2346 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2345 +#: builtin/am.c:2348 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet" -#: builtin/am.c:2348 +#: builtin/am.c:2351 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr" -#: builtin/am.c:2351 +#: builtin/am.c:2354 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2353 +#: builtin/am.c:2356 msgid "pass it through git-mailinfo" msgstr "sänd det genom git-mailinfo" -#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 -#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 -#: builtin/am.c:2383 +#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368 +#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380 +#: builtin/am.c:2386 msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18 -#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263 +#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18 +#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263 #: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221 -#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657 -#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172 -#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175 -#: parse-options.h:317 +#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661 +#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180 +#: parse-options.h:348 msgid "n" msgstr "n" -#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109 -#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479 -#: builtin/verify-tag.c:38 +#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109 +#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856 +#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555 +#: builtin/tag.c:480 builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2380 +#: builtin/am.c:2383 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2386 +#: builtin/am.c:2389 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2388 +#: builtin/am.c:2391 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2391 +#: builtin/am.c:2394 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2394 +#: builtin/am.c:2397 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2397 +#: builtin/am.c:2400 msgid "restore the original branch and abort the patching operation" msgstr "återställ originalgrenen och avbryt patchningen" -#: builtin/am.c:2400 +#: builtin/am.c:2403 msgid "abort the patching operation but keep HEAD where it is" msgstr "avbryt patchningen men behåll HEAD där det är" -#: builtin/am.c:2404 +#: builtin/am.c:2407 msgid "show the patch being applied" msgstr "visa patchen som tillämpas" -#: builtin/am.c:2408 +#: builtin/am.c:2411 msgid "record the empty patch as an empty commit" msgstr "lagra den tomma patchen som en tom incheckning" -#: builtin/am.c:2412 +#: builtin/am.c:2415 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2414 +#: builtin/am.c:2417 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643 -#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099 -#: builtin/revert.c:117 builtin/tag.c:460 +#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642 +#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127 +#: builtin/revert.c:117 builtin/tag.c:461 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2417 builtin/rebase.c:1100 +#: builtin/am.c:2420 builtin/rebase.c:1128 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2420 +#: builtin/am.c:2423 msgid "how to handle empty patches" msgstr "hantering av tomma patchar" -#: builtin/am.c:2423 +#: builtin/am.c:2426 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2441 +#: builtin/am.c:2444 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -10943,16 +11189,16 @@ msgstr "" "Flaggan -b/--binary har varit utan funktion länge, och\n" "kommer tas bort. Vi ber dig att inte använda den längre." -#: builtin/am.c:2448 +#: builtin/am.c:2451 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2463 +#: builtin/am.c:2466 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs." -#: builtin/am.c:2487 +#: builtin/am.c:2490 #, c-format msgid "" "Stray %s directory found.\n" @@ -10961,11 +11207,11 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2493 +#: builtin/am.c:2496 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." -#: builtin/am.c:2503 +#: builtin/am.c:2506 msgid "interactive mode requires patches on the command line" msgstr "interaktivt läge kräver patchar på kommandoraden" @@ -11002,14 +11248,6 @@ msgstr "git archive: förväntade en tömning (flush)" msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --bisect-reset [<incheckning>]" -#: builtin/bisect--helper.c:25 -msgid "" -"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" -"term-new]" -msgstr "" -"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" -"term-new]" - #: builtin/bisect--helper.c:26 msgid "" "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" @@ -11020,10 +11258,6 @@ msgstr "" "=<term>] [--no-checkout] [--first-parent] [<dålig> [<bra>...]] [--] " "[<sökvägar>...]" -#: builtin/bisect--helper.c:28 -msgid "git bisect--helper --bisect-next" -msgstr "git bisect--helper --bisect-next" - #: builtin/bisect--helper.c:29 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" msgstr "git bisect--helper --bisect-state (bad|new) [<incheckning>]" @@ -11040,10 +11274,6 @@ msgstr "git bisect--helper --bisect-replay <filnamn>" msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" msgstr "git bisect--helper --bisect-skip [(<incheckning>|<intervall>)...]" -#: builtin/bisect--helper.c:33 -msgid "git bisect--helper --bisect-visualize" -msgstr "git bisect--helper --bisect-visualize" - #: builtin/bisect--helper.c:34 msgid "git bisect--helper --bisect-run <cmd>..." msgstr "git bisect--helper --bisect-run <kommando>..." @@ -11267,41 +11497,51 @@ msgstr "\"%s\"?? vad menar du?" msgid "cannot read file '%s' for replaying" msgstr "kan inte läsa filen \"%s\" för återuppspelning" -#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274 +#: builtin/bisect--helper.c:1120 builtin/bisect--helper.c:1152 +#, c-format +msgid "running %s\n" +msgstr "kör %s\n" + +#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335 msgid "bisect run failed: no command provided." msgstr "bisect-körning misslyckades: inget kommando gavs." -#: builtin/bisect--helper.c:1116 +#: builtin/bisect--helper.c:1166 #, c-format -msgid "running %s\n" -msgstr "kör %s\n" +msgid "unable to verify '%s' on good revision" +msgstr "kan inte bekräfta \"%s\" på bra revision" + +#: builtin/bisect--helper.c:1172 +#, c-format +msgid "bogus exit code %d for good revision" +msgstr "falsk slutkod %d för bra revision" -#: builtin/bisect--helper.c:1120 +#: builtin/bisect--helper.c:1180 #, c-format msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128" msgstr "" "\"bisect\"-körningen misslyckades: felkod %d från \"%s\" är < 0 eller >= 128" -#: builtin/bisect--helper.c:1136 +#: builtin/bisect--helper.c:1195 #, c-format msgid "cannot open file '%s' for writing" msgstr "kan inte öppna \"%s\" för skrivning" -#: builtin/bisect--helper.c:1152 +#: builtin/bisect--helper.c:1213 msgid "bisect run cannot continue any more" msgstr "\"bisect\"-körningen kan inte fortsätta längre" -#: builtin/bisect--helper.c:1154 +#: builtin/bisect--helper.c:1215 #, c-format msgid "bisect run success" msgstr "\"bisect\"-körningen lyckades" -#: builtin/bisect--helper.c:1157 +#: builtin/bisect--helper.c:1218 #, c-format msgid "bisect found first bad commit" msgstr "bisect hittade första trasiga incheckning" -#: builtin/bisect--helper.c:1160 +#: builtin/bisect--helper.c:1221 #, c-format msgid "" "bisect run failed: 'git bisect--helper --bisect-state %s' exited with error " @@ -11310,71 +11550,71 @@ msgstr "" "\"bisect\"-körningen misslyckades: \"git bisect--helper --bisect-state %s\" " "avslutades med felkoden %d" -#: builtin/bisect--helper.c:1192 +#: builtin/bisect--helper.c:1253 msgid "reset the bisection state" msgstr "återställ bisect-tillstånd" -#: builtin/bisect--helper.c:1194 +#: builtin/bisect--helper.c:1255 msgid "check whether bad or good terms exist" msgstr "se efter om termer för rätt och fel finns" -#: builtin/bisect--helper.c:1196 +#: builtin/bisect--helper.c:1257 msgid "print out the bisect terms" msgstr "skriv ut termer för bisect" -#: builtin/bisect--helper.c:1198 +#: builtin/bisect--helper.c:1259 msgid "start the bisect session" msgstr "påbörja bisect-körningen" -#: builtin/bisect--helper.c:1200 +#: builtin/bisect--helper.c:1261 msgid "find the next bisection commit" msgstr "hitta nästa incheckning i bisect" -#: builtin/bisect--helper.c:1202 +#: builtin/bisect--helper.c:1263 msgid "mark the state of ref (or refs)" msgstr "markera tillståndet för en eller flera referenser" -#: builtin/bisect--helper.c:1204 +#: builtin/bisect--helper.c:1265 msgid "list the bisection steps so far" msgstr "lista \"bisect\"-stegen som utförts så långt" -#: builtin/bisect--helper.c:1206 +#: builtin/bisect--helper.c:1267 msgid "replay the bisection process from the given file" msgstr "spela upp \"bisect\"-processen från angiven fil" -#: builtin/bisect--helper.c:1208 +#: builtin/bisect--helper.c:1269 msgid "skip some commits for checkout" msgstr "hoppa över ett par incheckningar" -#: builtin/bisect--helper.c:1210 +#: builtin/bisect--helper.c:1271 msgid "visualize the bisection" msgstr "visualisera \"bisect\"-körningen" -#: builtin/bisect--helper.c:1212 -msgid "use <cmd>... to automatically bisect." -msgstr "använd <kommando>... för att utföra \"bisect\" automatiskt." +#: builtin/bisect--helper.c:1273 +msgid "use <cmd>... to automatically bisect" +msgstr "använd <kommando>... för att utföra \"bisect\" automatiskt" -#: builtin/bisect--helper.c:1214 +#: builtin/bisect--helper.c:1275 msgid "no log for BISECT_WRITE" msgstr "ingen logg för BISECT_WRITE" -#: builtin/bisect--helper.c:1229 +#: builtin/bisect--helper.c:1290 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:1234 +#: builtin/bisect--helper.c:1295 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms kräver noll eller ett argument" -#: builtin/bisect--helper.c:1243 +#: builtin/bisect--helper.c:1304 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next kräver 0 argument" -#: builtin/bisect--helper.c:1254 +#: builtin/bisect--helper.c:1315 msgid "--bisect-log requires 0 arguments" msgstr "--bisect-log kräver 0 argument" -#: builtin/bisect--helper.c:1259 +#: builtin/bisect--helper.c:1320 msgid "no logfile given" msgstr "ingen loggfil angiven" @@ -11395,143 +11635,134 @@ msgstr "förväntade en färg: %s" msgid "must end with a color" msgstr "måste sluta med en färg" -#: builtin/blame.c:724 -#, c-format -msgid "invalid color '%s' in color.blame.repeatedLines" -msgstr "felaktig färg \"%s\" i color.blame.repeatedLines" - -#: builtin/blame.c:742 -msgid "invalid value for blame.coloring" -msgstr "ogiltigt värde för blame.coloring" - -#: builtin/blame.c:841 +#: builtin/blame.c:842 #, c-format msgid "cannot find revision %s to ignore" msgstr "kan inte hitta revision %s att ignorera" -#: builtin/blame.c:863 +#: builtin/blame.c:864 msgid "show blame entries as we find them, incrementally" msgstr "visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:864 +#: builtin/blame.c:865 msgid "do not show object names of boundary commits (Default: off)" msgstr "visa inte objektnamn för gränsincheckningar (Standard: av)" -#: builtin/blame.c:865 +#: builtin/blame.c:866 msgid "do not treat root commits as boundaries (Default: off)" msgstr "vehandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:866 +#: builtin/blame.c:867 msgid "show work cost statistics" msgstr "visa statistik över arbetskostnad" -#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94 -#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180 +#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98 +#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181 #: builtin/merge.c:301 builtin/multi-pack-index.c:103 #: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180 #: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566 -#: builtin/send-pack.c:202 +#: builtin/remote.c:683 builtin/send-pack.c:202 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/blame.c:868 +#: builtin/blame.c:869 msgid "show output score for blame entries" msgstr "visa utdatapoäng för klandringsposter" -#: builtin/blame.c:869 +#: builtin/blame.c:870 msgid "show original filename (Default: auto)" msgstr "visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:870 +#: builtin/blame.c:871 msgid "show original linenumber (Default: off)" msgstr "visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:871 +#: builtin/blame.c:872 msgid "show in a format designed for machine consumption" msgstr "visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:872 +#: builtin/blame.c:873 msgid "show porcelain format with per-line commit information" msgstr "visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:873 +#: builtin/blame.c:874 msgid "use the same output mode as git-annotate (Default: off)" msgstr "använd samma utdataläge som git-annotate (Standard: av)" -#: builtin/blame.c:874 +#: builtin/blame.c:875 msgid "show raw timestamp (Default: off)" msgstr "visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:875 +#: builtin/blame.c:876 msgid "show long commit SHA1 (Default: off)" msgstr "visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:876 +#: builtin/blame.c:877 msgid "suppress author name and timestamp (Default: off)" msgstr "undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:877 +#: builtin/blame.c:878 msgid "show author email instead of name (Default: off)" msgstr "visa författarens e-post istället för namn (Standard: av)" -#: builtin/blame.c:878 +#: builtin/blame.c:879 msgid "ignore whitespace differences" msgstr "ignorera ändringar i blanksteg" -#: builtin/blame.c:879 builtin/log.c:1838 +#: builtin/blame.c:880 builtin/log.c:1857 msgid "rev" msgstr "incheckning" -#: builtin/blame.c:879 +#: builtin/blame.c:880 msgid "ignore <rev> when blaming" msgstr "ignorera <incheckning> vid klandringen" -#: builtin/blame.c:880 +#: builtin/blame.c:881 msgid "ignore revisions from <file>" msgstr "ignorera incheckningar från <fil>" -#: builtin/blame.c:881 +#: builtin/blame.c:882 msgid "color redundant metadata from previous line differently" msgstr "färglägg redundant metadata från tidigare rader annorlunda" -#: builtin/blame.c:882 +#: builtin/blame.c:883 msgid "color lines by age" msgstr "färglägg rader efter ålder" -#: builtin/blame.c:883 +#: builtin/blame.c:884 msgid "spend extra cycles to find better match" msgstr "slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:884 +#: builtin/blame.c:885 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:885 +#: builtin/blame.c:886 msgid "use <file>'s contents as the final image" msgstr "använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:886 builtin/blame.c:887 +#: builtin/blame.c:887 builtin/blame.c:888 msgid "score" msgstr "poäng" -#: builtin/blame.c:886 +#: builtin/blame.c:887 msgid "find line copies within and across files" msgstr "hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:887 +#: builtin/blame.c:888 msgid "find line movements within and across files" msgstr "hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:888 +#: builtin/blame.c:889 msgid "range" msgstr "intervall" -#: builtin/blame.c:889 +#: builtin/blame.c:890 msgid "process only line range <start>,<end> or function :<funcname>" msgstr "" "behandla endast intervallet <start>,<slut> eller funktionen :<funknamn>" -#: builtin/blame.c:947 +#: builtin/blame.c:949 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress kan inte användas med --incremental eller porslinsformat" @@ -11543,18 +11774,18 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:998 +#: builtin/blame.c:1000 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" -#: builtin/blame.c:1114 +#: builtin/blame.c:1116 #, 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:1159 +#: builtin/blame.c:1161 msgid "Blaming lines" msgstr "Klandra rader" @@ -11563,30 +11794,37 @@ msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" msgstr "git branch [<flaggor>] [-r | -a] [--merged] [--no-merged]" #: builtin/branch.c:30 -msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" -msgstr "git branch [<flaggor>] [-l] [-f] <grennamn> [<startpunkt>]" +msgid "" +"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-" +"point>]" +msgstr "" +"git branch [<flaggor>] [-f] [--recurse-submodules] <grennamn> [<startpunkt>]" #: builtin/branch.c:31 +msgid "git branch [<options>] [-l] [<pattern>...]" +msgstr "git branch [<flaggor>] [-l] [<mönster>...]" + +#: builtin/branch.c:32 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..." -#: builtin/branch.c:32 +#: builtin/branch.c:33 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>" -#: builtin/branch.c:33 +#: builtin/branch.c:34 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" msgstr "git branch [<flaggor>] (-c | -C) [<gammal_gren>] <ny_gren>" -#: builtin/branch.c:34 +#: builtin/branch.c:35 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<flaggor>] [-r | -a] [--points-at]" -#: builtin/branch.c:35 +#: builtin/branch.c:36 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<flaggor>] [-r | -a] [--format]" -#: builtin/branch.c:153 +#: builtin/branch.c:165 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -11595,7 +11833,7 @@ msgstr "" "tar bort grenen \"%s\" som har slagits ihop med\n" " \"%s\", men ännu inte slagits ihop med HEAD." -#: builtin/branch.c:157 +#: builtin/branch.c:169 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -11604,12 +11842,12 @@ msgstr "" "tar inte bort grenen \"%s\" som inte har slagits ihop med\n" " \"%s\", trots att den har slagits ihop med HEAD." -#: builtin/branch.c:171 +#: builtin/branch.c:183 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" -#: builtin/branch.c:175 +#: builtin/branch.c:187 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -11618,112 +11856,112 @@ msgstr "" "Grenen \"%s\" har inte slagits samman i sin helhet.\n" "Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"." -#: builtin/branch.c:188 +#: builtin/branch.c:200 msgid "Update of config-file failed" msgstr "Misslyckades uppdatera konfigurationsfil" -#: builtin/branch.c:223 +#: builtin/branch.c:235 msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -#: builtin/branch.c:230 +#: builtin/branch.c:242 msgid "Couldn't look up commit object for HEAD" msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" -#: builtin/branch.c:247 +#: builtin/branch.c:259 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\"" -#: builtin/branch.c:262 +#: builtin/branch.c:274 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "fjärrspårande grenen \"%s\" hittades inte." -#: builtin/branch.c:263 +#: builtin/branch.c:275 #, c-format msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." -#: builtin/branch.c:294 +#: builtin/branch.c:306 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Tog bort fjärrspårande grenen %s (var %s).\n" -#: builtin/branch.c:295 +#: builtin/branch.c:307 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:445 builtin/tag.c:63 +#: builtin/branch.c:457 builtin/tag.c:64 msgid "unable to parse format string" msgstr "kan inte tolka formatsträng" -#: builtin/branch.c:476 +#: builtin/branch.c:488 msgid "could not resolve HEAD" msgstr "kunde inte slå upp HEAD" -#: builtin/branch.c:482 +#: builtin/branch.c:494 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) pekar utenför refs/heads/" -#: builtin/branch.c:497 +#: builtin/branch.c:509 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Grenen %s ombaseras på %s" -#: builtin/branch.c:501 +#: builtin/branch.c:513 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" på %s" -#: builtin/branch.c:518 +#: builtin/branch.c:530 msgid "cannot copy the current branch while not on any." msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon." -#: builtin/branch.c:520 +#: builtin/branch.c:532 msgid "cannot rename the current branch while not on any." msgstr "" "kunde inte byta namn på aktuell gren när du inte befinner dig på någon." -#: builtin/branch.c:531 +#: builtin/branch.c:543 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:560 +#: builtin/branch.c:572 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:562 +#: builtin/branch.c:574 msgid "Branch copy failed" msgstr "Misslyckades kopiera gren" -#: builtin/branch.c:566 +#: builtin/branch.c:578 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Skapade kopia av felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:569 +#: builtin/branch.c:581 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:575 +#: builtin/branch.c:587 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!" -#: builtin/branch.c:584 +#: builtin/branch.c:596 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:586 +#: builtin/branch.c:598 msgid "Branch is copied, but update of config-file failed" msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:602 +#: builtin/branch.c:614 #, c-format msgid "" "Please edit the description for the branch\n" @@ -11734,207 +11972,224 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/branch.c:637 +#: builtin/branch.c:651 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:639 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren" -#: builtin/branch.c:640 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:642 +#: builtin/branch.c:656 builtin/checkout.c:1571 +#: builtin/submodule--helper.c:3077 msgid "set branch tracking configuration" msgstr "ställ in inställningar för spårad gren" -#: builtin/branch.c:645 +#: builtin/branch.c:659 msgid "do not use" msgstr "använd ej" -#: builtin/branch.c:647 +#: builtin/branch.c:661 msgid "upstream" msgstr "uppströms" -#: builtin/branch.c:647 +#: builtin/branch.c:661 msgid "change the upstream info" msgstr "ändra uppströmsinformationen" -#: builtin/branch.c:648 +#: builtin/branch.c:662 msgid "unset the upstream info" msgstr "ta bort uppströmsinformationen" -#: builtin/branch.c:649 +#: builtin/branch.c:663 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:650 +#: builtin/branch.c:664 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:652 builtin/branch.c:654 +#: builtin/branch.c:666 builtin/branch.c:668 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:653 builtin/branch.c:655 +#: builtin/branch.c:667 builtin/branch.c:669 msgid "print only branches that don't contain the commit" msgstr "visa endast grenar som inte innehåller incheckningen" -#: builtin/branch.c:658 +#: builtin/branch.c:672 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:659 +#: builtin/branch.c:673 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:661 +#: builtin/branch.c:675 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:662 +#: builtin/branch.c:676 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:663 +#: builtin/branch.c:677 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:664 +#: builtin/branch.c:678 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:665 +#: builtin/branch.c:679 msgid "copy a branch and its reflog" msgstr "kopiera en gren och dess reflogg" -#: builtin/branch.c:666 +#: builtin/branch.c:680 msgid "copy a branch, even if target exists" msgstr "kopiera en gren, även om målet finns" -#: builtin/branch.c:667 +#: builtin/branch.c:681 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:668 +#: builtin/branch.c:682 msgid "show current branch name" msgstr "visa namn på aktuell gren" -#: builtin/branch.c:669 +#: builtin/branch.c:683 builtin/submodule--helper.c:3075 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:671 +#: builtin/branch.c:685 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:672 +#: builtin/branch.c:686 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:673 +#: builtin/branch.c:687 msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:674 +#: builtin/branch.c:688 msgid "print only branches that are not merged" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:675 +#: builtin/branch.c:689 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413 +#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413 #: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582 -#: builtin/tag.c:475 +#: builtin/tag.c:476 msgid "object" msgstr "objekt" -#: builtin/branch.c:678 +#: builtin/branch.c:692 msgid "print only branches of the object" msgstr "visa endast grenar för objektet" -#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482 +#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483 msgid "sorting and filtering are case insensitive" msgstr "sortering och filtrering skiljer gemener och VERSALER" -#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480 -#: builtin/verify-tag.c:38 +#: builtin/branch.c:694 builtin/ls-files.c:667 +msgid "recurse through submodules" +msgstr "rekursera ner i undermoduler" + +#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358 +#: builtin/tag.c:481 builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/branch.c:703 builtin/clone.c:678 +#: builtin/branch.c:718 builtin/clone.c:684 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807 +#: builtin/branch.c:739 +msgid "" +"branch with --recurse-submodules can only be used if submodule." +"propagateBranches is enabled" +msgstr "" +"gren med --recurse-submodules kan endast användas om submodule." +"propagateBranches har aktiverats" + +#: builtin/branch.c:741 +msgid "--recurse-submodules can only be used to create branches" +msgstr "--recurse-submodules jan endast användas för att skapa grenar" + +#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:774 +#: builtin/branch.c:802 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:779 +#: builtin/branch.c:807 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:786 +#: builtin/branch.c:814 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu." -#: builtin/branch.c:789 +#: builtin/branch.c:817 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:804 +#: builtin/branch.c:832 msgid "too many branches for a copy operation" msgstr "för många grenar för kopiering" -#: builtin/branch.c:813 +#: builtin/branch.c:841 msgid "too many arguments for a rename operation" msgstr "för många flaggor för namnbyte" -#: builtin/branch.c:818 +#: builtin/branch.c:846 msgid "too many arguments to set new upstream" msgstr "för många flaggor för att byta uppström" -#: builtin/branch.c:822 +#: builtin/branch.c:850 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren." -#: builtin/branch.c:825 builtin/branch.c:848 +#: builtin/branch.c:853 builtin/branch.c:873 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:829 +#: builtin/branch.c:857 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:842 +#: builtin/branch.c:867 msgid "too many arguments to unset upstream" msgstr "för många flaggor för att ta bort uppström" -#: builtin/branch.c:846 +#: builtin/branch.c:871 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren." -#: builtin/branch.c:852 +#: builtin/branch.c:877 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:862 +#: builtin/branch.c:890 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -11942,7 +12197,7 @@ msgstr "" "Flaggorna -a och -r på \"git branch\" tar inte ett namn på gren.\n" "Menade du att använda: -a|-r --list <mönster>?" -#: builtin/branch.c:866 +#: builtin/branch.c:894 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -12058,19 +12313,19 @@ msgstr "git bundle list-heads <fil> [<refnamn>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <fil> [<refnamn>...]" -#: builtin/bundle.c:65 builtin/pack-objects.c:3876 +#: builtin/bundle.c:65 builtin/pack-objects.c:3899 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878 +#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/bundle.c:69 builtin/pack-objects.c:3880 +#: builtin/bundle.c:69 builtin/pack-objects.c:3903 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/bundle.c:72 builtin/pack-objects.c:3883 +#: builtin/bundle.c:72 builtin/pack-objects.c:3906 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" @@ -12082,112 +12337,226 @@ msgstr "ange formatversion för bunten." msgid "Need a repository to create a bundle." msgstr "Behöver ett arkiv för att skapa en bunt." -#: builtin/bundle.c:107 +#: builtin/bundle.c:108 msgid "do not show bundle details" msgstr "visa inte buntdetaljer" -#: builtin/bundle.c:126 +#: builtin/bundle.c:127 #, c-format msgid "%s is okay\n" msgstr "%s är okej\n" -#: builtin/bundle.c:182 +#: builtin/bundle.c:183 msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp en bunt." -#: builtin/bundle.c:185 +#: builtin/bundle.c:186 msgid "Unbundling objects" msgstr "Packar upp objektbunt" -#: builtin/bundle.c:219 builtin/remote.c:1733 +#: builtin/bundle.c:220 builtin/remote.c:1758 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" -#: builtin/cat-file.c:622 +#: builtin/cat-file.c:568 +msgid "flush is only for --buffer mode" +msgstr "flush är endast till för --buffer-läge" + +#: builtin/cat-file.c:612 +msgid "empty command in input" +msgstr "tomt kommando i indata" + +#: builtin/cat-file.c:614 +#, c-format +msgid "whitespace before command: '%s'" +msgstr "blanksteg före kommando: \"%s\"" + +#: builtin/cat-file.c:623 +#, c-format +msgid "%s requires arguments" +msgstr "%s kräver ett argument" + +#: builtin/cat-file.c:628 +#, c-format +msgid "%s takes no arguments" +msgstr "%s tar inget argument" + +#: builtin/cat-file.c:636 +#, c-format +msgid "unknown command: '%s'" +msgstr "okänt kommando: \"%s\"" + +#: builtin/cat-file.c:795 +msgid "only one batch option may be specified" +msgstr "endast en buntflagga kan anges" + +#: builtin/cat-file.c:824 +msgid "git cat-file <type> <object>" +msgstr "git cat-file <typ> <objekt>" + +#: builtin/cat-file.c:825 +msgid "git cat-file (-e | -p) <object>" +msgstr "git cat-file (-e | -p) <objekt>" + +#: builtin/cat-file.c:826 +msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>" +msgstr "git cat-file (-t | -s) [--allow-unknown-type] <objekt>" + +#: builtin/cat-file.c:827 msgid "" -"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" -"p | <type> | --textconv | --filters) [--path=<path>] <object>" +"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" +"objects]\n" +" [--buffer] [--follow-symlinks] [--unordered]\n" +" [--textconv | --filters]" msgstr "" -"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" -"p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>" +"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" +"objects]\n" +" [--buffer] [--follow-symlinks] [--unordered]\n" +" [--textconv | --filters]" -#: builtin/cat-file.c:623 +#: builtin/cat-file.c:830 msgid "" -"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" -"symlinks] [--textconv | --filters]" +"git cat-file (--textconv | --filters)\n" +" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]" msgstr "" -"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" -"symlinks] [--textconv | --filters]" +"git cat-file (--textconv | --filters)\n" +" [<revision>:<sökväg|träd-igt> | --path=<sökväg|träd-igt> " +"<revision>]" -#: builtin/cat-file.c:644 -msgid "only one batch option may be specified" -msgstr "endast en buntflagga kan anges" +#: builtin/cat-file.c:836 +msgid "Check object existence or emit object contents" +msgstr "Kontrollera om objektet finns eller mata ut objektets innehåll" + +#: builtin/cat-file.c:838 +msgid "check if <object> exists" +msgstr "kontrollera om <objekt> finns" + +#: builtin/cat-file.c:839 +msgid "pretty-print <object> content" +msgstr "visa <objekt>-innehåll snyggt" -#: builtin/cat-file.c:662 -msgid "<type> can be one of: blob, tree, commit, tag" -msgstr "<typ> kan vara en av: blob, tree, commit, tag" +#: builtin/cat-file.c:841 +msgid "Emit [broken] object attributes" +msgstr "Skriv ut [trasiga] objektattribut" -#: builtin/cat-file.c:663 -msgid "show object type" -msgstr "visa objekttyp" +#: builtin/cat-file.c:842 +msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)" +msgstr "visa objekttyp (en av: \"blob\", \"tree\", \"commit\", \"tag\", ...)" -#: builtin/cat-file.c:664 +#: builtin/cat-file.c:843 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:666 -msgid "exit with zero when there's no error" -msgstr "avsluta med noll när det inte uppstått något fel" +#: builtin/cat-file.c:845 +msgid "allow -s and -t to work with broken/corrupt objects" +msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt" -#: builtin/cat-file.c:667 -msgid "pretty-print object's content" -msgstr "visa objektets innehåll snyggt" +#: builtin/cat-file.c:847 +msgid "Batch objects requested on stdin (or --batch-all-objects)" +msgstr "Buntobjekt ombeds på standard in (eller --batch-all-objects)" -#: builtin/cat-file.c:669 -msgid "for blob objects, run textconv on object's content" -msgstr "för blob-objekt, kör filter på objektets innehåll" +#: builtin/cat-file.c:849 +msgid "show full <object> or <rev> contents" +msgstr "visa komplett innehåll för <objekt> eller <rev>" -#: builtin/cat-file.c:671 -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:853 +msgid "like --batch, but don't emit <contents>" +msgstr "som --batch, men mata inte ut <innehåll>" -#: builtin/cat-file.c:672 -msgid "blob" -msgstr "blob" +#: builtin/cat-file.c:857 +msgid "read commands from stdin" +msgstr "läs kommandon från standard in" -#: builtin/cat-file.c:673 -msgid "use a specific path for --textconv/--filters" -msgstr "använd specifik sökväg för --textconv/--filters" +#: builtin/cat-file.c:861 +msgid "with --batch[-check]: ignores stdin, batches all known objects" +msgstr "med --batch[-check]: ignorear standard in, buntar alla kända objekt" -#: builtin/cat-file.c:675 -msgid "allow -s and -t to work with broken/corrupt objects" -msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt" +#: builtin/cat-file.c:863 +msgid "Change or optimize batch output" +msgstr "Ändra eller optimera buntutdata" -#: builtin/cat-file.c:676 +#: builtin/cat-file.c:864 msgid "buffer --batch output" msgstr "buffra utdata från --batch" -#: builtin/cat-file.c:678 -msgid "show info and content of objects fed from the standard input" -msgstr "visa information och innehåll för objekt som listas på standard in" +#: builtin/cat-file.c:866 +msgid "follow in-tree symlinks" +msgstr "följ symboliska länkar inom trädet" -#: builtin/cat-file.c:682 -msgid "show info about objects fed from the standard input" -msgstr "visa information för objekt som listas på standard in" +#: builtin/cat-file.c:868 +msgid "do not order objects before emitting them" +msgstr "sortera inte objekt innan de matas ut" -#: builtin/cat-file.c:686 -msgid "follow in-tree symlinks (used with --batch or --batch-check)" +#: builtin/cat-file.c:870 +msgid "" +"Emit object (blob or tree) with conversion or filter (stand-alone, or with " +"batch)" msgstr "" -"följ symboliska länkar i trädet (använd med --batch eller --batch-check)" +"Mata ut objekt (blob eller träd) med konvertering eller filter (fristående " +"eller med bunt)" + +#: builtin/cat-file.c:872 +msgid "run textconv on object's content" +msgstr "kör textconv på objektets innehåll" + +#: builtin/cat-file.c:874 +msgid "run filters on object's content" +msgstr "kör filter på objektets innehåll" + +#: builtin/cat-file.c:875 +msgid "blob|tree" +msgstr "blob|träd" + +#: builtin/cat-file.c:876 +msgid "use a <path> for (--textconv | --filters); Not with 'batch'" +msgstr "använd en <sökväg> för (--textconv | --filters): Inte med 'batch'" + +#: builtin/cat-file.c:894 +#, c-format +msgid "'%s=<%s>' needs '%s' or '%s'" +msgstr "'%s=<%s>' behöver '%s' eller '%s'" + +#: builtin/cat-file.c:896 +msgid "path|tree-ish" +msgstr "sökväg|träd-igt" + +#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909 +#, c-format +msgid "'%s' requires a batch mode" +msgstr "\"%s\" behöver ett buntläge" + +#: builtin/cat-file.c:921 +#, c-format +msgid "'-%c' is incompatible with batch mode" +msgstr "\"-%c\" är inkompatibel med buntläge" -#: builtin/cat-file.c:688 -msgid "show all objects with --batch or --batch-check" -msgstr "visa alla objekt med --batch eller --batch-check" +#: builtin/cat-file.c:924 +msgid "batch modes take no arguments" +msgstr "buntlägen inte några argument" -#: builtin/cat-file.c:690 -msgid "do not order --batch-all-objects output" -msgstr "ordna inte --batch-all-objects output" +#: builtin/cat-file.c:932 builtin/cat-file.c:935 +#, c-format +msgid "<rev> required with '%s'" +msgstr "<rev> krävs med \"%s\"" + +#: builtin/cat-file.c:938 +#, c-format +msgid "<object> required with '-%c'" +msgstr "<objekt> krävs med \"-%c\"" + +#: builtin/cat-file.c:943 builtin/notes.c:374 builtin/notes.c:429 +#: builtin/notes.c:507 builtin/notes.c:519 builtin/notes.c:596 +#: builtin/notes.c:663 builtin/notes.c:813 builtin/notes.c:965 +#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489 +#: builtin/tag.c:592 +msgid "too many arguments" +msgstr "för många argument" + +#: builtin/cat-file.c:947 +#, c-format +msgid "only two arguments allowed in <type> <object> mode, not %d" +msgstr "endast två argument krävs i <typ> <objekt>-läge, inte %d" #: builtin/check-attr.c:13 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." @@ -12205,7 +12574,7 @@ msgstr "visa alla attribut som satts på filen" msgid "use .gitattributes only from the index" msgstr "använd .gitattributes endast från indexet" -#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100 +#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:101 msgid "read file names from stdin" msgstr "läs filnamn från standard in" @@ -12213,8 +12582,8 @@ msgstr "läs filnamn från standard in" msgid "terminate input and output records by a NUL character" msgstr "avsluta in- och utdataposter med NUL-tecken" -#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550 -#: builtin/worktree.c:493 +#: builtin/check-ignore.c:21 builtin/checkout.c:1550 builtin/gc.c:550 +#: builtin/worktree.c:565 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -12271,161 +12640,165 @@ msgstr "inga kontakter angavs" msgid "git checkout--worker [<options>]" msgstr "git checkout--worker [<flaggor>]" -#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 -#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864 -#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875 -#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577 -#: builtin/worktree.c:491 builtin/worktree.c:728 +#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235 +#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878 +#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889 +#: builtin/submodule--helper.c:2716 builtin/worktree.c:563 +#: builtin/worktree.c:808 msgid "string" msgstr "sträng" -#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202 +#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236 msgid "when creating files, prepend <string>" msgstr "när filer skapas, lägg till <sträng> först" -#: builtin/checkout-index.c:152 +#: builtin/checkout-index.c:184 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<flaggor>] [--] [<fil>...]" -#: builtin/checkout-index.c:169 +#: builtin/checkout-index.c:201 msgid "stage should be between 1 and 3 or all" msgstr "etapp måste vara mellan 1 och 3 eller \"all\"" -#: builtin/checkout-index.c:187 +#: builtin/checkout-index.c:219 msgid "check out all files in the index" msgstr "checka ut alla filer i indexet" -#: builtin/checkout-index.c:188 +#: builtin/checkout-index.c:221 +msgid "do not skip files with skip-worktree set" +msgstr "hoppa inte över filer med skip-worktree satt" + +#: builtin/checkout-index.c:222 msgid "force overwrite of existing files" msgstr "tvinga överskrivning av befintliga filer" -#: builtin/checkout-index.c:190 +#: builtin/checkout-index.c:224 msgid "no warning for existing files and files not in index" msgstr "ingen varning för existerande filer och filer ej i indexet" -#: builtin/checkout-index.c:192 +#: builtin/checkout-index.c:226 msgid "don't checkout new files" msgstr "checka inte ut nya filer" -#: builtin/checkout-index.c:194 +#: builtin/checkout-index.c:228 msgid "update stat information in the index file" msgstr "uppdatera stat-information i indexfilen" -#: builtin/checkout-index.c:198 +#: builtin/checkout-index.c:232 msgid "read list of paths from the standard input" msgstr "läs listan över sökvägar från standard in" -#: builtin/checkout-index.c:200 +#: builtin/checkout-index.c:234 msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" -#: builtin/checkout-index.c:204 +#: builtin/checkout-index.c:238 msgid "copy out the files from named stage" msgstr "kopiera ut filer från namngiven etapp" -#: builtin/checkout.c:33 +#: builtin/checkout.c:34 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<flaggor>] <gren>" -#: builtin/checkout.c:34 +#: builtin/checkout.c:35 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..." -#: builtin/checkout.c:39 +#: builtin/checkout.c:40 msgid "git switch [<options>] [<branch>]" msgstr "git switch [<flaggor>] [<gren>]" -#: builtin/checkout.c:44 +#: builtin/checkout.c:45 msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<flaggor>] [--source=<gren>] <fil>..." -#: builtin/checkout.c:198 builtin/checkout.c:237 +#: builtin/checkout.c:199 builtin/checkout.c:238 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:200 builtin/checkout.c:239 +#: builtin/checkout.c:201 builtin/checkout.c:240 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:216 +#: builtin/checkout.c:217 #, 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:269 +#: builtin/checkout.c:271 #, 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:286 +#: builtin/checkout.c:291 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:302 +#: builtin/checkout.c:307 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:419 +#: builtin/checkout.c:424 #, 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:424 +#: builtin/checkout.c:429 #, 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:431 +#: builtin/checkout.c:436 #, 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:454 builtin/checkout.c:457 builtin/checkout.c:460 -#: builtin/checkout.c:464 +#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465 +#: builtin/checkout.c:469 #, 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:474 +#: builtin/checkout.c:479 #, 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:478 +#: builtin/checkout.c:483 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "varken \"%s\" eller \"%s\" har angivits" -#: builtin/checkout.c:482 +#: builtin/checkout.c:487 #, 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:487 builtin/checkout.c:492 +#: builtin/checkout.c:492 builtin/checkout.c:497 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "\"%s\" eller \"%s\" kan inte användas med %s" -#: builtin/checkout.c:566 builtin/checkout.c:573 +#: builtin/checkout.c:571 builtin/checkout.c:578 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:747 +#: builtin/checkout.c:753 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:797 +#: builtin/checkout.c:809 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12434,50 +12807,50 @@ msgstr "" "kan inte fortsätta med köade ändringar i följande filer:\n" "%s" -#: builtin/checkout.c:890 +#: builtin/checkout.c:902 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:934 +#: builtin/checkout.c:947 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203 +#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:942 +#: builtin/checkout.c:955 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:945 +#: builtin/checkout.c:958 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:949 +#: builtin/checkout.c:962 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:951 builtin/checkout.c:1388 +#: builtin/checkout.c:964 builtin/checkout.c:1398 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:953 +#: builtin/checkout.c:966 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:1004 +#: builtin/checkout.c:1017 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:1010 +#: builtin/checkout.c:1023 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12500,7 +12873,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1029 +#: builtin/checkout.c:1042 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12527,19 +12900,19 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:1064 +#: builtin/checkout.c:1077 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:1068 +#: builtin/checkout.c:1081 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:1114 builtin/checkout.c:1383 +#: builtin/checkout.c:1124 builtin/checkout.c:1393 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:1196 +#: builtin/checkout.c:1206 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12548,7 +12921,7 @@ msgstr "" "\"%s\" kan vara både en lokal fil och en spårande gren.\n" "Använd -- (och möjligen --no-guess) för att göra otvetydig" -#: builtin/checkout.c:1203 +#: builtin/checkout.c:1213 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12568,51 +12941,58 @@ 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:1213 +#: builtin/checkout.c:1223 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar" -#: builtin/checkout.c:1279 +#: builtin/checkout.c:1289 msgid "only one reference expected" msgstr "endast en referens förväntades" -#: builtin/checkout.c:1296 +#: builtin/checkout.c:1306 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436 +#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1355 builtin/checkout.c:1725 +#: builtin/checkout.c:1365 builtin/checkout.c:1744 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1402 +#: builtin/checkout.c:1413 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "förväntade gren, fick taggen \"%s\"" -#: builtin/checkout.c:1404 +#: builtin/checkout.c:1415 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "förväntade gren, fick fjärrgrenen \"%s\"" -#: builtin/checkout.c:1405 builtin/checkout.c:1413 +#: builtin/checkout.c:1417 builtin/checkout.c:1426 #, c-format msgid "a branch is expected, got '%s'" msgstr "förväntade gren, fick \"%s\"" -#: builtin/checkout.c:1408 +#: builtin/checkout.c:1420 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "förväntade gren, fick incheckningen \"%s\"" -#: builtin/checkout.c:1424 +#: builtin/checkout.c:1429 +msgid "" +"If you want to detach HEAD at the commit, try again with the --detach option." +msgstr "" +"Om du vill koppla från HEAD vid incheckningen, försök igen med flaggan --" +"detach." + +#: builtin/checkout.c:1442 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12620,7 +13000,7 @@ msgstr "" "kan inte växla gren vid sammanslagning\n" "Överväg \"git merge --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1428 +#: builtin/checkout.c:1446 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12628,7 +13008,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:1432 +#: builtin/checkout.c:1450 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12636,7 +13016,7 @@ msgstr "" "kan inte växla gren vid ombasering\n" "Överväg \"git rebase --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1436 +#: builtin/checkout.c:1454 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12644,7 +13024,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:1440 +#: builtin/checkout.c:1458 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12652,127 +13032,123 @@ msgstr "" "kan inte växla gren i en \"revert\"\n" "Överväg \"git revert --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1444 +#: builtin/checkout.c:1462 msgid "you are switching branch while bisecting" msgstr "då växlar grenar medan du gör en \"bisect\"" -#: builtin/checkout.c:1451 +#: builtin/checkout.c:1469 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462 +#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472 -#: builtin/checkout.c:1477 builtin/checkout.c:1482 +#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490 +#: builtin/checkout.c:1495 builtin/checkout.c:1500 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1479 +#: builtin/checkout.c:1497 #, c-format msgid "'%s' cannot take <start-point>" msgstr "\"%s\" kan inte ta <startpunkt>" -#: builtin/checkout.c:1487 +#: builtin/checkout.c:1505 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1494 +#: builtin/checkout.c:1512 msgid "missing branch or commit argument" msgstr "saknar gren- eller incheckingsargument" -#: builtin/checkout.c:1537 +#: builtin/checkout.c:1555 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:1538 builtin/log.c:1825 parse-options.h:323 +#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354 msgid "style" msgstr "stil" -#: builtin/checkout.c:1539 +#: builtin/checkout.c:1557 msgid "conflict style (merge, diff3, or zdiff3)" msgstr "konfliktstil (merge, diff3 eller zdiff3)" -#: builtin/checkout.c:1551 builtin/worktree.c:488 +#: builtin/checkout.c:1569 builtin/worktree.c:560 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1553 -msgid "set up tracking mode (see git-pull(1))" -msgstr "ställ in spårningsläge (se git-pull(1))" - -#: builtin/checkout.c:1556 +#: builtin/checkout.c:1574 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1558 +#: builtin/checkout.c:1576 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1558 +#: builtin/checkout.c:1576 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1560 builtin/merge.c:305 +#: builtin/checkout.c:1578 builtin/merge.c:305 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1563 +#: builtin/checkout.c:1581 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:1576 +#: builtin/checkout.c:1594 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1579 +#: builtin/checkout.c:1597 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1583 +#: builtin/checkout.c:1601 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1640 +#: builtin/checkout.c:1659 #, c-format msgid "options '-%c', '-%c', and '%s' cannot be used together" msgstr "flaggorna \"%-c\", \"-%c\" och \"%s\" kan inte användas samtidigt" -#: builtin/checkout.c:1681 +#: builtin/checkout.c:1700 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1686 +#: builtin/checkout.c:1705 #, c-format msgid "missing branch name; try -%c" msgstr "grennamn saknas; försök med -%c" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1737 #, c-format msgid "could not resolve %s" msgstr "kunde inte upplösa %s" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1753 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1741 +#: builtin/checkout.c:1760 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den" -#: builtin/checkout.c:1745 +#: builtin/checkout.c:1764 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\"" -#: builtin/checkout.c:1770 +#: builtin/checkout.c:1789 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12780,71 +13156,71 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/checkout.c:1775 +#: builtin/checkout.c:1794 msgid "you must specify path(s) to restore" msgstr "du måste ange katalog(er) att återställa" -#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854 -#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2959 -#: builtin/submodule--helper.c:3253 builtin/worktree.c:484 -#: builtin/worktree.c:486 +#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873 +#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171 +#: builtin/remote.c:173 builtin/submodule--helper.c:3038 +#: builtin/submodule--helper.c:3371 builtin/worktree.c:556 +#: builtin/worktree.c:558 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1801 +#: builtin/checkout.c:1820 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1803 +#: builtin/checkout.c:1822 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1804 +#: builtin/checkout.c:1823 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1806 +#: builtin/checkout.c:1825 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "förutspå \"git checkout <gren-saknas>\" (förval)" -#: builtin/checkout.c:1807 +#: builtin/checkout.c:1826 msgid "use overlay mode (default)" msgstr "använd överläggsläge (standard)" -#: builtin/checkout.c:1855 +#: builtin/checkout.c:1874 msgid "create and switch to a new branch" msgstr "skapa och växla till en ny gren" -#: builtin/checkout.c:1857 +#: builtin/checkout.c:1876 msgid "create/reset and switch to a branch" msgstr "skapa/nollställ och växla till en gren" -#: builtin/checkout.c:1859 +#: builtin/checkout.c:1878 msgid "second guess 'git switch <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1861 +#: builtin/checkout.c:1880 msgid "throw away local modifications" msgstr "kasta bort lokala ändringar" -#: builtin/checkout.c:1897 +#: builtin/checkout.c:1916 msgid "which tree-ish to checkout from" msgstr "vilken träd-igt att checka ut från" -#: builtin/checkout.c:1899 +#: builtin/checkout.c:1918 msgid "restore the index" msgstr "återställ indexet" -#: builtin/checkout.c:1901 +#: builtin/checkout.c:1920 msgid "restore the working tree (default)" msgstr "återställ arbetskatalogen (förval)" -#: builtin/checkout.c:1903 +#: builtin/checkout.c:1922 msgid "ignore unmerged entries" msgstr "ignorera ej sammanslagna poster" -#: builtin/checkout.c:1904 +#: builtin/checkout.c:1923 msgid "use overlay mode" msgstr "använd överläggsläge" @@ -12993,8 +13369,8 @@ msgid "remove whole directories" msgstr "ta bort hela kataloger" #: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186 -#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537 +#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187 +#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587 #: builtin/show-ref.c:179 msgid "pattern" msgstr "mönster" @@ -13031,208 +13407,212 @@ msgstr "" msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" -#: builtin/clone.c:45 +#: builtin/clone.c:47 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:96 +#: builtin/clone.c:100 msgid "don't clone shallow repository" msgstr "klona inte grunt arkiv" -#: builtin/clone.c:98 +#: builtin/clone.c:102 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542 +#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:103 +#: builtin/clone.c:107 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:105 +#: builtin/clone.c:109 msgid "to clone from a local repository" msgstr "för att klona från ett lokalt arkiv" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hårda länkar, kopiera alltid" -#: builtin/clone.c:109 +#: builtin/clone.c:113 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:111 +#: builtin/clone.c:115 msgid "pathspec" msgstr "sökvägsangivelse" -#: builtin/clone.c:111 +#: builtin/clone.c:115 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:115 +#: builtin/clone.c:119 msgid "number of submodules cloned in parallel" msgstr "antal undermoduler som klonas parallellt" -#: builtin/clone.c:116 builtin/init-db.c:539 +#: builtin/clone.c:120 builtin/init-db.c:539 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:117 builtin/init-db.c:540 +#: builtin/clone.c:121 builtin/init-db.c:540 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871 -#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260 +#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885 +#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:123 builtin/submodule--helper.c:1873 -#: builtin/submodule--helper.c:2516 +#: builtin/clone.c:127 builtin/submodule--helper.c:1887 +#: builtin/submodule--helper.c:2721 msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" -#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27 +#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27 #: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290 -#: builtin/pack-objects.c:3944 builtin/repack.c:665 -#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595 +#: builtin/pack-objects.c:3967 builtin/repack.c:669 +#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595 #: t/helper/test-simple-ipc.c:597 msgid "name" msgstr "namn" -#: builtin/clone.c:125 +#: builtin/clone.c:129 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:127 +#: builtin/clone.c:131 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checka ut <gren> istället för fjärrens HEAD" -#: builtin/clone.c:129 +#: builtin/clone.c:133 msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876 +#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877 #: builtin/pull.c:212 msgid "depth" msgstr "djup" -#: builtin/clone.c:131 +#: builtin/clone.c:135 msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933 +#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956 #: builtin/pull.c:215 msgid "time" msgstr "tid" -#: builtin/clone.c:133 +#: builtin/clone.c:137 msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon från en angiven tidpunkt" -#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208 -#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022 +#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212 +#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050 msgid "revision" msgstr "revision" -#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219 +#: builtin/clone.c:139 builtin/fetch.c:187 builtin/pull.c:219 msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" -#: builtin/clone.c:137 builtin/submodule--helper.c:1883 -#: builtin/submodule--helper.c:2530 +#: builtin/clone.c:141 builtin/submodule--helper.c:1897 +#: builtin/submodule--helper.c:2735 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:139 +#: builtin/clone.c:143 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:141 +#: builtin/clone.c:145 msgid "any cloned submodules will be shallow" msgstr "klonade undermoduler kommer vara grunda" -#: builtin/clone.c:142 builtin/init-db.c:548 +#: builtin/clone.c:146 builtin/init-db.c:548 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:143 builtin/init-db.c:549 +#: builtin/clone.c:147 builtin/init-db.c:549 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" -#: builtin/clone.c:144 +#: builtin/clone.c:148 msgid "key=value" msgstr "nyckel=värde" -#: builtin/clone.c:145 +#: builtin/clone.c:149 msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77 +#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77 #: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200 msgid "server-specific" msgstr "serverspecifik" -#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77 +#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77 #: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201 msgid "option to transmit" msgstr "flagga att sända" -#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238 +#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238 #: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241 +#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241 #: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" -#: builtin/clone.c:154 +#: builtin/clone.c:158 +msgid "apply partial clone filters to submodules" +msgstr "tillämpa delvisa klonfilter på undermoduler" + +#: builtin/clone.c:160 msgid "any cloned submodules will use their remote-tracking branch" msgstr "klonade undermoduler kommer använda sin fjärrspårningsgren" -#: builtin/clone.c:156 +#: builtin/clone.c:162 msgid "initialize sparse-checkout file to include only files at root" msgstr "initiera sparse-checkout-filen till att bara ta med filer i roten" -#: builtin/clone.c:231 +#: builtin/clone.c:237 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Kan inte skapa suppleant för \"%s\": %s\n" -#: builtin/clone.c:304 +#: builtin/clone.c:310 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:322 +#: builtin/clone.c:328 #, c-format msgid "failed to start iterator over '%s'" msgstr "misslyckades starta iterator över \"%s\"" -#: builtin/clone.c:353 +#: builtin/clone.c:359 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:357 +#: builtin/clone.c:363 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:362 +#: builtin/clone.c:368 #, c-format msgid "failed to iterate over '%s'" msgstr "misslyckades iterera över \"%s\"" -#: builtin/clone.c:389 +#: builtin/clone.c:395 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:403 +#: builtin/clone.c:409 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -13242,147 +13622,151 @@ 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:480 +#: builtin/clone.c:486 #, 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:597 +#: builtin/clone.c:603 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:645 +#: builtin/clone.c:651 msgid "failed to initialize sparse-checkout" msgstr "misslyckades initiera sparse-checkout" -#: builtin/clone.c:668 +#: builtin/clone.c:674 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:701 +#: builtin/clone.c:709 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:779 +#: builtin/clone.c:793 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:842 +#: builtin/clone.c:856 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:844 +#: builtin/clone.c:858 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:886 +#: builtin/clone.c:901 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:890 contrib/scalar/scalar.c:414 +#: builtin/clone.c:905 contrib/scalar/scalar.c:413 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:903 +#: builtin/clone.c:918 #, c-format msgid "options '%s' and '%s %s' cannot be used together" msgstr "flaggorna \"%s\" och \"%s %s\" kan inte användas samtidigt" -#: builtin/clone.c:920 +#: builtin/clone.c:935 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:924 builtin/fetch.c:2052 +#: builtin/clone.c:939 builtin/fetch.c:2176 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:934 +#: builtin/clone.c:949 #, 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:940 +#: builtin/clone.c:955 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "arkivsökvägen \"%s\" finns redan och är inte en tom katalog." -#: builtin/clone.c:954 +#: builtin/clone.c:969 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256 -#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313 +#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256 +#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:974 +#: builtin/clone.c:989 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:994 +#: builtin/clone.c:1009 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:996 +#: builtin/clone.c:1011 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:1025 +#: builtin/clone.c:1040 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:1080 builtin/remote.c:200 builtin/remote.c:710 +#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721 #, c-format msgid "'%s' is not a valid remote name" msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" -#: builtin/clone.c:1121 +#: builtin/clone.c:1157 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1123 +#: builtin/clone.c:1159 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:1125 +#: builtin/clone.c:1161 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:1127 +#: builtin/clone.c:1163 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:1168 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1137 +#: builtin/clone.c:1173 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1216 builtin/clone.c:1276 +#: builtin/clone.c:1185 +msgid "cannot clone from filtered bundle" +msgstr "kan inte klona från filtrerad bunt" + +#: builtin/clone.c:1265 builtin/clone.c:1324 msgid "remote transport reported error" msgstr "fjärrtransport rapporterade fel" -#: builtin/clone.c:1228 builtin/clone.c:1239 +#: builtin/clone.c:1277 builtin/clone.c:1289 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1242 +#: builtin/clone.c:1292 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -13434,7 +13818,7 @@ msgstr "" "split[=<strategi>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <delnings-flaggor>" -#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794 +#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813 msgid "dir" msgstr "kat" @@ -13533,7 +13917,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "duplicerad förälder %s ignorerades" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590 #, c-format msgid "not a valid object name %s" msgstr "objektnamnet är inte giltigt: %s" @@ -13556,13 +13940,13 @@ msgstr "förälder" msgid "id of a parent commit object" msgstr "id på ett förälderincheckningsobjekt" -#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284 -#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677 -#: builtin/tag.c:454 +#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284 +#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666 +#: builtin/tag.c:455 msgid "message" msgstr "meddelande" -#: builtin/commit-tree.c:113 builtin/commit.c:1627 +#: builtin/commit-tree.c:113 builtin/commit.c:1626 msgid "commit message" msgstr "incheckningsmeddelande" @@ -13570,7 +13954,7 @@ msgstr "incheckningsmeddelande" msgid "read commit log message from file" msgstr "läs incheckningsloggmeddelande från fil" -#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303 +#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:303 #: builtin/pull.c:180 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG-signera incheckning" @@ -13583,15 +13967,15 @@ msgstr "måste ange exakt ett träd" msgid "git commit-tree: failed to read" msgstr "git commit-tree: misslyckades läsa" -#: builtin/commit.c:42 +#: builtin/commit.c:43 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<flaggor>] [--] <sökväg>..." -#: builtin/commit.c:47 +#: builtin/commit.c:48 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<flaggor>] [--] <sökväg>..." -#: builtin/commit.c:52 +#: builtin/commit.c:53 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -13601,7 +13985,7 @@ msgstr "" "blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n" "så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n" -#: builtin/commit.c:57 +#: builtin/commit.c:58 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -13615,15 +13999,15 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:64 +#: builtin/commit.c:65 msgid "Otherwise, please use 'git rebase --skip'\n" msgstr "Använd annars \"git rebase --skip\"\n" -#: builtin/commit.c:67 +#: builtin/commit.c:68 msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "Använd annars \"git cherry-pick --skip\"\n" -#: builtin/commit.c:70 +#: builtin/commit.c:71 msgid "" "and then use:\n" "\n" @@ -13645,69 +14029,69 @@ msgstr "" " git cherry-pick --skip\n" "\n" -#: builtin/commit.c:325 +#: builtin/commit.c:326 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:375 +#: builtin/commit.c:376 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:387 +#: builtin/commit.c:388 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:396 +#: builtin/commit.c:397 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:411 +#: builtin/commit.c:412 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporärt index" -#: builtin/commit.c:413 +#: builtin/commit.c:414 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cacheträdet" -#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509 +#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:490 +#: builtin/commit.c:491 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:492 +#: builtin/commit.c:493 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:494 +#: builtin/commit.c:495 msgid "cannot do a partial commit during a rebase." msgstr "kan inte utföra en delvis incheckning under en ombasering." -#: builtin/commit.c:502 +#: builtin/commit.c:503 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:521 +#: builtin/commit.c:522 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:619 +#: builtin/commit.c:620 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar författarhuvud" -#: builtin/commit.c:621 +#: builtin/commit.c:622 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:640 +#: builtin/commit.c:641 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:693 +#: builtin/commit.c:694 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -13715,43 +14099,43 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166 +#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:759 builtin/shortlog.c:416 +#: builtin/commit.c:762 builtin/shortlog.c:417 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:761 +#: builtin/commit.c:764 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:765 +#: builtin/commit.c:768 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:802 +#: builtin/commit.c:805 #, c-format msgid "options '%s' and '%s:%s' cannot be used together" msgstr "flaggorna \"%s\" och \"%s:%s\" kan inte användas samtidigt" -#: builtin/commit.c:814 builtin/commit.c:830 +#: builtin/commit.c:817 builtin/commit.c:833 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:821 +#: builtin/commit.c:824 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:881 +#: builtin/commit.c:884 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:894 +#: builtin/commit.c:897 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -13760,7 +14144,7 @@ msgstr "" "Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n" "med \"%c\" kommer ignoreras.\n" -#: builtin/commit.c:896 +#: builtin/commit.c:899 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -13770,7 +14154,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:900 +#: builtin/commit.c:903 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -13779,7 +14163,7 @@ msgstr "" "Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n" "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" -#: builtin/commit.c:904 +#: builtin/commit.c:907 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -13790,7 +14174,7 @@ 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:916 +#: builtin/commit.c:919 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -13804,7 +14188,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "och försöker igen.\n" -#: builtin/commit.c:921 +#: builtin/commit.c:924 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -13818,168 +14202,147 @@ msgstr "" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "och försöker igen.\n" -#: builtin/commit.c:948 +#: builtin/commit.c:951 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:956 +#: builtin/commit.c:959 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:963 +#: builtin/commit.c:966 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:981 +#: builtin/commit.c:984 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:1026 +#: builtin/commit.c:1029 msgid "unable to pass trailers to --trailers" msgstr "kan inte sända släprader till --trailers" -#: builtin/commit.c:1066 +#: builtin/commit.c:1069 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:1080 builtin/tag.c:316 +#: builtin/commit.c:1083 builtin/tag.c:317 #, 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:1124 +#: builtin/commit.c:1128 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' är inte 'Namn <epost>' och motsvarar ingen befintlig författare" -#: builtin/commit.c:1138 +#: builtin/commit.c:1142 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Ogiltigt ignorerat läge \"%s\"" -#: builtin/commit.c:1156 builtin/commit.c:1451 +#: builtin/commit.c:1160 builtin/commit.c:1450 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1227 +#: builtin/commit.c:1231 msgid "You are in the middle of a merge -- cannot reword." msgstr "Du är i mitten av en sammanslagning -- kan inte omformulera." -#: builtin/commit.c:1229 +#: builtin/commit.c:1233 msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "Du är i mitten av en cherry-pick -- kan inte omformulera." -#: builtin/commit.c:1232 +#: builtin/commit.c:1236 #, c-format msgid "reword option of '%s' and path '%s' cannot be used together" msgstr "" "reword-flaggan till \"%s\" och sökvägen \"%s\" kan inte användas tillsammans" -#: builtin/commit.c:1234 +#: builtin/commit.c:1238 #, c-format msgid "reword option of '%s' and '%s' cannot be used together" msgstr "reword-flaggan till \"%s\" och \"%s\" kan inte användas tillsammans" -#: builtin/commit.c:1254 -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:1261 +#: builtin/commit.c:1263 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1264 +#: builtin/commit.c:1266 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:1266 +#: builtin/commit.c:1268 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:1268 +#: builtin/commit.c:1270 msgid "You are in the middle of a rebase -- cannot amend." msgstr "Du är i mitten av en ombasering -- kan inte utöka." -#: builtin/commit.c:1271 -msgid "Options --squash and --fixup cannot be used together" -msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" - -#: builtin/commit.c:1281 -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:1283 -msgid "Option -m cannot be combined with -c/-C/-F." -msgstr "Flaggan -m kan inte kombineras med -c/-C/-F." - -#: builtin/commit.c:1292 +#: builtin/commit.c:1290 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:1310 -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:1338 +#: builtin/commit.c:1337 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "okänd flagga: --fixup=%s:%s" -#: builtin/commit.c:1355 +#: builtin/commit.c:1354 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "sökvägarna \"%s ...\" med -a ger ingen mening" -#: builtin/commit.c:1486 builtin/commit.c:1655 +#: builtin/commit.c:1485 builtin/commit.c:1654 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1488 builtin/commit.c:1657 +#: builtin/commit.c:1487 builtin/commit.c:1656 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1490 +#: builtin/commit.c:1489 msgid "show stash information" msgstr "visa information om stash" -#: builtin/commit.c:1492 builtin/commit.c:1659 +#: builtin/commit.c:1491 builtin/commit.c:1658 msgid "compute full ahead/behind values" msgstr "beräkna fullständiga före-/efter-värden" -#: builtin/commit.c:1494 +#: builtin/commit.c:1493 msgid "version" msgstr "version" -#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551 -#: builtin/worktree.c:690 +#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551 +#: builtin/worktree.c:765 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1497 builtin/commit.c:1663 +#: builtin/commit.c:1496 builtin/commit.c:1662 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1500 builtin/commit.c:1666 +#: builtin/commit.c:1499 builtin/commit.c:1665 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669 +#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668 #: builtin/fast-export.c:1172 builtin/fast-export.c:1175 -#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337 +#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368 msgid "mode" msgstr "läge" -#: builtin/commit.c:1503 builtin/commit.c:1669 +#: builtin/commit.c:1502 builtin/commit.c:1668 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:1507 +#: builtin/commit.c:1506 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -13987,11 +14350,11 @@ msgstr "" "visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: " "traditional)" -#: builtin/commit.c:1509 parse-options.h:192 +#: builtin/commit.c:1508 parse-options.h:197 msgid "when" msgstr "när" -#: builtin/commit.c:1510 +#: builtin/commit.c:1509 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -13999,194 +14362,194 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1512 +#: builtin/commit.c:1511 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1513 +#: builtin/commit.c:1512 msgid "do not detect renames" msgstr "detektera inte namnändringar" -#: builtin/commit.c:1515 +#: builtin/commit.c:1514 msgid "detect renames, optionally set similarity index" msgstr "detektera namnändringar, möjligen sätt likhetsindex" -#: builtin/commit.c:1538 +#: builtin/commit.c:1537 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:1620 +#: builtin/commit.c:1619 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1621 +#: builtin/commit.c:1620 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1623 +#: builtin/commit.c:1622 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456 +#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1625 +#: builtin/commit.c:1624 msgid "author" msgstr "författare" -#: builtin/commit.c:1625 +#: builtin/commit.c:1624 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1626 builtin/gc.c:551 +#: builtin/commit.c:1625 builtin/gc.c:551 msgid "date" msgstr "datum" -#: builtin/commit.c:1626 +#: builtin/commit.c:1625 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635 -#: parse-options.h:329 ref-filter.h:89 +#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634 +#: parse-options.h:360 ref-filter.h:89 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1628 +#: builtin/commit.c:1627 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1629 +#: builtin/commit.c:1628 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. #. -#: builtin/commit.c:1634 +#: builtin/commit.c:1633 msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]incheckning" -#: builtin/commit.c:1634 +#: builtin/commit.c:1633 msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa/omformulera angiven " "incheckning" -#: builtin/commit.c:1635 +#: builtin/commit.c:1634 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:1636 +#: builtin/commit.c:1635 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:1637 builtin/interpret-trailers.c:111 +#: builtin/commit.c:1636 builtin/interpret-trailers.c:111 msgid "trailer" msgstr "släprad" -#: builtin/commit.c:1637 +#: builtin/commit.c:1636 msgid "add custom trailer(s)" msgstr "använd skräddarsydd(a) släprad(er)" -#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306 +#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306 #: builtin/pull.c:146 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "lägg till Signed-off-by-släprad" -#: builtin/commit.c:1639 +#: builtin/commit.c:1638 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1640 +#: builtin/commit.c:1639 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1642 +#: builtin/commit.c:1641 msgid "include status in commit message template" msgstr "ta med status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1647 +#: builtin/commit.c:1646 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1648 +#: builtin/commit.c:1647 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1649 +#: builtin/commit.c:1648 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1650 +#: builtin/commit.c:1649 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1651 +#: builtin/commit.c:1650 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1652 +#: builtin/commit.c:1651 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1653 +#: builtin/commit.c:1652 msgid "bypass pre-commit and commit-msg hooks" msgstr "förbigå pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1654 +#: builtin/commit.c:1653 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1667 +#: builtin/commit.c:1666 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1668 +#: builtin/commit.c:1667 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1675 +#: builtin/commit.c:1674 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1677 +#: builtin/commit.c:1676 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1753 +#: builtin/commit.c:1752 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1760 +#: builtin/commit.c:1759 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1781 +#: builtin/commit.c:1780 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1788 +#: builtin/commit.c:1787 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1793 +#: builtin/commit.c:1792 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1804 +#: builtin/commit.c:1803 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "Avbryter på grund av tom incheckningsmeddelandekropp.\n" -#: builtin/commit.c:1840 +#: builtin/commit.c:1839 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -14310,6 +14673,10 @@ msgstr "hitta färginställningen: slot [stdout-is-tty]" msgid "Type" msgstr "Typ" +#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97 +msgid "type" +msgstr "typ" + #: builtin/config.c:154 builtin/env--helper.c:43 msgid "value is given this type" msgstr "värdet har givits denna typ" @@ -14521,10 +14888,6 @@ msgstr "" msgid "no such section: %s" msgstr "ingen sådan sektion: %s" -#: builtin/count-objects.c:90 -msgid "git count-objects [-v] [-H | --human-readable]" -msgstr "git count-objects [-v] [-H | --human-readable]" - #: builtin/count-objects.c:100 msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" @@ -14693,7 +15056,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:570 builtin/name-rev.c:544 +#: builtin/describe.c:570 builtin/name-rev.c:595 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" @@ -14741,7 +15104,7 @@ msgstr "%s...%s: ingen sammanslagningsbas" msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:537 builtin/grep.c:698 +#: builtin/diff.c:537 builtin/grep.c:700 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." @@ -14860,11 +15223,11 @@ msgstr "sändes till \"diff\"" msgid "difftool requires worktree or --no-index" msgstr "difftool kräver en arbetskatalog eller --no-index" -#: builtin/difftool.c:744 +#: builtin/difftool.c:745 msgid "no <tool> given for --tool=<tool>" msgstr "inget <verktyg> angavs för --tool=<verktyg>" -#: builtin/difftool.c:751 +#: builtin/difftool.c:752 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "inget <kommando> angavs för --extcmd=<kommando>" @@ -14872,10 +15235,6 @@ msgstr "inget <kommando> angavs för --extcmd=<kommando>" msgid "git env--helper --type=[bool|ulong] <options> <env-var>" msgstr "git env--helper --type=[bool|ulong] <flaggor> <miljövariabel>" -#: builtin/env--helper.c:42 builtin/hash-object.c:96 -msgid "type" -msgstr "typ" - #: builtin/env--helper.c:46 msgid "default for git_env_*(...) to fall back on" msgstr "standard för git_env_*(...) att falla tillbaka på" @@ -14901,8 +15260,8 @@ msgstr "" "\", inte \"%s\"" #: builtin/fast-export.c:29 -msgid "git fast-export [rev-list-opts]" -msgstr "git fast-export [rev-list-flaggor]" +msgid "git fast-export [<rev-list-opts>]" +msgstr "git fast-export [<rev-list-flaggor>]" #: builtin/fast-export.c:843 msgid "Error: Cannot export nested tags unless --mark-tags is specified." @@ -14956,7 +15315,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:1196 builtin/log.c:1841 +#: builtin/fast-export.c:1196 builtin/log.c:1860 msgid "refspec" msgstr "referensspecifikation" @@ -14988,36 +15347,36 @@ msgstr "visa ursprungliga objekt-id för blobbar/incheckningar" msgid "label tags with mark ids" msgstr "märk taggar med märke-id" -#: builtin/fast-import.c:3090 +#: builtin/fast-import.c:3097 #, c-format msgid "Missing from marks for submodule '%s'" msgstr "Saknar från-märken för undermodulen \"%s\"" -#: builtin/fast-import.c:3092 +#: builtin/fast-import.c:3099 #, c-format msgid "Missing to marks for submodule '%s'" msgstr "Saknar till-märken för undermodulen \"%s\"" -#: builtin/fast-import.c:3227 +#: builtin/fast-import.c:3234 #, c-format msgid "Expected 'mark' command, got %s" msgstr "Förväntade \"mark\"-kommando, fick %s" -#: builtin/fast-import.c:3232 +#: builtin/fast-import.c:3239 #, c-format msgid "Expected 'to' command, got %s" msgstr "Förväntade \"to\"-kommando, fick %s" -#: builtin/fast-import.c:3324 +#: builtin/fast-import.c:3331 msgid "Expected format name:filename for submodule rewrite option" msgstr "Förvändae formatet namn:filnamn för undermodul-omskrivningsflaggan" -#: builtin/fast-import.c:3379 +#: builtin/fast-import.c:3386 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "funktionen \"%s\" förbjuden i indata utan --allow-unsafe-features" -#: builtin/fetch-pack.c:242 +#: builtin/fetch-pack.c:246 #, c-format msgid "Lockfile created but not reported: %s" msgstr "Låsfil skapad men inte rapporterad: %s" @@ -15038,103 +15397,107 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:123 +#: builtin/fetch.c:124 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel kan inte vara negativt" -#: builtin/fetch.c:146 builtin/pull.c:189 +#: builtin/fetch.c:147 builtin/pull.c:189 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:148 builtin/pull.c:249 +#: builtin/fetch.c:149 builtin/pull.c:249 msgid "set upstream for git pull/fetch" msgstr "ställ in uppström för git pull/fetch" -#: builtin/fetch.c:150 builtin/pull.c:192 +#: builtin/fetch.c:151 builtin/pull.c:192 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:152 +#: builtin/fetch.c:153 msgid "use atomic transaction to update references" msgstr "använd atomiska transaktioner för att uppdatera referenser" -#: builtin/fetch.c:154 builtin/pull.c:195 +#: builtin/fetch.c:155 builtin/pull.c:195 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:155 +#: builtin/fetch.c:156 msgid "force overwrite of local reference" msgstr "tvinga överskrivning av lokal referens" -#: builtin/fetch.c:157 +#: builtin/fetch.c:158 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:159 builtin/pull.c:199 +#: builtin/fetch.c:160 builtin/pull.c:199 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:161 +#: builtin/fetch.c:162 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:163 +#: builtin/fetch.c:164 msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:165 +#: builtin/fetch.c:166 msgid "modify the refspec to place all refs within refs/prefetch/" msgstr "" "modifiera referensspecifikationen så att alla referenser hamnar i refs/" "prefetch/" -#: builtin/fetch.c:167 builtin/pull.c:202 +#: builtin/fetch.c:168 builtin/pull.c:202 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:169 +#: builtin/fetch.c:170 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:170 builtin/fetch.c:195 builtin/pull.c:123 +#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:171 +#: builtin/fetch.c:172 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:176 +#: builtin/fetch.c:177 msgid "write fetched references to the FETCH_HEAD file" msgstr "skriv hämtade referenser till FETCH_HEAD-filen" -#: builtin/fetch.c:177 builtin/pull.c:210 +#: builtin/fetch.c:178 builtin/pull.c:210 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:179 +#: builtin/fetch.c:180 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213 +#: builtin/fetch.c:183 builtin/fetch.c:189 builtin/pull.c:213 #: builtin/pull.c:222 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:184 builtin/pull.c:216 +#: builtin/fetch.c:185 builtin/pull.c:216 msgid "deepen history of shallow repository based on time" msgstr "fördjupa historik för grund klon baserad på tid" -#: builtin/fetch.c:190 builtin/pull.c:225 +#: builtin/fetch.c:191 builtin/pull.c:225 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:193 +#: builtin/fetch.c:194 +msgid "re-fetch without negotiating common commits" +msgstr "hämta om utan att förhandla om gemensamma incheckningar" + +#: builtin/fetch.c:197 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:196 +#: builtin/fetch.c:200 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -15142,106 +15505,101 @@ msgstr "" "standard för rekursiv hämtning av undermoduler (lägre prioritet än " "konfigurationsfiler)" -#: builtin/fetch.c:200 builtin/pull.c:228 +#: builtin/fetch.c:204 builtin/pull.c:228 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:201 builtin/pull.c:230 +#: builtin/fetch.c:205 builtin/pull.c:230 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:202 builtin/pull.c:231 +#: builtin/fetch.c:206 builtin/pull.c:231 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:209 builtin/pull.c:244 +#: builtin/fetch.c:213 builtin/pull.c:244 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:211 +#: builtin/fetch.c:215 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "hämta inte paketfil; skriv istället förfäder till förhandlingstips" -#: builtin/fetch.c:214 builtin/fetch.c:216 +#: builtin/fetch.c:218 builtin/fetch.c:220 msgid "run 'maintenance --auto' after fetching" msgstr "kör \"maintenance --auto\" efter hämtning" -#: builtin/fetch.c:218 builtin/pull.c:247 +#: builtin/fetch.c:222 builtin/pull.c:247 msgid "check for forced-updates on all updated branches" msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar" -#: builtin/fetch.c:220 +#: builtin/fetch.c:224 msgid "write the commit-graph after fetching" msgstr "skriv incheckingsgrafen efter hämtning" -#: builtin/fetch.c:222 +#: builtin/fetch.c:226 msgid "accept refspecs from stdin" msgstr "ta emot referenser från standard in" -#: builtin/fetch.c:592 +#: builtin/fetch.c:618 msgid "couldn't find remote ref HEAD" msgstr "kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:766 -#, 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:867 +#: builtin/fetch.c:893 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:871 +#: builtin/fetch.c:897 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973 +#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:885 +#: builtin/fetch.c:911 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:886 +#: builtin/fetch.c:912 msgid "checked out in another worktree" msgstr "utcheckat i en annan arbetskatalog" -#: builtin/fetch.c:896 +#: builtin/fetch.c:922 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956 -#: builtin/fetch.c:968 +#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982 +#: builtin/fetch.c:994 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:901 +#: builtin/fetch.c:927 msgid "would clobber existing tag" msgstr "skulle skriva över befintlig tagg" -#: builtin/fetch.c:923 +#: builtin/fetch.c:949 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:926 +#: builtin/fetch.c:952 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:929 +#: builtin/fetch.c:955 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:968 +#: builtin/fetch.c:994 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:973 +#: builtin/fetch.c:999 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:1076 +#: builtin/fetch.c:1102 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" @@ -15252,7 +15610,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:1080 +#: builtin/fetch.c:1106 #, c-format msgid "" "it took %.2f seconds to check forced updates; you can use\n" @@ -15265,22 +15623,22 @@ msgstr "" "showForcedUpdates\n" "false\" för att undvika testet\n" -#: builtin/fetch.c:1112 +#: builtin/fetch.c:1136 #, 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:1141 +#: builtin/fetch.c:1156 #, c-format msgid "rejected %s because shallow roots are not allowed to be updated" msgstr "avvisade %s då grunda rötter inte tillåts uppdateras" -#: builtin/fetch.c:1231 builtin/fetch.c:1379 +#: builtin/fetch.c:1259 builtin/fetch.c:1418 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:1252 +#: builtin/fetch.c:1269 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -15289,49 +15647,49 @@ 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:1349 +#: builtin/fetch.c:1377 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:1350 +#: builtin/fetch.c:1378 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:1382 +#: builtin/fetch.c:1421 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:1383 builtin/remote.c:1128 +#: builtin/fetch.c:1422 builtin/remote.c:1153 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:1405 +#: builtin/fetch.c:1446 #, c-format msgid "refusing to fetch into branch '%s' checked out at '%s'" msgstr "vägrar hämta till grenen \"%s\" som är utcheckad på \"%s\"" -#: builtin/fetch.c:1425 +#: builtin/fetch.c:1466 #, c-format msgid "option \"%s\" value \"%s\" is not valid for %s" msgstr "flaggan \"%s\" med värdet \"%s\" är inte giltigt för %s" -#: builtin/fetch.c:1428 +#: builtin/fetch.c:1469 #, c-format msgid "option \"%s\" is ignored for %s\n" msgstr "flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1455 +#: builtin/fetch.c:1496 #, c-format msgid "the object %s does not exist" msgstr "objektet %s finns inte" -#: builtin/fetch.c:1643 +#: builtin/fetch.c:1748 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream" -#: builtin/fetch.c:1655 +#: builtin/fetch.c:1760 #, c-format msgid "" "could not set upstream of HEAD to '%s' from '%s' when it does not point to " @@ -15340,19 +15698,19 @@ msgstr "" "kunde inte sätta uppström för HEAD till \"%s\" från \"%s\" när det inte " "pekar mot någon gren." -#: builtin/fetch.c:1668 +#: builtin/fetch.c:1773 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:1670 +#: builtin/fetch.c:1775 msgid "not setting upstream for a remote tag" msgstr "ställer inte in uppström för en fjärrtag" -#: builtin/fetch.c:1672 +#: builtin/fetch.c:1777 msgid "unknown branch type" msgstr "okänd grentyp" -#: builtin/fetch.c:1674 +#: builtin/fetch.c:1779 msgid "" "no source branch found;\n" "you need to specify exactly one branch with the --set-upstream option" @@ -15360,22 +15718,22 @@ msgstr "" "hittade ingen källgren;\n" "du måste ange exakt en gren med flaggan --set-upstream" -#: builtin/fetch.c:1804 builtin/fetch.c:1867 +#: builtin/fetch.c:1904 builtin/fetch.c:1967 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1814 builtin/fetch.c:1869 +#: builtin/fetch.c:1914 builtin/fetch.c:1969 #, c-format msgid "could not fetch %s" msgstr "kunde inte hämta %s" -#: builtin/fetch.c:1826 +#: builtin/fetch.c:1926 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "kunde inte hämta \"%s\" (felkod: %d)\n" -#: builtin/fetch.c:1930 +#: builtin/fetch.c:2030 msgid "" "no remote repository specified; please specify either a URL or a\n" "remote name from which new revisions should be fetched" @@ -15383,48 +15741,48 @@ msgstr "" "inget fjärrarkiv angavs; ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar ska hämtas från" -#: builtin/fetch.c:1966 +#: builtin/fetch.c:2066 msgid "you need to specify a tag name" msgstr "du måste ange namnet på en tagg" -#: builtin/fetch.c:2032 -msgid "--negotiate-only needs one or more --negotiate-tip=*" -msgstr "--negotiate-only behöver en eller flera --negotiate-tip=*" +#: builtin/fetch.c:2156 +msgid "--negotiate-only needs one or more --negotiation-tip=*" +msgstr "--negotiate-only behöver en eller flera --negotiation-tip=*" -#: builtin/fetch.c:2036 +#: builtin/fetch.c:2160 msgid "negative depth in --deepen is not supported" msgstr "negativa djup stöds inte i --deepen" -#: builtin/fetch.c:2045 +#: builtin/fetch.c:2169 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:2062 +#: builtin/fetch.c:2186 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:2064 +#: builtin/fetch.c:2188 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:2073 +#: builtin/fetch.c:2197 #, c-format msgid "no such remote or remote group: %s" msgstr "fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:2081 +#: builtin/fetch.c:2205 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:2097 +#: builtin/fetch.c:2221 msgid "must supply remote when using --negotiate-only" msgstr "måste ange fjärr när --negotiate-only anges" -#: builtin/fetch.c:2102 +#: builtin/fetch.c:2226 msgid "protocol does not support --negotiate-only, exiting" msgstr "protokollet stöder inte --negotiate-only, avslutar" -#: builtin/fetch.c:2121 +#: builtin/fetch.c:2246 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -15432,11 +15790,11 @@ msgstr "" "--filter kan endast användas med fjärren konfigurerad i extensions." "partialclone" -#: builtin/fetch.c:2125 +#: builtin/fetch.c:2250 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic kan bara användas vid hämtning från en fjärr" -#: builtin/fetch.c:2129 +#: builtin/fetch.c:2254 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin kan bara användas vid hämtning fårn en fjärr" @@ -15508,7 +15866,7 @@ msgstr "citera platshållare passande för Tcl" msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:42 builtin/tag.c:481 +#: builtin/for-each-ref.c:42 builtin/tag.c:482 msgid "respect format colors" msgstr "använd formatfärger" @@ -15704,7 +16062,7 @@ msgstr "Kontrollerar objektkataloger" msgid "Checking %s link" msgstr "Kontrollerar %s-länk" -#: builtin/fsck.c:710 builtin/index-pack.c:859 +#: builtin/fsck.c:710 builtin/index-pack.c:862 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" @@ -15775,7 +16133,7 @@ msgstr "ta även hänsyn till paket och supplerande objekt" msgid "check only connectivity" msgstr "kontrollera endast konnektivitet" -#: builtin/fsck.c:798 builtin/mktag.c:76 +#: builtin/fsck.c:798 builtin/mktag.c:75 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" @@ -15805,6 +16163,118 @@ msgstr "%s: objekt saknas" msgid "invalid parameter: expected sha1, got '%s'" msgstr "ogiltig parameter: förväntade sha1, fick \"%s\"" +#: builtin/fsmonitor--daemon.c:13 +msgid "git fsmonitor--daemon start [<options>]" +msgstr "git fsmonitor--daemon start [<flaggor>]" + +#: builtin/fsmonitor--daemon.c:14 +msgid "git fsmonitor--daemon run [<options>]" +msgstr "git fsmonitor--daemon run [<flaggor>]" + +#: builtin/fsmonitor--daemon.c:15 +msgid "git fsmonitor--daemon stop" +msgstr "git fsmonitor--daemon stop" + +#: builtin/fsmonitor--daemon.c:16 +msgid "git fsmonitor--daemon status" +msgstr "git fsmonitor--daemon status" + +#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47 +#, c-format +msgid "value of '%s' out of range: %d" +msgstr "värdet för \"%s\" utanför intervallet: %d" + +#: builtin/fsmonitor--daemon.c:57 +#, c-format +msgid "value of '%s' not bool or int: %d" +msgstr "värdet för \"%s\" är inte bool eller int: %d" + +#: builtin/fsmonitor--daemon.c:99 +#, c-format +msgid "fsmonitor-daemon is watching '%s'\n" +msgstr "fsmonitor-daemon bevakar \"%s\"\n" + +#: builtin/fsmonitor--daemon.c:104 +#, c-format +msgid "fsmonitor-daemon is not watching '%s'\n" +msgstr "fsmonitor-daemon bevakar inte \"%s\"\n" + +#: builtin/fsmonitor--daemon.c:170 +#, c-format +msgid "could not create fsmonitor cookie '%s'" +msgstr "kunde inte skapa fsmonitor-kaka \"%s\"" + +#: builtin/fsmonitor--daemon.c:753 +#, c-format +msgid "fsmonitor: cookie_result '%d' != SEEN" +msgstr "fsmonitor: cookie_result '%d' != SEEN" + +#: builtin/fsmonitor--daemon.c:1187 +#, c-format +msgid "could not start IPC thread pool on '%s'" +msgstr "kunde inte starta IPC-trådpol på \"%s\"" + +#: builtin/fsmonitor--daemon.c:1199 +msgid "could not start fsmonitor listener thread" +msgstr "kunde inte starta fsmonitor-lyssnartråd" + +#: builtin/fsmonitor--daemon.c:1297 +msgid "could not initialize listener thread" +msgstr "kunde inte initiera lyssnartråd" + +#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383 +#, c-format +msgid "fsmonitor--daemon is already running '%s'" +msgstr "fsmonitor--daemon körs redan på \"%s\"" + +#: builtin/fsmonitor--daemon.c:1332 +#, c-format +msgid "running fsmonitor-daemon in '%s'\n" +msgstr "kör fsmonitor-daemon i \"%s\"\n" + +#: builtin/fsmonitor--daemon.c:1387 +#, c-format +msgid "starting fsmonitor-daemon in '%s'\n" +msgstr "startar fsmonitor-daemon i \"%s\"\n" + +#: builtin/fsmonitor--daemon.c:1413 +msgid "daemon failed to start" +msgstr "serverprocessen kunde inte startas" + +#: builtin/fsmonitor--daemon.c:1416 +msgid "daemon not online yet" +msgstr "serverprocessen ännu inte operativ" + +#: builtin/fsmonitor--daemon.c:1419 +msgid "daemon terminated" +msgstr "serverprocessen avslutades" + +#: builtin/fsmonitor--daemon.c:1429 +msgid "detach from console" +msgstr "koppla från konsolen" + +#: builtin/fsmonitor--daemon.c:1432 +msgid "use <n> ipc worker threads" +msgstr "använd <n> ipc-jobbtrådar" + +#: builtin/fsmonitor--daemon.c:1435 +msgid "max seconds to wait for background daemon startup" +msgstr "max sekunder att vänta på att serverprocessen startar" + +#: builtin/fsmonitor--daemon.c:1449 +#, c-format +msgid "invalid 'ipc-threads' value (%d)" +msgstr "ogiltigt värde för \"ipc-threads\" (%d)" + +#: builtin/fsmonitor--daemon.c:1464 +#, c-format +msgid "Unhandled subcommand '%s'" +msgstr "Ej hanterat underkommando \"%s\"" + +#: builtin/fsmonitor--daemon.c:1477 +msgid "fsmonitor--daemon not supported on this platform" +msgstr "fsmonitor--daemon stöds inte på denna plattform" + #: builtin/gc.c:39 msgid "git gc [<options>]" msgstr "git gc [<flaggor>]" @@ -16053,8 +16523,8 @@ msgstr "misslyckades starta systemctl" msgid "failed to run systemctl" msgstr "misslyckades att köra systemctl" -#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62 -#: builtin/worktree.c:944 +#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63 +#: builtin/worktree.c:1024 #, c-format msgid "failed to delete '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -16102,16 +16572,16 @@ msgstr "git maintenance <underkommando> [<flaggor>]" msgid "invalid subcommand: %s" msgstr "felaktigt underkommando: %s" -#: builtin/grep.c:30 +#: builtin/grep.c:32 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]" -#: builtin/grep.c:239 +#: builtin/grep.c:241 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: misslyckades skapa tråd. %s" -#: builtin/grep.c:293 +#: builtin/grep.c:295 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "felaktigt antal trådar angivet (%d) för %s" @@ -16120,258 +16590,250 @@ msgstr "felaktigt antal trådar angivet (%d) för %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785 -#: builtin/pack-objects.c:3142 +#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791 +#: builtin/pack-objects.c:3150 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657 +#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:672 +#: builtin/grep.c:674 #, c-format msgid "unable to grep from object of type %s" msgstr "kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:752 +#: builtin/grep.c:754 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:851 +#: builtin/grep.c:852 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:853 +#: builtin/grep.c:854 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:855 +#: builtin/grep.c:856 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:857 +#: builtin/grep.c:858 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:859 +#: builtin/grep.c:860 msgid "recursively search in each submodule" msgstr "sök varje undermodul rekursivt" -#: builtin/grep.c:862 +#: builtin/grep.c:863 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:864 +#: builtin/grep.c:865 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:866 +#: builtin/grep.c:867 msgid "match patterns only at word boundaries" msgstr "träffa endast mönster vid ordgränser" -#: builtin/grep.c:868 +#: builtin/grep.c:869 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:870 +#: builtin/grep.c:871 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:873 +#: builtin/grep.c:874 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:875 +#: builtin/grep.c:876 msgid "search in subdirectories (default)" msgstr "sök i underkataloger (standard)" -#: builtin/grep.c:877 +#: builtin/grep.c:878 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:881 +#: builtin/grep.c:882 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:884 +#: builtin/grep.c:885 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:887 +#: builtin/grep.c:888 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:890 +#: builtin/grep.c:891 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:893 +#: builtin/grep.c:894 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:894 +#: builtin/grep.c:895 msgid "show column number of first match" msgstr "visa kolumnnummer för första träff" -#: builtin/grep.c:895 +#: builtin/grep.c:896 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:896 +#: builtin/grep.c:897 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:898 +#: builtin/grep.c:899 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:900 +#: builtin/grep.c:901 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:902 +#: builtin/grep.c:903 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:905 +#: builtin/grep.c:906 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:907 +#: builtin/grep.c:908 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:910 +#: builtin/grep.c:911 msgid "show only matching parts of a line" msgstr "visa endast träffade delar av rader" -#: builtin/grep.c:912 +#: builtin/grep.c:913 msgid "show the number of matches instead of matching lines" msgstr "visa antal träffar istället för träffade rader" -#: builtin/grep.c:913 +#: builtin/grep.c:914 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:915 +#: builtin/grep.c:916 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:917 +#: builtin/grep.c:918 msgid "show filename only once above matches from same file" msgstr "visa filnamn endast en gång ovanför träffar från samma fil" -#: builtin/grep.c:920 +#: builtin/grep.c:921 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:923 +#: builtin/grep.c:924 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:925 +#: builtin/grep.c:926 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:927 +#: builtin/grep.c:928 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:928 +#: builtin/grep.c:929 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:931 +#: builtin/grep.c:932 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:933 +#: builtin/grep.c:934 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:936 +#: builtin/grep.c:937 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:938 +#: builtin/grep.c:939 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:940 +#: builtin/grep.c:941 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:952 +#: builtin/grep.c:953 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:954 +#: builtin/grep.c:955 msgid "show only matches from files that match all patterns" msgstr "visa endast träffar från filer som träffar alla mönster" -#: builtin/grep.c:957 +#: builtin/grep.c:958 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:957 +#: builtin/grep.c:958 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:961 +#: builtin/grep.c:962 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:1027 +#: builtin/grep.c:1028 msgid "no pattern given" msgstr "inget mönster angavs" -#: builtin/grep.c:1063 +#: builtin/grep.c:1064 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index och --untracked kan inte användas med revisioner" -#: builtin/grep.c:1071 +#: builtin/grep.c:1072 #, c-format msgid "unable to resolve revision: %s" msgstr "kan inte slå upp revision: %s" -#: builtin/grep.c:1101 +#: builtin/grep.c:1102 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked stöds inte med --recurse-submodules" -#: builtin/grep.c:1105 +#: builtin/grep.c:1106 msgid "invalid option combination, ignoring --threads" msgstr "ogiltig kombination av flaggor, ignorerar --threads" -#: builtin/grep.c:1108 builtin/pack-objects.c:4059 +#: builtin/grep.c:1109 builtin/pack-objects.c:4084 msgid "no threads support, ignoring --threads" msgstr "trådstöd saknas, ignorerar --threads" -#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139 +#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:1145 +#: builtin/grep.c:1146 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1171 -msgid "--cached or --untracked cannot be used with --no-index" -msgstr "--cached och --untracked kan inte användas med --no-index" - -#: builtin/grep.c:1174 -msgid "--untracked cannot be used with --cached" -msgstr "--untracked kan inte användas med --cached" - -#: builtin/grep.c:1180 +#: builtin/grep.c:1179 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll" -#: builtin/grep.c:1188 +#: builtin/grep.c:1187 msgid "both --cached and trees are given" msgstr "både --cached och träd angavs" @@ -16383,108 +16845,100 @@ msgstr "" "git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] " "<fil>..." -#: builtin/hash-object.c:84 -msgid "git hash-object --stdin-paths" -msgstr "git hash-object --stdin-paths" - -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "object type" msgstr "objekttyp" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:98 msgid "write the object into the object database" msgstr "skriv objektet till objektdatabasen" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "read the object from stdin" msgstr "läs objektet från standard in" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:102 msgid "store file as is without filters" msgstr "spara filen som den är utan filer" -#: builtin/hash-object.c:102 +#: builtin/hash-object.c:103 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "hasha slumpmässigt skräp för att skapa korrupta objekt för felsökning av Git" -#: builtin/hash-object.c:103 +#: builtin/hash-object.c:104 msgid "process file as it were from this path" msgstr "hantera filen som om den kom från sökvägen" -#: builtin/help.c:55 +#: builtin/help.c:57 msgid "print all available commands" msgstr "visa alla tillgängliga kommandon" -#: builtin/help.c:57 +#: builtin/help.c:60 +msgid "show external commands in --all" +msgstr "visa externa kommandon i --all" + +#: builtin/help.c:61 +msgid "show aliases in --all" +msgstr "visa alias i --all" + +#: builtin/help.c:62 msgid "exclude guides" msgstr "uteslut vägledningar" -#: builtin/help.c:58 +#: builtin/help.c:63 msgid "show man page" msgstr "visa manualsida" -#: builtin/help.c:59 +#: builtin/help.c:64 msgid "show manual in web browser" msgstr "visa manual i webbläsare" -#: builtin/help.c:61 +#: builtin/help.c:66 msgid "show info page" msgstr "visa info-sida" -#: builtin/help.c:63 +#: builtin/help.c:68 msgid "print command description" msgstr "visa kommandobeskrivning" -#: builtin/help.c:65 +#: builtin/help.c:70 msgid "print list of useful guides" msgstr "lista användbara vägledningar" -#: builtin/help.c:67 +#: builtin/help.c:72 msgid "print all configuration variable names" msgstr "visa namn på alla konfigurationsvariabler" -#: builtin/help.c:78 -msgid "" -"git help [-a|--all] [--[no-]verbose]]\n" -" [[-i|--info] [-m|--man] [-w|--web]] [<command>]" -msgstr "" -"git help [-a|--all] [--[no-]verbose]]\n" -" [[-i|--info] [-m|--man] [-w|--web]] [<kommando>]" - -#: builtin/help.c:80 -msgid "git help [-g|--guides]" -msgstr "git help [-g|--guides]" +#: builtin/help.c:84 +msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]" +msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<kommando>]" -#: builtin/help.c:81 -msgid "git help [-c|--config]" -msgstr "git help [-c|--config]" - -#: builtin/help.c:196 +#: builtin/help.c:201 #, c-format msgid "unrecognized help format '%s'" msgstr "okänt hjälpformat: \"%s\"" -#: builtin/help.c:222 +#: builtin/help.c:227 msgid "Failed to start emacsclient." msgstr "Misslyckades starta emacsclient." -#: builtin/help.c:235 +#: builtin/help.c:240 msgid "Failed to parse emacsclient version." msgstr "Kunde inte tolka emacsclient-version." -#: builtin/help.c:243 +#: builtin/help.c:248 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient version \"%d\" för gammal (< 22)." -#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301 +#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306 #, c-format msgid "failed to exec '%s'" msgstr "exec misslyckades för \"%s\"" -#: builtin/help.c:339 +#: builtin/help.c:344 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -16493,7 +16947,7 @@ msgstr "" "\"%s\": sökväg för man-visare som ej stöds.\n" "Använd \"man.<verktyg>.cmd\" istället." -#: builtin/help.c:351 +#: builtin/help.c:356 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -16502,42 +16956,58 @@ msgstr "" "\"%s\": kommando för man-visare som stöds.\n" "Använd \"man.<verktyg>.path\" istället." -#: builtin/help.c:466 +#: builtin/help.c:471 #, c-format msgid "'%s': unknown man viewer." msgstr "\"%s\": okänd man-visare." -#: builtin/help.c:482 +#: builtin/help.c:487 msgid "no man viewer handled the request" msgstr "ingen man-visare hanterade förfrågan" -#: builtin/help.c:489 +#: builtin/help.c:494 msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:550 builtin/help.c:561 git.c:348 +#: builtin/help.c:555 builtin/help.c:566 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "\"%s\" är ett alias för \"%s\"" -#: builtin/help.c:564 git.c:380 +#: builtin/help.c:569 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "felaktig alias.%s-sträng: %s" -#: builtin/help.c:580 -msgid "this option doesn't take any other arguments" -msgstr "flaggan tar inte några andra argument" +#: builtin/help.c:611 +#, c-format +msgid "the '%s' option doesn't take any non-option arguments" +msgstr "flaggan \"%s\" tar inte några argument som inte är flaggor" -#: builtin/help.c:601 builtin/help.c:628 +#: builtin/help.c:631 +msgid "" +"the '--no-[external-commands|aliases]' options can only be used with '--all'" +msgstr "" +"flaggorna '--no-[external-commands|aliases]' kan endast användas med \"--all" +"\"" + +#: builtin/help.c:643 builtin/help.c:671 #, c-format msgid "usage: %s%s" msgstr "användning: %s%s" -#: builtin/help.c:623 +#: builtin/help.c:666 msgid "'git help config' for more information" msgstr "\"git help config\" för mer information" +#: builtin/hook.c:10 +msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]" +msgstr "git hook run [--ignore-missing] <krok-namn> [-- <krok-argument>]" + +#: builtin/hook.c:30 +msgid "silently ignore missing requested <hook-name>" +msgstr "ignorera tyst om önskat <krok-namn> saknas" + #: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" @@ -16572,244 +17042,245 @@ msgstr "indataläsfel" msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:324 builtin/pack-objects.c:756 +#: builtin/index-pack.c:324 builtin/pack-objects.c:754 msgid "pack too large for current definition of off_t" msgstr "paket för stort för nuvarande definition av off_t" -#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 -msgid "pack exceeds maximum allowed size" -msgstr "paket är större än tillåten maximal storlek" +#: builtin/index-pack.c:329 +#, c-format +msgid "pack exceeds maximum allowed size (%s)" +msgstr "paket är större än tillåten maximal storlek (%s)" -#: builtin/index-pack.c:358 +#: builtin/index-pack.c:362 msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" -#: builtin/index-pack.c:360 +#: builtin/index-pack.c:364 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stöds ej" -#: builtin/index-pack.c:376 +#: builtin/index-pack.c:380 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s" -#: builtin/index-pack.c:482 +#: builtin/index-pack.c:485 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:534 msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" -#: builtin/index-pack.c:539 +#: builtin/index-pack.c:542 msgid "delta base offset is out of bound" msgstr "deltabasindex utanför gränsen" -#: builtin/index-pack.c:547 +#: builtin/index-pack.c:550 #, c-format msgid "unknown object type %d" msgstr "okänd objekttyp %d" -#: builtin/index-pack.c:578 +#: builtin/index-pack.c:581 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: builtin/index-pack.c:580 +#: builtin/index-pack.c:583 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" -#: builtin/index-pack.c:606 +#: builtin/index-pack.c:609 msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781 -#: builtin/index-pack.c:820 builtin/index-pack.c:829 +#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784 +#: builtin/index-pack.c:823 builtin/index-pack.c:832 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:754 builtin/pack-objects.c:292 -#: builtin/pack-objects.c:352 builtin/pack-objects.c:458 +#: builtin/index-pack.c:757 builtin/pack-objects.c:290 +#: builtin/pack-objects.c:350 builtin/pack-objects.c:456 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:818 +#: builtin/index-pack.c:821 #, c-format msgid "cannot read existing object info %s" msgstr "kan inte läsa information om befintligt objekt %s" -#: builtin/index-pack.c:826 +#: builtin/index-pack.c:829 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:840 +#: builtin/index-pack.c:843 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:843 builtin/index-pack.c:862 +#: builtin/index-pack.c:846 builtin/index-pack.c:865 msgid "fsck error in packed object" msgstr "fsck-fel i packat objekt" -#: builtin/index-pack.c:864 +#: builtin/index-pack.c:867 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Inte alla barnobjekt för %s kan nås" -#: builtin/index-pack.c:925 builtin/index-pack.c:972 +#: builtin/index-pack.c:928 builtin/index-pack.c:975 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1156 +#: builtin/index-pack.c:1161 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1156 +#: builtin/index-pack.c:1161 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1190 +#: builtin/index-pack.c:1195 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1200 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1198 +#: builtin/index-pack.c:1203 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1210 +#: builtin/index-pack.c:1215 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1233 +#: builtin/index-pack.c:1238 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1277 +#: builtin/index-pack.c:1282 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1288 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "slutfördes med %d lokalt objekt" msgstr[1] "slutfördes med %d lokala objekt" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1300 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanskontrollsumma för %s (trasig disk?)" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1304 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paketet har %d oanalyserat delta" msgstr[1] "paketet har %d oanalyserade delta" -#: builtin/index-pack.c:1323 +#: builtin/index-pack.c:1328 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1419 +#: builtin/index-pack.c:1423 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1440 +#: builtin/index-pack.c:1445 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "paketfilnamnet \"%s\" slutar inte med \".%s\"" -#: builtin/index-pack.c:1464 +#: builtin/index-pack.c:1469 #, c-format msgid "cannot write %s file '%s'" msgstr "kan inte ta skriva %s-fil \"%s\"" -#: builtin/index-pack.c:1472 +#: builtin/index-pack.c:1477 #, c-format msgid "cannot close written %s file '%s'" msgstr "kan inte stänga skriven %s-fil \"%s\"" -#: builtin/index-pack.c:1489 +#: builtin/index-pack.c:1494 #, c-format msgid "unable to rename temporary '*.%s' file to '%s'" msgstr "kunde inte byta namn på temporär \"*.%s\"-fil till \"%s\"" -#: builtin/index-pack.c:1514 +#: builtin/index-pack.c:1519 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150 +#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1643 +#: builtin/index-pack.c:1648 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1645 +#: builtin/index-pack.c:1650 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\"" -#: builtin/index-pack.c:1693 +#: builtin/index-pack.c:1698 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "icke-delta: %d objekt" msgstr[1] "icke-delta: %d objekt" -#: builtin/index-pack.c:1700 +#: builtin/index-pack.c:1705 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "kedjelängd = %d: %lu objekt" msgstr[1] "kedjelängd = %d: %lu objekt" -#: builtin/index-pack.c:1742 +#: builtin/index-pack.c:1748 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1796 builtin/index-pack.c:1799 -#: builtin/index-pack.c:1819 builtin/index-pack.c:1823 +#: builtin/index-pack.c:1802 builtin/index-pack.c:1805 +#: builtin/index-pack.c:1825 builtin/index-pack.c:1829 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614 +#: builtin/index-pack.c:1835 builtin/init-db.c:379 builtin/init-db.c:614 #, c-format msgid "unknown hash algorithm '%s'" msgstr "okänd hashningsalgoritm \"%s\"" -#: builtin/index-pack.c:1850 +#: builtin/index-pack.c:1856 msgid "--stdin requires a git repository" msgstr "--stdin kräver ett git-arkiv" -#: builtin/index-pack.c:1867 +#: builtin/index-pack.c:1873 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" -#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584 +#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "fsck-fel i packat objekt" @@ -17018,40 +17489,40 @@ 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:59 +#: builtin/log.c:60 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" -#: builtin/log.c:60 +#: builtin/log.c:61 msgid "git show [<options>] <object>..." msgstr "git show [<flaggor>] <objekt>..." -#: builtin/log.c:113 +#: builtin/log.c:114 #, c-format msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:180 +#: builtin/log.c:181 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:181 +#: builtin/log.c:182 msgid "use mail map file" msgstr "använd e-postmappningsfil" -#: builtin/log.c:184 +#: builtin/log.c:185 msgid "only decorate refs that match <pattern>" msgstr "dekorera endast referenser som motsvarar <mönster>" -#: builtin/log.c:186 +#: builtin/log.c:187 msgid "do not decorate refs that match <pattern>" msgstr "dekorera inte referenser som motsvarar <mönster>" -#: builtin/log.c:187 +#: builtin/log.c:188 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:190 +#: builtin/log.c:191 msgid "" "trace the evolution of line range <start>,<end> or function :<funcname> in " "<file>" @@ -17059,89 +17530,93 @@ msgstr "" "spåra utvecklingen av radintervallet <start>,<slut> eller funktionen :" "<funknamn> i <fil>" -#: builtin/log.c:213 +#: builtin/log.c:214 msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<intervall>:<fil> kan inte användas med sökvägsspecifikation" -#: builtin/log.c:321 +#: builtin/log.c:322 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:586 +#: builtin/log.c:429 +msgid "unable to create temporary object directory" +msgstr "kunde inte skapa temporär objektkatalog" + +#: builtin/log.c:599 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:601 builtin/log.c:691 +#: builtin/log.c:614 builtin/log.c:706 #, c-format msgid "could not read object %s" msgstr "kunde inte läsa objektet %s" -#: builtin/log.c:716 +#: builtin/log.c:731 #, c-format msgid "unknown type: %d" msgstr "okänd typ: %d" -#: builtin/log.c:861 +#: builtin/log.c:880 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s: ogiltigt omslag från beskrivningsläge" -#: builtin/log.c:868 +#: builtin/log.c:887 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:997 +#: builtin/log.c:1016 #, c-format msgid "cannot open patch file %s" msgstr "kan inte öppna patchfilen %s" -#: builtin/log.c:1014 +#: builtin/log.c:1033 msgid "need exactly one range" msgstr "behöver precis ett intervall" -#: builtin/log.c:1024 +#: builtin/log.c:1043 msgid "not a range" msgstr "inte ett intervall" -#: builtin/log.c:1188 +#: builtin/log.c:1207 msgid "cover letter needs email format" msgstr "omslagsbrevet behöver e-postformat" -#: builtin/log.c:1194 +#: builtin/log.c:1213 msgid "failed to create cover-letter file" msgstr "misslyckades skapa fil för omslagsbrev" -#: builtin/log.c:1281 +#: builtin/log.c:1300 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1308 +#: builtin/log.c:1327 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1366 +#: builtin/log.c:1385 msgid "two output directories?" msgstr "två utdatakataloger?" -#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358 +#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383 #, c-format msgid "unknown commit %s" msgstr "okänd incheckning %s" -#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1547 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:1537 +#: builtin/log.c:1556 msgid "could not find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1547 +#: builtin/log.c:1566 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" @@ -17151,272 +17626,276 @@ 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:1570 +#: builtin/log.c:1589 msgid "failed to find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1587 +#: builtin/log.c:1606 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1597 +#: builtin/log.c:1616 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1655 +#: builtin/log.c:1674 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1718 +#: builtin/log.c:1737 msgid "failed to infer range-diff origin of current series" msgstr "misslyckades räkna ut intervalldiff-ursprung för aktuell serie" -#: builtin/log.c:1720 +#: builtin/log.c:1739 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "använd \"%s\" som intervalldiff-ursprung för aktuell serie" -#: builtin/log.c:1764 +#: builtin/log.c:1783 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:1767 +#: builtin/log.c:1786 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1771 +#: builtin/log.c:1790 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1773 +#: builtin/log.c:1792 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1775 +#: builtin/log.c:1794 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1776 +#: builtin/log.c:1795 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1777 +#: builtin/log.c:1796 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1779 +#: builtin/log.c:1798 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1780 +#: builtin/log.c:1799 msgid "reroll-count" msgstr "antal iterationer" -#: builtin/log.c:1781 +#: builtin/log.c:1800 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1783 +#: builtin/log.c:1802 msgid "max length of output filename" msgstr "maximal längd för utdatafilnamn" -#: builtin/log.c:1785 +#: builtin/log.c:1804 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "använd [RFC PATCH] istället för [PATCH]" -#: builtin/log.c:1788 +#: builtin/log.c:1807 msgid "cover-from-description-mode" msgstr "cover-from-description-läge" -#: builtin/log.c:1789 +#: builtin/log.c:1808 msgid "generate parts of a cover letter based on a branch's description" msgstr "skapa delar av omslagsbrevet baserat på grenbeskrivelsen" -#: builtin/log.c:1791 +#: builtin/log.c:1810 msgid "use [<prefix>] instead of [PATCH]" msgstr "använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1794 +#: builtin/log.c:1813 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1797 +#: builtin/log.c:1816 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1800 +#: builtin/log.c:1819 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1802 +#: builtin/log.c:1821 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1804 +#: builtin/log.c:1823 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1806 +#: builtin/log.c:1825 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1808 +#: builtin/log.c:1827 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1809 +#: builtin/log.c:1828 msgid "header" msgstr "huvud" -#: builtin/log.c:1810 +#: builtin/log.c:1829 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1811 builtin/log.c:1812 +#: builtin/log.c:1830 builtin/log.c:1831 msgid "email" msgstr "epost" -#: builtin/log.c:1811 +#: builtin/log.c:1830 msgid "add To: header" msgstr "lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1812 +#: builtin/log.c:1831 msgid "add Cc: header" msgstr "lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1813 +#: builtin/log.c:1832 msgid "ident" msgstr "ident" -#: builtin/log.c:1814 +#: builtin/log.c:1833 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:1816 +#: builtin/log.c:1835 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1817 +#: builtin/log.c:1836 msgid "make first mail a reply to <message-id>" msgstr "gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1818 builtin/log.c:1821 +#: builtin/log.c:1837 builtin/log.c:1840 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1819 +#: builtin/log.c:1838 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1822 +#: builtin/log.c:1841 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1826 +#: builtin/log.c:1845 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1828 +#: builtin/log.c:1847 msgid "signature" msgstr "signatur" -#: builtin/log.c:1829 +#: builtin/log.c:1848 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1830 +#: builtin/log.c:1849 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1831 +#: builtin/log.c:1850 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1834 +#: builtin/log.c:1853 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1835 +#: builtin/log.c:1854 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1837 +#: builtin/log.c:1856 msgid "show progress while generating patches" msgstr "visa förloppsindikator medan patchar skapas" -#: builtin/log.c:1839 +#: builtin/log.c:1858 msgid "show changes against <rev> in cover letter or single patch" msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch" -#: builtin/log.c:1842 +#: builtin/log.c:1861 msgid "show changes against <refspec> in cover letter or single patch" msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch" -#: builtin/log.c:1844 builtin/range-diff.c:28 +#: builtin/log.c:1863 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "procent som skapelse vägs med" -#: builtin/log.c:1931 +#: builtin/log.c:1953 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1956 +#: builtin/log.c:1978 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1958 +#: builtin/log.c:1980 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1960 +#: builtin/log.c:1982 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:2104 +#: builtin/log.c:1984 +msgid "--remerge-diff does not make sense" +msgstr "kan inte använda --remerge-diff" + +#: builtin/log.c:2129 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff kräver --cover-letter eller ensam patch" -#: builtin/log.c:2108 +#: builtin/log.c:2133 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:2109 +#: builtin/log.c:2134 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff mot v%d:" -#: builtin/log.c:2119 +#: builtin/log.c:2144 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff kräver --cover-letter eller ensam patch" -#: builtin/log.c:2127 +#: builtin/log.c:2152 msgid "Range-diff:" msgstr "Intervall-diff:" -#: builtin/log.c:2128 +#: builtin/log.c:2153 #, c-format msgid "Range-diff against v%d:" msgstr "Intervall-diff mot v%d:" -#: builtin/log.c:2139 +#: builtin/log.c:2164 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:2175 +#: builtin/log.c:2200 msgid "Generating patches" msgstr "Skapar patchar" -#: builtin/log.c:2219 +#: builtin/log.c:2244 msgid "failed to create output files" msgstr "misslyckades skapa utdatafiler" -#: builtin/log.c:2279 +#: builtin/log.c:2304 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:2333 +#: builtin/log.c:2358 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -17510,10 +17989,6 @@ msgstr "lägg till git:s standardexkluderingar" msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:667 -msgid "recurse through submodules" -msgstr "rekursera ner i undermoduler" - #: builtin/ls-files.c:669 msgid "if any <file> is not in the index, treat this as an error" msgstr "om en <fil> inte är indexet, betrakta det som ett fel" @@ -17552,7 +18027,7 @@ msgstr "" msgid "do not print remote URL" msgstr "visa inte fjärr-URL" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1131 msgid "exec" msgstr "exec" @@ -17584,42 +18059,70 @@ msgstr "avsluta med felkod 2 om motsvarande referenser inte hittas" msgid "show underlying ref in addition to the object pointed by it" msgstr "visa underliggande referens och objektet det pekar på" -#: builtin/ls-tree.c:30 +#: builtin/ls-tree.c:36 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:54 +#, c-format +msgid "could not get object info about '%s'" +msgstr "kunde inte hämta objektinfo om \"%s\"" + +#: builtin/ls-tree.c:79 +#, c-format +msgid "bad ls-tree format: element '%s' does not start with '('" +msgstr "felaktigt ls-tree-format: elementet \"%s\" börjar inte med \"(\"" + +#: builtin/ls-tree.c:83 +#, c-format +msgid "bad ls-tree format: element '%s' does not end in ')'" +msgstr "felaktigt ls-tree-format: elementet \"%s\" slutar inte med \")\"" + +#: builtin/ls-tree.c:109 +#, c-format +msgid "bad ls-tree format: %%%.*s" +msgstr "felaktigt ls-tree-format: %%%.*s" + +#: builtin/ls-tree.c:336 msgid "only show trees" msgstr "visa endast träd" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:338 msgid "recurse into subtrees" msgstr "rekursera ner i underträd" -#: builtin/ls-tree.c:132 +#: builtin/ls-tree.c:340 msgid "show trees when recursing" msgstr "visa träd medan rekursering" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:343 msgid "terminate entries with NUL byte" msgstr "terminera poster med NUL-byte" -#: builtin/ls-tree.c:136 +#: builtin/ls-tree.c:344 msgid "include object size" msgstr "ta med objektstorlek" -#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 +#: builtin/ls-tree.c:346 builtin/ls-tree.c:348 msgid "list only filenames" msgstr "visa endast filnamn" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:350 +msgid "list only objects" +msgstr "lista endast objekt" + +#: builtin/ls-tree.c:353 msgid "use full path names" msgstr "använd fullständiga sökvägsnamn" -#: builtin/ls-tree.c:145 +#: builtin/ls-tree.c:355 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" +#: builtin/ls-tree.c:391 +msgid "--format can't be combined with other format-altering options" +msgstr "--format kan inte kombineras med andra formatändrande flaggor" + #. TRANSLATORS: keep <> in "<" mail ">" info. #: builtin/mailinfo.c:14 msgid "git mailinfo [<options>] <msg> <patch> < mail >info" @@ -17669,7 +18172,11 @@ msgstr "åtgärd när citerad vagnretur hittas" msgid "use headers in message's body" msgstr "använd huvuden i brevkroppen" -#: builtin/mailsplit.c:239 +#: builtin/mailsplit.c:227 +msgid "reading patches from stdin/tty..." +msgstr "läser patchar från standard in/tty..." + +#: builtin/mailsplit.c:242 #, c-format msgid "empty mbox: '%s'" msgstr "tom mbox: \"%s\"" @@ -17694,23 +18201,23 @@ msgstr "git merge-base --is-ancestor <incheckning> <incheckning>" msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <ref> [<incheckning>]" -#: builtin/merge-base.c:143 +#: builtin/merge-base.c:144 msgid "output all common ancestors" msgstr "skriv ut alla gemensamma anfäder" -#: builtin/merge-base.c:145 +#: builtin/merge-base.c:146 msgid "find ancestors for a single n-way merge" msgstr "hitta anfader för enkel n-vägssammanslagning" -#: builtin/merge-base.c:147 +#: builtin/merge-base.c:148 msgid "list revs not reachable from others" msgstr "visa revisioner som inte kan nås från andra" -#: builtin/merge-base.c:149 +#: builtin/merge-base.c:150 msgid "is the first one ancestor of the other?" msgstr "är den första anfader till den andra?" -#: builtin/merge-base.c:151 +#: builtin/merge-base.c:152 msgid "find where <commit> forked from reflog of <ref>" msgstr "se var <incheckning> grenades av från referensloggen från <ref>" @@ -17859,7 +18366,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:280 builtin/notes.c:785 builtin/pull.c:172 -#: builtin/rebase.c:1117 builtin/revert.c:114 +#: builtin/rebase.c:1145 builtin/revert.c:114 msgid "strategy" msgstr "strategi" @@ -17994,73 +18501,73 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:894 +#: builtin/merge.c:900 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:909 +#: builtin/merge.c:915 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:970 +#: builtin/merge.c:976 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n" -#: builtin/merge.c:1009 +#: builtin/merge.c:1015 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:1011 +#: builtin/merge.c:1017 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:1013 +#: builtin/merge.c:1019 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:1018 +#: builtin/merge.c:1024 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Ingen fjärrspårande gren för %s från %s" -#: builtin/merge.c:1075 +#: builtin/merge.c:1081 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1177 +#: builtin/merge.c:1183 #, c-format msgid "not something we can merge in %s: %s" msgstr "inte något vi kan slå ihop med %s: %s" -#: builtin/merge.c:1211 +#: builtin/merge.c:1217 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1324 +#: builtin/merge.c:1330 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1328 +#: builtin/merge.c:1334 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1346 +#: builtin/merge.c:1352 msgid "--quit expects no arguments" msgstr "--quit tar inga argument" -#: builtin/merge.c:1359 +#: builtin/merge.c:1365 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1363 +#: builtin/merge.c:1369 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1379 +#: builtin/merge.c:1385 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -18068,7 +18575,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1386 +#: builtin/merge.c:1392 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -18076,85 +18583,81 @@ msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1389 +#: builtin/merge.c:1395 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)." -#: builtin/merge.c:1421 +#: builtin/merge.c:1427 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1438 +#: builtin/merge.c:1444 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1440 +#: builtin/merge.c:1446 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud" -#: builtin/merge.c:1445 +#: builtin/merge.c:1451 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1447 +#: builtin/merge.c:1453 msgid "Can merge only exactly one commit into empty head" msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud" -#: builtin/merge.c:1534 +#: builtin/merge.c:1540 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1553 +#: builtin/merge.c:1559 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1601 +#: builtin/merge.c:1606 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1608 +#: builtin/merge.c:1613 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1667 builtin/merge.c:1733 +#: builtin/merge.c:1671 builtin/merge.c:1737 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1671 +#: builtin/merge.c:1675 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1723 +#: builtin/merge.c:1727 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1725 +#: builtin/merge.c:1729 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1735 +#: builtin/merge.c:1739 #, c-format msgid "Using the %s strategy to prepare resolving by hand.\n" msgstr "Använder strategin %s för att förbereda lösning för hand.\n" -#: builtin/merge.c:1749 +#: builtin/merge.c:1753 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n" -#: builtin/mktag.c:10 -msgid "git mktag" -msgstr "git mktag" - #: builtin/mktag.c:27 #, c-format msgid "warning: tag input does not pass fsck: %s" @@ -18180,22 +18683,18 @@ msgstr "kunde inte läsa det taggade objektet \"%s\"" msgid "object '%s' tagged as '%s', but is a '%s' type" msgstr "objektet \"%s\" taggat som \"%s\", men är av typen \"%s\"" -#: builtin/mktag.c:98 +#: builtin/mktag.c:97 msgid "tag on stdin did not pass our strict fsck check" msgstr "tagg på stdin godkänns inte av vår strikta fsck-kontroll" -#: builtin/mktag.c:101 +#: builtin/mktag.c:100 msgid "tag on stdin did not refer to a valid object" msgstr "taggen på stdin pekar inte på ett giltigt objekt" -#: builtin/mktag.c:104 builtin/tag.c:242 +#: builtin/mktag.c:103 builtin/tag.c:243 msgid "unable to write tag file" msgstr "kunde inte skriva tagg-filen" -#: builtin/mktree.c:66 -msgid "git mktree [-z] [--missing] [--batch]" -msgstr "git mktree [-z] [--missing] [--batch]" - #: builtin/mktree.c:154 msgid "input is NUL terminated" msgstr "indata är NUL-terminerad" @@ -18352,52 +18851,56 @@ 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:314 builtin/remote.c:790 builtin/repack.c:857 +#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" -#: builtin/name-rev.c:474 +#: builtin/name-rev.c:524 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<flaggor>] <incheckning>..." -#: builtin/name-rev.c:475 +#: builtin/name-rev.c:525 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<flaggor>] --all" -#: builtin/name-rev.c:476 -msgid "git name-rev [<options>] --stdin" -msgstr "git name-rev [<flaggor>] --stdin" +#: builtin/name-rev.c:526 +msgid "git name-rev [<options>] --annotate-stdin" +msgstr "git name-rev [<flaggor>] --annotate-stdin" -#: builtin/name-rev.c:533 +#: builtin/name-rev.c:583 msgid "print only ref-based names (no object names)" msgstr "skriv endast referensbaserade namn (inga objektnamn)" -#: builtin/name-rev.c:534 +#: builtin/name-rev.c:584 msgid "only use tags to name the commits" msgstr "använd endast taggar för att namnge incheckningar" -#: builtin/name-rev.c:536 +#: builtin/name-rev.c:586 msgid "only use refs matching <pattern>" msgstr "använd endast referenser som motsvarar <mönster>" -#: builtin/name-rev.c:538 +#: builtin/name-rev.c:588 msgid "ignore refs matching <pattern>" msgstr "ignorera referenser som motsvarar <mönster>" -#: builtin/name-rev.c:540 +#: builtin/name-rev.c:590 msgid "list all commits reachable from all refs" msgstr "lista alla incheckningar som kan nås alla referenser" -#: builtin/name-rev.c:541 -msgid "read from stdin" -msgstr "läs från standard in" +#: builtin/name-rev.c:591 +msgid "deprecated: use annotate-stdin instead" +msgstr "avråds: använd annotate-stdin istället" -#: builtin/name-rev.c:542 +#: builtin/name-rev.c:592 +msgid "annotate text from stdin" +msgstr "annotera text från standard in" + +#: builtin/name-rev.c:593 msgid "allow to print `undefined` names (default)" msgstr "tillåt att skriva \"odefinierade\" namn (standard)" -#: builtin/name-rev.c:548 +#: builtin/name-rev.c:599 msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" @@ -18441,14 +18944,6 @@ msgstr "" "git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi>] " "<anteckningsref>" -#: builtin/notes.c:35 -msgid "git notes merge --commit [-v | -q]" -msgstr "git notes merge --commit [-v | -q]" - -#: builtin/notes.c:36 -msgid "git notes merge --abort [-v | -q]" -msgstr "git notes merge --abort [-v | -q]" - #: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]" @@ -18509,10 +19004,6 @@ msgstr "git notes remove [<objekt>]" msgid "git notes prune [<options>]" msgstr "git notes prune [<flaggor>]" -#: builtin/notes.c:92 -msgid "git notes get-ref" -msgstr "git notes get-ref" - #: builtin/notes.c:97 msgid "Write/edit the notes for the following object:" msgstr "Skriv/redigera anteckningar för följande objekt:" @@ -18544,7 +19035,7 @@ msgstr "kunde inte skriva anteckningsobjekt" msgid "the note contents have been left in %s" msgstr "anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:240 builtin/tag.c:581 +#: builtin/notes.c:240 builtin/tag.c:582 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" @@ -18584,13 +19075,6 @@ msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\"" msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "vägrar utföra \"%s\" på anteckningar i %s (utanför refs/notes/)" -#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507 -#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663 -#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987 -#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591 -msgid "too many arguments" -msgstr "för många argument" - #: builtin/notes.c:387 builtin/notes.c:676 #, c-format msgid "no note found for object %s." @@ -18779,7 +19263,7 @@ msgstr "" "%s och checka in resultatet med \"git notes merge --commit\", eller avbryt " "sammanslagningen med \"git notes merge --abort\".\n" -#: builtin/notes.c:899 builtin/tag.c:594 +#: builtin/notes.c:899 builtin/tag.c:595 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." @@ -18797,7 +19281,7 @@ msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel" msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147 +#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" @@ -18813,7 +19297,7 @@ msgstr "anteckningar-ref" msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1036 builtin/stash.c:1818 +#: builtin/notes.c:1036 builtin/stash.c:1802 #, c-format msgid "unknown subcommand: %s" msgstr "okänt underkommando: %s" @@ -18830,7 +19314,7 @@ msgid "" msgstr "" "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:572 +#: builtin/pack-objects.c:570 #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " @@ -18839,111 +19323,111 @@ msgstr "" "write_reuse_object: kunde inte hitta %s, förväntat på position %<PRIuMAX> i " "paketet %s" -#: builtin/pack-objects.c:580 +#: builtin/pack-objects.c:578 #, c-format msgid "bad packed object CRC for %s" msgstr "felaktig CRC för packat objekt %s" -#: builtin/pack-objects.c:591 +#: builtin/pack-objects.c:589 #, c-format msgid "corrupt packed object for %s" msgstr "trasigt packat objekt för %s" -#: builtin/pack-objects.c:722 +#: builtin/pack-objects.c:720 #, c-format msgid "recursive delta detected for object %s" msgstr "rekursivt delta upptäcktes för objektet %s" -#: builtin/pack-objects.c:941 +#: builtin/pack-objects.c:939 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "ordnade %u objekt, förväntade %<PRIu32>" -#: builtin/pack-objects.c:1036 +#: builtin/pack-objects.c:1034 #, c-format msgid "expected object at offset %<PRIuMAX> in pack %s" msgstr "förväntade objekt på position %<PRIuMAX> i paketet %s" -#: builtin/pack-objects.c:1160 +#: builtin/pack-objects.c:1158 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit" -#: builtin/pack-objects.c:1173 +#: builtin/pack-objects.c:1171 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1235 builtin/update-index.c:90 +#: builtin/pack-objects.c:1243 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "misslyckades ta status på %s" -#: builtin/pack-objects.c:1268 +#: builtin/pack-objects.c:1276 msgid "failed to write bitmap index" msgstr "misslyckade skriva bitkarteindex" -#: builtin/pack-objects.c:1294 +#: builtin/pack-objects.c:1302 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades" -#: builtin/pack-objects.c:1536 +#: builtin/pack-objects.c:1544 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas" -#: builtin/pack-objects.c:1984 +#: builtin/pack-objects.c:1992 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "deltabasoffset utanför gränsen i pack för %s" -#: builtin/pack-objects.c:1993 +#: builtin/pack-objects.c:2001 #, c-format msgid "delta base offset out of bound for %s" msgstr "deltabasoffset utanför gränsvärden för %s" -#: builtin/pack-objects.c:2274 +#: builtin/pack-objects.c:2282 msgid "Counting objects" msgstr "Räknar objekt" -#: builtin/pack-objects.c:2439 +#: builtin/pack-objects.c:2447 #, c-format msgid "unable to parse object header of %s" msgstr "kunde inte tolka objekthuvud för %s" -#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525 -#: builtin/pack-objects.c:2535 +#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533 +#: builtin/pack-objects.c:2543 #, c-format msgid "object %s cannot be read" msgstr "objektet %s kunde inte läsas" -#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539 +#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "objektet %s har inkonsistent objektlängd (%<PRIuMAX> mot %<PRIuMAX>)" -#: builtin/pack-objects.c:2549 +#: builtin/pack-objects.c:2557 msgid "suboptimal pack - out of memory" msgstr "icke-optimalt pack - minnet slut" -#: builtin/pack-objects.c:2864 +#: builtin/pack-objects.c:2872 #, c-format msgid "Delta compression using up to %d threads" msgstr "Deltakomprimering använder upp till %d trådar" -#: builtin/pack-objects.c:3003 +#: builtin/pack-objects.c:3011 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "kan inte packa objekt nåbara från taggen %s" -#: builtin/pack-objects.c:3089 +#: builtin/pack-objects.c:3097 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:3095 +#: builtin/pack-objects.c:3103 msgid "inconsistency with delta count" msgstr "deltaräknaren är inkonsekvent" -#: builtin/pack-objects.c:3174 +#: builtin/pack-objects.c:3182 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -18952,25 +19436,25 @@ msgstr "" "värdet på uploadpack.blobpackfileuri måste vara på formen '<objekt-hash> " "<paket-hash> <uri>' (fick '%s')" -#: builtin/pack-objects.c:3177 +#: builtin/pack-objects.c:3185 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "" "objektet redan konfigurerat i et annat uploadpack.blobpackfileuri (fick '%s)" -#: builtin/pack-objects.c:3212 +#: builtin/pack-objects.c:3220 #, c-format msgid "could not get type of object %s in pack %s" msgstr "kunde inte hämta typ för objektet %s i paketet %s" -#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351 -#: builtin/pack-objects.c:3365 +#: builtin/pack-objects.c:3348 builtin/pack-objects.c:3359 +#: builtin/pack-objects.c:3373 #, c-format msgid "could not find pack '%s'" msgstr "kunde inte hitta paketet \"%s\"" -#: builtin/pack-objects.c:3408 +#: builtin/pack-objects.c:3416 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -18979,7 +19463,7 @@ msgstr "" "förväntade kant-objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3422 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -18988,244 +19472,240 @@ msgstr "" "förväntade objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:3507 -msgid "invalid value for --missing" -msgstr "ogiltigt värde för --missing" - -#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619 +#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627 msgid "cannot open pack index" msgstr "kan inte öppna paketfilen" -#: builtin/pack-objects.c:3541 +#: builtin/pack-objects.c:3549 #, c-format msgid "loose object at %s could not be examined" msgstr "lösa objekt på %s kunde inte underökas" -#: builtin/pack-objects.c:3627 +#: builtin/pack-objects.c:3635 msgid "unable to force loose object" msgstr "kan inte tvinga lösa objekt" -#: builtin/pack-objects.c:3757 +#: builtin/pack-objects.c:3763 #, c-format msgid "not a rev '%s'" msgstr "inte en referens \"%s\"" -#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061 +#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061 #, c-format msgid "bad revision '%s'" msgstr "felaktig revision \"%s\"" -#: builtin/pack-objects.c:3788 +#: builtin/pack-objects.c:3794 msgid "unable to add recent objects" msgstr "kan inte lägga till nya objekt" -#: builtin/pack-objects.c:3841 +#: builtin/pack-objects.c:3847 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:3845 +#: builtin/pack-objects.c:3851 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:3884 +#: builtin/pack-objects.c:3907 msgid "<version>[,<offset>]" msgstr "<version>[,<offset>]" -#: builtin/pack-objects.c:3885 +#: builtin/pack-objects.c:3908 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:3888 +#: builtin/pack-objects.c:3911 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:3890 +#: builtin/pack-objects.c:3913 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från supplerande objektlager" -#: builtin/pack-objects.c:3892 +#: builtin/pack-objects.c:3915 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:3894 +#: builtin/pack-objects.c:3917 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:3896 +#: builtin/pack-objects.c:3919 msgid "limit pack window by memory in addition to object limit" msgstr "begränsa paketfönster efter minne förutom objektgräns" -#: builtin/pack-objects.c:3898 +#: builtin/pack-objects.c:3921 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "maximal längd på deltakedja tillåten i slutligt paket" -#: builtin/pack-objects.c:3900 +#: builtin/pack-objects.c:3923 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:3902 +#: builtin/pack-objects.c:3925 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:3904 +#: builtin/pack-objects.c:3927 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:3906 +#: builtin/pack-objects.c:3929 msgid "use threads when searching for best delta matches" msgstr "använd trådar vid sökning efter bästa deltaträffar" -#: builtin/pack-objects.c:3908 +#: builtin/pack-objects.c:3931 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:3910 +#: builtin/pack-objects.c:3933 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:3912 +#: builtin/pack-objects.c:3935 msgid "limit the objects to those that are not yet packed" msgstr "begränsa objekt till dem som ännu inte packats" -#: builtin/pack-objects.c:3915 +#: builtin/pack-objects.c:3938 msgid "include objects reachable from any reference" msgstr "ta med objekt som kan nås från någon referens" -#: builtin/pack-objects.c:3918 +#: builtin/pack-objects.c:3941 msgid "include objects referred by reflog entries" msgstr "ta med objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:3921 +#: builtin/pack-objects.c:3944 msgid "include objects referred to by the index" msgstr "ta med objekt som refereras från indexet" -#: builtin/pack-objects.c:3924 +#: builtin/pack-objects.c:3947 msgid "read packs from stdin" msgstr "läs paket från standard in" -#: builtin/pack-objects.c:3926 +#: builtin/pack-objects.c:3949 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:3928 +#: builtin/pack-objects.c:3951 msgid "include tag objects that refer to objects to be packed" msgstr "ta med taggobjekt som refererar objekt som ska packas" -#: builtin/pack-objects.c:3930 +#: builtin/pack-objects.c:3953 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:3932 +#: builtin/pack-objects.c:3955 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:3934 +#: builtin/pack-objects.c:3957 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:3937 +#: builtin/pack-objects.c:3960 msgid "use the sparse reachability algorithm" msgstr "använd gles-nåbarhetsalgoritmen" -#: builtin/pack-objects.c:3939 +#: builtin/pack-objects.c:3962 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:3941 +#: builtin/pack-objects.c:3964 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:3943 +#: builtin/pack-objects.c:3966 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:3945 +#: builtin/pack-objects.c:3968 msgid "ignore this pack" msgstr "ignorera detta paket" -#: builtin/pack-objects.c:3947 +#: builtin/pack-objects.c:3970 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:3949 +#: builtin/pack-objects.c:3972 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:3951 +#: builtin/pack-objects.c:3974 msgid "use a bitmap index if available to speed up counting objects" msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare" -#: builtin/pack-objects.c:3953 +#: builtin/pack-objects.c:3976 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:3957 +#: builtin/pack-objects.c:3980 msgid "write a bitmap index if possible" msgstr "skriv bitkartindex om möjligt" -#: builtin/pack-objects.c:3961 +#: builtin/pack-objects.c:3984 msgid "handling for missing objects" msgstr "hantering av saknade objekt" -#: builtin/pack-objects.c:3964 +#: builtin/pack-objects.c:3987 msgid "do not pack objects in promisor packfiles" msgstr "packa inte objekt i kontraktspackfiler" -#: builtin/pack-objects.c:3966 +#: builtin/pack-objects.c:3989 msgid "respect islands during delta compression" msgstr "respektera öar under deltakomprimering" -#: builtin/pack-objects.c:3968 +#: builtin/pack-objects.c:3991 msgid "protocol" msgstr "protokoll" -#: builtin/pack-objects.c:3969 +#: builtin/pack-objects.c:3992 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" "uteslut redan konfigurerade uploadpack.blobpackfileuri med detta protokoll" -#: builtin/pack-objects.c:4002 +#: builtin/pack-objects.c:4027 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "deltakedjedjupet %d är för djupt, påtvingar %d" -#: builtin/pack-objects.c:4007 +#: builtin/pack-objects.c:4032 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit är för högt, påtvingar %d" -#: builtin/pack-objects.c:4063 +#: builtin/pack-objects.c:4088 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size kan inte användas för att bygga ett paket som ska överföras" -#: builtin/pack-objects.c:4065 +#: builtin/pack-objects.c:4090 msgid "minimum pack size limit is 1 MiB" msgstr "minsta packstorlek är 1 MiB" -#: builtin/pack-objects.c:4070 +#: builtin/pack-objects.c:4095 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin kan inte användas för att bygga ett indexerbart paket" -#: builtin/pack-objects.c:4079 +#: builtin/pack-objects.c:4104 msgid "cannot use --filter without --stdout" msgstr "kan inte använda --filter utan --stdout" -#: builtin/pack-objects.c:4081 +#: builtin/pack-objects.c:4106 msgid "cannot use --filter with --stdin-packs" msgstr "kan inte använda --filter med --stdin-packs" -#: builtin/pack-objects.c:4085 +#: builtin/pack-objects.c:4110 msgid "cannot use internal rev list with --stdin-packs" msgstr "kan inte använda intern revisionslista med --stdin-packs" -#: builtin/pack-objects.c:4144 +#: builtin/pack-objects.c:4169 msgid "Enumerating objects" msgstr "Räknar upp objekt" -#: builtin/pack-objects.c:4180 +#: builtin/pack-objects.c:4210 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -19260,10 +19740,6 @@ msgstr "packa allt" msgid "prune loose refs (default)" msgstr "ta bort lösa referenser (standard)" -#: builtin/prune-packed.c:6 -msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" -msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" - #: builtin/prune.c:14 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]" @@ -19284,11 +19760,6 @@ msgstr "begränsa vandring av objekt utanför kontraktspackfiler." msgid "cannot prune in a precious-objects repo" msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv" -#: builtin/pull.c:45 builtin/pull.c:47 -#, c-format -msgid "Invalid value for %s: %s" -msgstr "Felaktigt värde för %s: %s" - #: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]" @@ -19313,7 +19784,7 @@ msgstr "tillåt snabbspolning" msgid "control use of pre-merge-commit and commit-msg hooks" msgstr "styr användning av pre-merge-commit- och commit-msg-krokar" -#: builtin/pull.c:171 parse-options.h:340 +#: builtin/pull.c:171 parse-options.h:371 msgid "automatically stash/stash pop before and after" msgstr "utför automatiskt stash/stash pop före och efter" @@ -19329,11 +19800,6 @@ msgstr "tvinga överskrivning av lokal gren" msgid "number of submodules pulled in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/pull.c:321 -#, c-format -msgid "Invalid value for pull.ff: %s" -msgstr "Felaktigt värde för pull.ff: %s" - #: builtin/pull.c:449 msgid "" "There is no candidate for rebasing against among the refs that you just " @@ -19368,7 +19834,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:460 builtin/rebase.c:951 +#: builtin/pull.c:460 builtin/rebase.c:978 msgid "You are not currently on a branch." msgstr "Du är inte på någon gren för närvarande." @@ -19385,16 +19851,16 @@ msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." #: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482 -#: builtin/rebase.c:957 +#: builtin/rebase.c:984 msgid "<remote>" msgstr "<fjärr>" #: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487 -#: contrib/scalar/scalar.c:375 +#: contrib/scalar/scalar.c:374 msgid "<branch>" msgstr "<gren>" -#: builtin/pull.c:475 builtin/rebase.c:949 +#: builtin/pull.c:475 builtin/rebase.c:976 msgid "There is no tracking information for the current branch." msgstr "Det finns ingen spårningsinformation för aktuell gren." @@ -19450,19 +19916,19 @@ msgstr "" "eller --ff-only på kommandoraden för att överstyra det konfigurerade\n" "förvalet vid körning.\n" -#: builtin/pull.c:1046 +#: builtin/pull.c:1047 msgid "Updating an unborn branch with changes added to the index." msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet." -#: builtin/pull.c:1050 +#: builtin/pull.c:1051 msgid "pull with rebase" msgstr "pull med ombasering" -#: builtin/pull.c:1051 +#: builtin/pull.c:1052 msgid "please commit or stash them." msgstr "checka in eller använd \"stash\" på dem." -#: builtin/pull.c:1076 +#: builtin/pull.c:1077 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -19473,7 +19939,7 @@ msgstr "" "snabbspolar din arbetskatalog från\n" "incheckningen %s." -#: builtin/pull.c:1082 +#: builtin/pull.c:1083 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -19490,23 +19956,23 @@ msgstr "" "$ git reset --hard\n" "för att återgå." -#: builtin/pull.c:1097 +#: builtin/pull.c:1098 msgid "Cannot merge multiple branches into empty head." msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: builtin/pull.c:1102 +#: builtin/pull.c:1103 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpå flera grenar." -#: builtin/pull.c:1104 +#: builtin/pull.c:1105 msgid "Cannot fast-forward to multiple branches." msgstr "Kan inte snabbspola till flera grenar." -#: builtin/pull.c:1119 +#: builtin/pull.c:1120 msgid "Need to specify how to reconcile divergent branches." msgstr "Måste ange hur avvikande grenar skall förlikas." -#: builtin/pull.c:1133 +#: builtin/pull.c:1134 msgid "cannot rebase with locally recorded submodule modifications" msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" @@ -19682,7 +20148,7 @@ msgstr "Sänder till %s\n" msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:544 builtin/submodule--helper.c:3259 +#: builtin/push.c:544 builtin/submodule--helper.c:3377 msgid "repository" msgstr "arkiv" @@ -19921,11 +20387,11 @@ msgstr "felsök unpack-trees" msgid "suppress feedback messages" msgstr "undertryck återkopplingsmeddelanden" -#: builtin/read-tree.c:183 +#: builtin/read-tree.c:190 msgid "You need to resolve your current index first" msgstr "Du måste lösa ditt befintliga index först" -#: builtin/rebase.c:35 +#: builtin/rebase.c:36 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " "[<upstream> [<branch>]]" @@ -19933,54 +20399,50 @@ msgstr "" "git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas> | --keep-base] " "[<uppström> [<gren>]]" -#: builtin/rebase.c:37 +#: builtin/rebase.c:38 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" "git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas>] --root [<gren>]" -#: builtin/rebase.c:39 -msgid "git rebase --continue | --abort | --skip | --edit-todo" -msgstr "git rebase --continue | --abort | --skip | --edit-todo" - -#: builtin/rebase.c:230 +#: builtin/rebase.c:231 #, c-format msgid "could not create temporary %s" msgstr "kunde inte skapa temporär %s" -#: builtin/rebase.c:236 +#: builtin/rebase.c:237 msgid "could not mark as interactive" msgstr "kunde inte markera som interaktiv" -#: builtin/rebase.c:289 +#: builtin/rebase.c:290 msgid "could not generate todo list" msgstr "Kunde inte skapa attgöra-lista" -#: builtin/rebase.c:331 +#: builtin/rebase.c:332 msgid "a base commit must be provided with --upstream or --onto" msgstr "en basincheckning måste anges med --upstream eller --onto" -#: builtin/rebase.c:390 +#: builtin/rebase.c:391 #, c-format msgid "%s requires the merge backend" msgstr "%s kräver \"merge\"-bakändan" -#: builtin/rebase.c:432 +#: builtin/rebase.c:433 #, c-format msgid "could not get 'onto': '%s'" msgstr "kunde inte hämta \"onto\": \"%s\"" -#: builtin/rebase.c:449 +#: builtin/rebase.c:450 #, c-format msgid "invalid orig-head: '%s'" msgstr "ogiltigt orig-head: \"%s\"" -#: builtin/rebase.c:474 +#: builtin/rebase.c:475 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\"" -#: builtin/rebase.c:597 +#: builtin/rebase.c:600 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -19994,7 +20456,7 @@ msgstr "" "För att avbryta och återgå till där du var före ombaseringen, kör \"git " "rebase --abort\"." -#: builtin/rebase.c:680 +#: builtin/rebase.c:685 #, c-format msgid "" "\n" @@ -20013,7 +20475,12 @@ msgstr "" "\n" "Därför kan inte git ombasera dessa." -#: builtin/rebase.c:925 +#: builtin/rebase.c:836 +#, c-format +msgid "could not switch to %s" +msgstr "kunde inte växla till %s" + +#: builtin/rebase.c:952 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" @@ -20021,7 +20488,7 @@ msgid "" msgstr "" "okänd tom-typ \"%s\"; giltiga värden är \"drop\", \"keep\" och \"ask\"." -#: builtin/rebase.c:943 +#: builtin/rebase.c:970 #, c-format msgid "" "%s\n" @@ -20038,7 +20505,7 @@ msgstr "" " git rebase '<gren>'\n" "\n" -#: builtin/rebase.c:959 +#: builtin/rebase.c:986 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -20051,180 +20518,180 @@ msgstr "" " git branch --set-upstream-to=%s/<gren> %s\n" "\n" -#: builtin/rebase.c:989 +#: builtin/rebase.c:1016 msgid "exec commands cannot contain newlines" msgstr "exec-kommandon kan inte innehålla nyradstecken" -#: builtin/rebase.c:993 +#: builtin/rebase.c:1020 msgid "empty exec command" msgstr "tomt exec-kommando" -#: builtin/rebase.c:1023 +#: builtin/rebase.c:1051 msgid "rebase onto given branch instead of upstream" msgstr "ombasera mot given grenen istället för uppström" -#: builtin/rebase.c:1025 +#: builtin/rebase.c:1053 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:1027 +#: builtin/rebase.c:1055 msgid "allow pre-rebase hook to run" msgstr "tillåt pre-rebase-krok att köra" -#: builtin/rebase.c:1029 +#: builtin/rebase.c:1057 msgid "be quiet. implies --no-stat" msgstr "var tyst. implicerar --no-stat" -#: builtin/rebase.c:1032 +#: builtin/rebase.c:1060 msgid "display a diffstat of what changed upstream" msgstr "vis diffstat för vad som ändrats uppströms" -#: builtin/rebase.c:1035 +#: builtin/rebase.c:1063 msgid "do not show diffstat of what changed upstream" msgstr "visa inte en diffstat för vad som ändrats uppströms" -#: builtin/rebase.c:1038 +#: builtin/rebase.c:1066 msgid "add a Signed-off-by trailer to each commit" msgstr "lägg \"Signed-off-by:\"-släprad till varje incheckning" -#: builtin/rebase.c:1041 +#: builtin/rebase.c:1069 msgid "make committer date match author date" msgstr "sätt incheckningsdatum till författardatum" -#: builtin/rebase.c:1043 +#: builtin/rebase.c:1071 msgid "ignore author date and use current date" msgstr "ignorera författardatum och använd nuvarande" -#: builtin/rebase.c:1045 +#: builtin/rebase.c:1073 msgid "synonym of --reset-author-date" msgstr "synonym för --reset-author-date" -#: builtin/rebase.c:1047 builtin/rebase.c:1051 +#: builtin/rebase.c:1075 builtin/rebase.c:1079 msgid "passed to 'git apply'" msgstr "sänds till \"git apply\"" -#: builtin/rebase.c:1049 +#: builtin/rebase.c:1077 msgid "ignore changes in whitespace" msgstr "ignorera ändringar i blanksteg" -#: builtin/rebase.c:1053 builtin/rebase.c:1056 +#: builtin/rebase.c:1081 builtin/rebase.c:1084 msgid "cherry-pick all commits, even if unchanged" msgstr "utför cherry-pick på alla incheckningar, även om oändrad" -#: builtin/rebase.c:1058 +#: builtin/rebase.c:1086 msgid "continue" msgstr "fortsätt" -#: builtin/rebase.c:1061 +#: builtin/rebase.c:1089 msgid "skip current patch and continue" msgstr "hoppa över nuvarande patch och fortsätt" -#: builtin/rebase.c:1063 +#: builtin/rebase.c:1091 msgid "abort and check out the original branch" msgstr "avbryt och checka ut ursprungsgrenen" -#: builtin/rebase.c:1066 +#: builtin/rebase.c:1094 msgid "abort but keep HEAD where it is" msgstr "avbryt men behåll HEAD där det är" -#: builtin/rebase.c:1067 +#: builtin/rebase.c:1095 msgid "edit the todo list during an interactive rebase" msgstr "redigera attgöra-listan under interaktiv ombasering." -#: builtin/rebase.c:1070 +#: builtin/rebase.c:1098 msgid "show the patch file being applied or merged" msgstr "visa patchen som tillämpas eller slås samman" -#: builtin/rebase.c:1073 +#: builtin/rebase.c:1101 msgid "use apply strategies to rebase" msgstr "använd appliceringstrategier för ombasering" -#: builtin/rebase.c:1077 +#: builtin/rebase.c:1105 msgid "use merging strategies to rebase" msgstr "använd sammanslagningsstrategier för ombasering" -#: builtin/rebase.c:1081 +#: builtin/rebase.c:1109 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:1085 +#: builtin/rebase.c:1113 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:1090 +#: builtin/rebase.c:1118 msgid "how to handle commits that become empty" msgstr "hur incheckningar som blir tomma ska hanteras" -#: builtin/rebase.c:1093 +#: builtin/rebase.c:1121 msgid "keep commits which start empty" msgstr "behåller incheckningar som är tomma från början" -#: builtin/rebase.c:1097 +#: builtin/rebase.c:1125 msgid "move commits that begin with squash!/fixup! under -i" msgstr "flytta incheckningar som börjar med squash!/fixup! under -i" -#: builtin/rebase.c:1104 +#: builtin/rebase.c:1132 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:1108 +#: builtin/rebase.c:1136 msgid "allow rebasing commits with empty messages" msgstr "tillåt ombasering av incheckningar med tomt meddelande" -#: builtin/rebase.c:1112 +#: builtin/rebase.c:1140 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:1115 +#: builtin/rebase.c:1143 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:1117 +#: builtin/rebase.c:1145 msgid "use the given merge strategy" msgstr "använd angiven sammanslagningsstrategi" -#: builtin/rebase.c:1119 builtin/revert.c:115 +#: builtin/rebase.c:1147 builtin/revert.c:115 msgid "option" msgstr "alternativ" -#: builtin/rebase.c:1120 +#: builtin/rebase.c:1148 msgid "pass the argument through to the merge strategy" msgstr "sänd flaggan till sammanslagningsstrategin" -#: builtin/rebase.c:1123 +#: builtin/rebase.c:1151 msgid "rebase all reachable commits up to the root(s)" msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna" -#: builtin/rebase.c:1126 +#: builtin/rebase.c:1154 msgid "automatically re-schedule any `exec` that fails" msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt" -#: builtin/rebase.c:1128 +#: builtin/rebase.c:1156 msgid "apply all changes, even those already present upstream" msgstr "applicera alla ändringar, även de som redan finns uppströms" -#: builtin/rebase.c:1149 +#: builtin/rebase.c:1177 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:1180 +#: builtin/rebase.c:1208 msgid "--preserve-merges was replaced by --rebase-merges" msgstr "--preserve-merges har ersatts av --rebase-merges" -#: builtin/rebase.c:1202 +#: builtin/rebase.c:1230 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: builtin/rebase.c:1206 +#: builtin/rebase.c:1234 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:1229 t/helper/test-fast-rebase.c:122 +#: builtin/rebase.c:1257 t/helper/test-fast-rebase.c:122 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: builtin/rebase.c:1241 +#: builtin/rebase.c:1269 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -20232,16 +20699,16 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: builtin/rebase.c:1260 +#: builtin/rebase.c:1287 msgid "could not discard worktree changes" msgstr "kunde inte kasta ändringar i arbetskatalogen" -#: builtin/rebase.c:1279 +#: builtin/rebase.c:1308 #, c-format msgid "could not move back to %s" msgstr "kunde inte flytta tillbaka till %s" -#: builtin/rebase.c:1325 +#: builtin/rebase.c:1354 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -20262,124 +20729,119 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där.\n" -#: builtin/rebase.c:1353 +#: builtin/rebase.c:1382 msgid "switch `C' expects a numerical value" msgstr "flaggan \"C\" förväntar ett numeriskt värde" -#: builtin/rebase.c:1395 +#: builtin/rebase.c:1424 #, c-format msgid "Unknown mode: %s" msgstr "Okänt läge: %s" -#: builtin/rebase.c:1434 +#: builtin/rebase.c:1463 msgid "--strategy requires --merge or --interactive" msgstr "--strategy kräver --merge eller --interactive" -#: builtin/rebase.c:1463 +#: builtin/rebase.c:1492 msgid "apply options and merge options cannot be used together" msgstr "" "appliceringsflaggor och sammanslagningsflaggor kan inte användas tillsammans" -#: builtin/rebase.c:1476 +#: builtin/rebase.c:1505 #, c-format msgid "Unknown rebase backend: %s" msgstr "Okänd rebase-bakända: %s" -#: builtin/rebase.c:1505 +#: builtin/rebase.c:1534 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec kräver --exec eller --interactive" -#: builtin/rebase.c:1536 +#: builtin/rebase.c:1565 #, c-format msgid "invalid upstream '%s'" msgstr "felaktig uppström \"%s\"" -#: builtin/rebase.c:1542 +#: builtin/rebase.c:1571 msgid "Could not create new root commit" msgstr "kunde inte skapa ny rotincheckning" -#: builtin/rebase.c:1568 +#: builtin/rebase.c:1597 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "\"%s\": behöver precis en sammanslagningsbas med gren" -#: builtin/rebase.c:1571 +#: builtin/rebase.c:1600 #, c-format msgid "'%s': need exactly one merge base" msgstr "\"%s\": behöver precis en sammanslagningsbas" -#: builtin/rebase.c:1580 +#: builtin/rebase.c:1609 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "Pekar inte på en giltig incheckning: \"%s\"" -#: builtin/rebase.c:1607 +#: builtin/rebase.c:1636 #, c-format msgid "no such branch/commit '%s'" msgstr "ingen sådan gren/incheckning: \"%s\"" -#: builtin/rebase.c:1618 builtin/submodule--helper.c:39 -#: builtin/submodule--helper.c:2659 +#: builtin/rebase.c:1647 builtin/submodule--helper.c:43 +#: builtin/submodule--helper.c:2477 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/rebase.c:1629 +#: builtin/rebase.c:1658 msgid "Could not resolve HEAD to a revision" msgstr "Kunde inte bestämma HEAD:s incheckning" -#: builtin/rebase.c:1650 +#: builtin/rebase.c:1679 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: builtin/rebase.c:1686 -#, c-format -msgid "could not switch to %s" -msgstr "kunde inte växla till %s" - -#: builtin/rebase.c:1697 +#: builtin/rebase.c:1714 msgid "HEAD is up to date." msgstr "HEAD är à jour." -#: builtin/rebase.c:1699 +#: builtin/rebase.c:1716 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Aktuell gren %s är à jour.\n" -#: builtin/rebase.c:1707 +#: builtin/rebase.c:1724 msgid "HEAD is up to date, rebase forced." msgstr "HEAD är à jour, ombasering framtvingad." -#: builtin/rebase.c:1709 +#: builtin/rebase.c:1726 #, 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:1717 +#: builtin/rebase.c:1734 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: builtin/rebase.c:1724 +#: builtin/rebase.c:1741 #, c-format msgid "Changes to %s:\n" msgstr "Ändringar till %s:\n" -#: builtin/rebase.c:1727 +#: builtin/rebase.c:1744 #, c-format msgid "Changes from %s to %s:\n" msgstr "Ändringar från %s till %s:\n" -#: builtin/rebase.c:1752 +#: builtin/rebase.c:1769 #, 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:1761 +#: builtin/rebase.c:1781 msgid "Could not detach HEAD" msgstr "Kunde inte koppla från HEAD" -#: builtin/rebase.c:1770 +#: builtin/rebase.c:1790 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Snabbspolade %s till %s.\n" @@ -20388,7 +20850,7 @@ msgstr "Snabbspolade %s till %s.\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-katalog>" -#: builtin/receive-pack.c:1275 +#: builtin/receive-pack.c:1263 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -20418,7 +20880,7 @@ msgstr "" "För att undvika detta meddelande och fortfarande behålla det\n" "normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"." -#: builtin/receive-pack.c:1295 +#: builtin/receive-pack.c:1283 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -20439,79 +20901,111 @@ msgstr "" "\n" "För att undvika detta meddelande kan du sätta det till \"refuse\"." -#: builtin/receive-pack.c:2474 +#: builtin/receive-pack.c:2476 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:2489 +#: builtin/receive-pack.c:2491 msgid "you must specify a directory" msgstr "du måste ange en katalog" -#: builtin/reflog.c:17 +#: builtin/reflog.c:9 +msgid "git reflog [show] [<log-options>] [<ref>]" +msgstr "git reflog [show] [<log-flaggor>] [<ref>]" + +#: builtin/reflog.c:12 msgid "" -"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--" -"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " -"<refs>..." +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<refs>...]" msgstr "" -"git reflog expire [--expire=<tid>] [--expire-unreachable=<tid>] [--rewrite] " -"[--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " -"<referenser>..." +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<referenser>...]" -#: builtin/reflog.c:22 +#: builtin/reflog.c:17 msgid "" -"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " -"<refs>..." +"git reflog delete [--rewrite] [--updateref]\n" +" [--dry-run | -n] [--verbose] <ref>@{<specifier>}..." msgstr "" -"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " -"<referenser>..." +"git reflog delete [--rewrite] [--updateref]\n" +" [--dry-run | -n] [--verbose] <ref>@{<specificering>}..." -#: builtin/reflog.c:25 +#: builtin/reflog.c:21 msgid "git reflog exists <ref>" msgstr "git reflog exists <referens>" -#: builtin/reflog.c:585 builtin/reflog.c:590 +#: builtin/reflog.c:197 builtin/reflog.c:211 #, c-format -msgid "'%s' is not a valid timestamp" -msgstr "\"%s\" är inte en giltig tidsstämpel" +msgid "invalid timestamp '%s' given to '--%s'" +msgstr "ogiltig tidsstämpel \"%s\" given i \"--%s\"" + +#: builtin/reflog.c:240 builtin/reflog.c:359 +msgid "do not actually prune any entries" +msgstr "rensa faktiskt inte några poster" + +#: builtin/reflog.c:243 builtin/reflog.c:362 +msgid "" +"rewrite the old SHA1 with the new SHA1 of the entry that now precedes it" +msgstr "skriv om gammal SHA1 med ny SHA1 i posten som nu föregår den" + +#: builtin/reflog.c:246 builtin/reflog.c:365 +msgid "update the reference to the value of the top reflog entry" +msgstr "uppdatera referensen till värdet i översta referensloggposten" + +#: builtin/reflog.c:248 builtin/reflog.c:367 +msgid "print extra information on screen" +msgstr "visa extra information på skärm" -#: builtin/reflog.c:631 +#: builtin/reflog.c:249 builtin/reflog.c:253 +msgid "timestamp" +msgstr "tidsstämpel" + +#: builtin/reflog.c:250 +msgid "prune entries older than the specified time" +msgstr "rensa poster äldre än angiven tid" + +#: builtin/reflog.c:254 +msgid "" +"prune entries older than <time> that are not reachable from the current tip " +"of the branch" +msgstr "" +"rensa poster äldre än <tid> som inte kan nås från nuvarande ände av grenen" + +#: builtin/reflog.c:258 +msgid "prune any reflog entries that point to broken commits" +msgstr "rensa alla referensloggposter som pekar på trasiga incheckningar" + +#: builtin/reflog.c:259 +msgid "process the reflogs of all references" +msgstr "hantera referensloggar för alla referenser" + +#: builtin/reflog.c:261 +msgid "limits processing to reflogs from the current worktree only" +msgstr "begränsar hantering av referensloggar till endst aktuell arbetskatalog" + +#: builtin/reflog.c:294 #, c-format msgid "Marking reachable objects..." msgstr "Markerar nåbara objekt..." -#: builtin/reflog.c:675 +#: builtin/reflog.c:338 #, c-format msgid "%s points nowhere!" msgstr "%s pekar ingenstans!" -#: builtin/reflog.c:731 +#: builtin/reflog.c:374 msgid "no reflog specified to delete" msgstr "ingen referenslogg att ta bort angavs" -#: builtin/reflog.c:742 -#, c-format -msgid "not a reflog: %s" -msgstr "inte en referenslogg: %s" - -#: builtin/reflog.c:747 -#, c-format -msgid "no reflog for '%s'" -msgstr "ingen referenslogg för \"%s\"" - -#: builtin/reflog.c:794 +#: builtin/reflog.c:396 #, c-format msgid "invalid ref format: %s" msgstr "felaktigt referensformat: %s" -#: builtin/reflog.c:803 -msgid "git reflog [ show | expire | delete | exists ]" -msgstr "git reflog [ show | expire | delete | exists ]" - -#: builtin/remote.c:17 -msgid "git remote [-v | --verbose]" -msgstr "git remote [-v | --verbose]" - -#: builtin/remote.c:18 +#: builtin/remote.c:19 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -20519,87 +21013,87 @@ msgstr "" "git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <namn> <url>" -#: builtin/remote.c:19 builtin/remote.c:39 -msgid "git remote rename <old> <new>" -msgstr "git remote rename <gammal> <ny>" +#: builtin/remote.c:20 builtin/remote.c:40 +msgid "git remote rename [--[no-]progress] <old> <new>" +msgstr "git remote rename [--[no-]progress] <gammal> <ny>" -#: builtin/remote.c:20 builtin/remote.c:44 +#: builtin/remote.c:21 builtin/remote.c:45 msgid "git remote remove <name>" msgstr "git remote remove <namn>" -#: builtin/remote.c:21 builtin/remote.c:49 +#: builtin/remote.c:22 builtin/remote.c:50 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <namn>" -#: builtin/remote.c:23 +#: builtin/remote.c:24 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <namn>" -#: builtin/remote.c:24 +#: builtin/remote.c:25 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<grupp> | <fjärr>)...]" -#: builtin/remote.c:25 +#: builtin/remote.c:26 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <namn> <gren>..." -#: builtin/remote.c:26 builtin/remote.c:75 +#: builtin/remote.c:27 builtin/remote.c:76 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <namn>" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:29 builtin/remote.c:82 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <namn> <nyurl>" -#: builtin/remote.c:29 builtin/remote.c:82 +#: builtin/remote.c:30 builtin/remote.c:83 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <namn> <url>" -#: builtin/remote.c:34 +#: builtin/remote.c:35 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<flaggor>] <namn> <url>" -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <namn> <gren>..." -#: builtin/remote.c:55 +#: builtin/remote.c:56 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <namn> <gren>..." -#: builtin/remote.c:60 +#: builtin/remote.c:61 msgid "git remote show [<options>] <name>" msgstr "git remote show [<flaggor>] <namn>" -#: builtin/remote.c:65 +#: builtin/remote.c:66 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<flaggor>] <namn>" -#: builtin/remote.c:70 +#: builtin/remote.c:71 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..." -#: builtin/remote.c:99 +#: builtin/remote.c:100 #, c-format msgid "Updating %s" msgstr "Uppdaterar %s" -#: builtin/remote.c:101 +#: builtin/remote.c:102 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/remote.c:131 +#: builtin/remote.c:132 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -20607,77 +21101,77 @@ msgstr "" "--mirror är farlig och föråldrad; använd\n" "\t --mirror=fetch eller --mirror=push istället" -#: builtin/remote.c:148 +#: builtin/remote.c:149 #, c-format msgid "unknown mirror argument: %s" msgstr "okänt argument till mirror: %s" -#: builtin/remote.c:164 +#: builtin/remote.c:165 msgid "fetch the remote branches" msgstr "hämta fjärrgrenarna" -#: builtin/remote.c:166 +#: builtin/remote.c:167 msgid "import all tags and associated objects when fetching" msgstr "importera alla taggar och associerade objekt vid hämtning" -#: builtin/remote.c:169 +#: builtin/remote.c:170 msgid "or do not fetch any tag at all (--no-tags)" msgstr "eller hämta inte några taggar alls (--no-tags)" -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "branch(es) to track" msgstr "gren(ar) att spåra" -#: builtin/remote.c:172 +#: builtin/remote.c:173 msgid "master branch" msgstr "huvudgren" -#: builtin/remote.c:174 +#: builtin/remote.c:175 msgid "set up remote as a mirror to push to or fetch from" msgstr "ställ in arkiv som spegel att sända eller ta emot från" -#: builtin/remote.c:186 +#: builtin/remote.c:187 msgid "specifying a master branch makes no sense with --mirror" msgstr "att ange en master-gren ger ingen mening med --mirror" -#: builtin/remote.c:188 +#: builtin/remote.c:189 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar" -#: builtin/remote.c:195 builtin/remote.c:705 +#: builtin/remote.c:196 builtin/remote.c:716 #, c-format msgid "remote %s already exists." msgstr "fjärrarkivet %s finns redan." -#: builtin/remote.c:240 +#: builtin/remote.c:241 #, c-format msgid "Could not setup master '%s'" msgstr "Kunde inte skapa master \"%s\"" -#: builtin/remote.c:322 +#: builtin/remote.c:323 #, c-format msgid "unhandled branch.%s.rebase=%s; assuming 'true'" msgstr "ohanterad branch.%s.rebase=%s; antar \"true\"" -#: builtin/remote.c:366 +#: builtin/remote.c:367 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Kunde inte hämta mappning för referensspecifikation %s" -#: builtin/remote.c:460 builtin/remote.c:468 +#: builtin/remote.c:461 builtin/remote.c:469 msgid "(matching)" msgstr "(träffande)" -#: builtin/remote.c:472 +#: builtin/remote.c:473 msgid "(delete)" msgstr "(ta bort)" -#: builtin/remote.c:660 +#: builtin/remote.c:664 #, c-format msgid "could not set '%s'" msgstr "kunde inte ställa in \"%s\"" -#: builtin/remote.c:665 +#: builtin/remote.c:669 #, c-format msgid "" "The %s configuration remote.pushDefault in:\n" @@ -20688,17 +21182,17 @@ msgstr "" "\t%s:%d\n" "anger nu den icke-existerande fjärren \"%s\"" -#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948 +#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973 #, c-format msgid "No such remote: '%s'" msgstr "Ingen sådan fjärr: \"%s\"" -#: builtin/remote.c:715 +#: builtin/remote.c:726 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\"" -#: builtin/remote.c:735 +#: builtin/remote.c:746 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -20709,17 +21203,21 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nödvändigt." -#: builtin/remote.c:775 +#: builtin/remote.c:783 +msgid "Renaming remote references" +msgstr "Byter namn på fjärreferenser" + +#: builtin/remote.c:794 #, c-format msgid "deleting '%s' failed" msgstr "misslyckades ta bort \"%s\"" -#: builtin/remote.c:809 +#: builtin/remote.c:832 #, c-format msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:887 +#: builtin/remote.c:912 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -20733,118 +21231,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:901 +#: builtin/remote.c:926 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:1009 +#: builtin/remote.c:1034 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ny (nästa hämtning sparar i remotes/%s)" -#: builtin/remote.c:1012 +#: builtin/remote.c:1037 msgid " tracked" msgstr " spårad" -#: builtin/remote.c:1014 +#: builtin/remote.c:1039 msgid " stale (use 'git remote prune' to remove)" msgstr " förlegad (använd \"git remote prune\" för att ta bort)" -#: builtin/remote.c:1016 +#: builtin/remote.c:1041 msgid " ???" msgstr " ???" -#: builtin/remote.c:1057 +#: builtin/remote.c:1082 #, 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:1066 +#: builtin/remote.c:1091 #, c-format msgid "rebases interactively onto remote %s" msgstr "ombaseras interaktivt på fjärren %s" -#: builtin/remote.c:1068 +#: builtin/remote.c:1093 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "ombaseras interaktivt (med sammanslagningar) på fjärren %s" -#: builtin/remote.c:1071 +#: builtin/remote.c:1096 #, c-format msgid "rebases onto remote %s" msgstr "ombaseras på fjärren %s" -#: builtin/remote.c:1075 +#: builtin/remote.c:1100 #, c-format msgid " merges with remote %s" msgstr " sammanslås med fjärren %s" -#: builtin/remote.c:1078 +#: builtin/remote.c:1103 #, c-format msgid "merges with remote %s" msgstr "sammanslås med fjärren %s" -#: builtin/remote.c:1081 +#: builtin/remote.c:1106 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s och med fjärren %s\n" -#: builtin/remote.c:1124 +#: builtin/remote.c:1149 msgid "create" msgstr "skapa" -#: builtin/remote.c:1127 +#: builtin/remote.c:1152 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1131 +#: builtin/remote.c:1156 msgid "up to date" msgstr "àjour" -#: builtin/remote.c:1134 +#: builtin/remote.c:1159 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1137 +#: builtin/remote.c:1162 msgid "local out of date" msgstr "lokal föråldrad" -#: builtin/remote.c:1144 +#: builtin/remote.c:1169 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1147 +#: builtin/remote.c:1172 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sänder till %-*s (%s)" -#: builtin/remote.c:1151 +#: builtin/remote.c:1176 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1154 +#: builtin/remote.c:1179 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" -#: builtin/remote.c:1222 +#: builtin/remote.c:1247 msgid "do not query remotes" msgstr "fråga inte fjärrar" -#: builtin/remote.c:1243 +#: builtin/remote.c:1268 #, c-format msgid "* remote %s" msgstr "* fjärr %s" -#: builtin/remote.c:1244 +#: builtin/remote.c:1269 #, c-format msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398 +#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423 msgid "(no URL)" msgstr "(ingen URL)" @@ -20852,188 +21350,188 @@ msgstr "(ingen URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1259 builtin/remote.c:1261 +#: builtin/remote.c:1284 builtin/remote.c:1286 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267 +#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1263 +#: builtin/remote.c:1288 msgid "(not queried)" msgstr "(inte förfrågad)" -#: builtin/remote.c:1265 +#: builtin/remote.c:1290 msgid "(unknown)" msgstr "(okänd)" -#: builtin/remote.c:1269 +#: builtin/remote.c:1294 #, 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:1281 +#: builtin/remote.c:1306 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Fjärrgren:%s" msgstr[1] " Fjärrgrenar:%s" -#: builtin/remote.c:1284 builtin/remote.c:1310 +#: builtin/remote.c:1309 builtin/remote.c:1335 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1293 +#: builtin/remote.c:1318 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:1301 +#: builtin/remote.c:1326 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1307 +#: builtin/remote.c:1332 #, 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:1328 +#: builtin/remote.c:1353 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" -#: builtin/remote.c:1330 +#: builtin/remote.c:1355 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1344 +#: builtin/remote.c:1369 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1346 +#: builtin/remote.c:1371 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:1356 +#: builtin/remote.c:1381 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1364 +#: builtin/remote.c:1389 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1366 +#: builtin/remote.c:1391 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1384 +#: builtin/remote.c:1409 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1385 +#: builtin/remote.c:1410 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1394 +#: builtin/remote.c:1419 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1395 +#: builtin/remote.c:1420 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1411 +#: builtin/remote.c:1436 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1414 +#: builtin/remote.c:1439 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1459 +#: builtin/remote.c:1484 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649 +#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" -#: builtin/remote.c:1541 +#: builtin/remote.c:1566 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1548 +#: builtin/remote.c:1573 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1565 +#: builtin/remote.c:1590 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:1567 +#: builtin/remote.c:1592 msgid "return all URLs" msgstr "returnera alla URL:er" -#: builtin/remote.c:1597 +#: builtin/remote.c:1622 #, c-format msgid "no URLs configured for remote '%s'" msgstr "ingen URL:er angivna för fjärren \"%s\"" -#: builtin/remote.c:1623 +#: builtin/remote.c:1648 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1625 +#: builtin/remote.c:1650 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1627 +#: builtin/remote.c:1652 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1634 +#: builtin/remote.c:1659 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1675 +#: builtin/remote.c:1700 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1683 +#: builtin/remote.c:1708 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1685 +#: builtin/remote.c:1710 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" -#: builtin/remote.c:1702 +#: builtin/remote.c:1727 msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; måste skrivas före ett underkommando" -#: builtin/repack.c:28 +#: builtin/repack.c:29 msgid "git repack [<options>]" msgstr "git repack [<flaggor>]" -#: builtin/repack.c:33 +#: builtin/repack.c:34 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -21042,145 +21540,145 @@ msgstr "" "Använd --no-write-bitmap-index eller inaktivera inställningen\n" "pack.writebitmaps" -#: builtin/repack.c:201 +#: builtin/repack.c:206 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:275 builtin/repack.c:820 +#: builtin/repack.c:280 builtin/repack.c:824 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:299 +#: builtin/repack.c:304 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:314 +#: builtin/repack.c:319 #, c-format msgid "cannot open index for %s" msgstr "kunde inte öppna indexet för %s" -#: builtin/repack.c:373 +#: builtin/repack.c:378 #, c-format msgid "pack %s too large to consider in geometric progression" msgstr "paketet %s för stort för att tas med i geometriskt förlopp" -#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418 +#: builtin/repack.c:411 builtin/repack.c:418 builtin/repack.c:423 #, c-format msgid "pack %s too large to roll up" msgstr "paketet %s för stort att rulla upp" -#: builtin/repack.c:498 +#: builtin/repack.c:503 #, c-format msgid "could not open tempfile %s for writing" msgstr "kunde inte öppna temporär fil %s för skrivning" -#: builtin/repack.c:516 +#: builtin/repack.c:521 msgid "could not close refs snapshot tempfile" msgstr "kunde inte stänga temporär fil för refs-ögonblicksbild" -#: builtin/repack.c:630 +#: builtin/repack.c:634 msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" -#: builtin/repack.c:632 +#: builtin/repack.c:636 msgid "same as -a, and turn unreachable objects loose" msgstr "samma som -a, och gör onåbara objekt lösa" -#: builtin/repack.c:635 +#: builtin/repack.c:639 msgid "remove redundant packs, and run git-prune-packed" msgstr "ta bort överflödiga paket, och kör git-prune-packed" -#: builtin/repack.c:637 +#: builtin/repack.c:641 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "sänd --no-reuse-delta till git-pack-objects" -#: builtin/repack.c:639 +#: builtin/repack.c:643 msgid "pass --no-reuse-object to git-pack-objects" msgstr "sänd --no-reuse-object till git-pack-objects" -#: builtin/repack.c:641 +#: builtin/repack.c:645 msgid "do not run git-update-server-info" msgstr "kör inte git-update-server-info" -#: builtin/repack.c:644 +#: builtin/repack.c:648 msgid "pass --local to git-pack-objects" msgstr "sänd --local till git-pack-objects" -#: builtin/repack.c:646 +#: builtin/repack.c:650 msgid "write bitmap index" msgstr "skriv bitkartindex" -#: builtin/repack.c:648 +#: builtin/repack.c:652 msgid "pass --delta-islands to git-pack-objects" msgstr "sänd --delta-islands till git-pack-objects" -#: builtin/repack.c:649 +#: builtin/repack.c:653 msgid "approxidate" msgstr "cirkadatum" -#: builtin/repack.c:650 +#: builtin/repack.c:654 msgid "with -A, do not loosen objects older than this" msgstr "med -A, lös inte upp objekt äldre än detta" -#: builtin/repack.c:652 +#: builtin/repack.c:656 msgid "with -a, repack unreachable objects" msgstr "med -a, packa om onåbara objekt" -#: builtin/repack.c:654 +#: builtin/repack.c:658 msgid "size of the window used for delta compression" msgstr "storlek på fönster använt för deltakomprimering" -#: builtin/repack.c:655 builtin/repack.c:661 +#: builtin/repack.c:659 builtin/repack.c:665 msgid "bytes" msgstr "byte" -#: builtin/repack.c:656 +#: builtin/repack.c:660 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:658 +#: builtin/repack.c:662 msgid "limits the maximum delta depth" msgstr "begränsa maximalt deltadjup" -#: builtin/repack.c:660 +#: builtin/repack.c:664 msgid "limits the maximum number of threads" msgstr "begränsar maximalt antal trådar" -#: builtin/repack.c:662 +#: builtin/repack.c:666 msgid "maximum size of each packfile" msgstr "maximal storlek på varje paketfil" -#: builtin/repack.c:664 +#: builtin/repack.c:668 msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:666 +#: builtin/repack.c:670 msgid "do not repack this pack" msgstr "packa inte om detta paket" -#: builtin/repack.c:668 +#: builtin/repack.c:672 msgid "find a geometric progression with factor <N>" msgstr "hitta ett geometrisk förlopp med faktor <N>" -#: builtin/repack.c:670 +#: builtin/repack.c:674 msgid "write a multi-pack index of the resulting packs" msgstr "skriv ett flerpaketsindex för de skapade paketen" -#: builtin/repack.c:680 +#: builtin/repack.c:684 msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" -#: builtin/repack.c:829 +#: builtin/repack.c:833 msgid "Nothing new to pack." msgstr "Inget nytt att packa." -#: builtin/repack.c:859 +#: builtin/repack.c:863 #, c-format msgid "missing required file: %s" msgstr "nödvändig fil saknas: %s" -#: builtin/repack.c:861 +#: builtin/repack.c:865 #, c-format msgid "could not unlink: %s" msgstr "kunde inte ta bort: \"%s\"" @@ -21197,10 +21695,6 @@ msgstr "git replace [-f] --edit <objekt>" msgid "git replace [-f] --graft <commit> [<parent>...]" msgstr "git replace [-f] --graft <incheckning> [<förälder>...]" -#: builtin/replace.c:25 -msgid "git replace [-f] --convert-graft-file" -msgstr "git replace [-f] --convert-graft-file" - #: builtin/replace.c:26 msgid "git replace -d <object>..." msgstr "git replace -d <objekt>..." @@ -21502,97 +21996,92 @@ msgstr "Kunde inte hitta trädet för %s." msgid "HEAD is now at %s" msgstr "HEAD är nu på %s" -#: builtin/reset.c:299 +#: builtin/reset.c:304 #, 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:396 builtin/stash.c:606 builtin/stash.c:680 -#: builtin/stash.c:704 +#: builtin/reset.c:402 builtin/stash.c:606 builtin/stash.c:669 +#: builtin/stash.c:693 msgid "be quiet, only report errors" msgstr "var tyst, rapportera endast fel" -#: builtin/reset.c:398 +#: builtin/reset.c:404 +msgid "skip refreshing the index after reset" +msgstr "hoppa över uppdatering av indexet efter nollställning" + +#: builtin/reset.c:406 msgid "reset HEAD and index" msgstr "återställ HEAD och index" -#: builtin/reset.c:399 +#: builtin/reset.c:407 msgid "reset only HEAD" msgstr "återställ endast HEAD" -#: builtin/reset.c:401 builtin/reset.c:403 +#: builtin/reset.c:409 builtin/reset.c:411 msgid "reset HEAD, index and working tree" msgstr "återställ HEAD, index och arbetskatalog" -#: builtin/reset.c:405 +#: builtin/reset.c:413 msgid "reset HEAD but keep local changes" msgstr "återställ HEAD men behåll lokala ändringar" -#: builtin/reset.c:411 +#: builtin/reset.c:419 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:445 +#: builtin/reset.c:452 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Kunde inte slå upp \"%s\" som en giltig revision." -#: builtin/reset.c:453 +#: builtin/reset.c:460 #, 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:472 +#: builtin/reset.c:479 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:474 +#: builtin/reset.c:481 #, c-format msgid "Cannot do %s reset with paths." msgstr "Kan inte göra %s återställning med sökvägar." -#: builtin/reset.c:489 +#: builtin/reset.c:496 #, 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:520 +#: builtin/reset.c:527 msgid "Unstaged changes after reset:" msgstr "Oköade ändringar efter återställning:" -#: builtin/reset.c:523 +#: builtin/reset.c:530 #, c-format msgid "" -"\n" -"It took %.2f seconds to enumerate unstaged changes after reset. You can\n" -"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n" -"to make this the default.\n" +"It took %.2f seconds to refresh the index after reset. You can use\n" +"'--no-refresh' to avoid this." msgstr "" -"\n" -"Det tog %.2f sekunder att räkna upp oköade ändringar efter återställning.\n" -"Du kan använda \"--quiet\" för att förhindra detta. Ställ " -"konfigurationsvariabeln\n" -"reset.quiet till true för att göra detta till förval.\n" +"Det tog %.2f sekunder att uppdatera indexet efter återställning.\n" +"Du kan använda \"--no-refresh\" för undvika detta." -#: builtin/reset.c:541 +#: builtin/reset.c:547 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." -#: builtin/reset.c:546 +#: builtin/reset.c:552 msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-list.c:602 -msgid "object filtering requires --objects" -msgstr "objektfiltrering kräver --objects" - -#: builtin/rev-list.c:674 +#: builtin/rev-list.c:659 msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" -#: builtin/rev-list.c:679 +#: builtin/rev-list.c:664 #, c-format msgid "marked counting and '%s' cannot be used together" msgstr "markerad räkning och \"%s\" kan inte användas samtidigt." @@ -21938,11 +22427,11 @@ msgstr "föt" msgid "group by field" msgstr "gruppera efter fält" -#: builtin/shortlog.c:394 +#: builtin/shortlog.c:395 msgid "too many arguments given outside repository" msgstr "för många flaggor givna utanför arkivet" -#: builtin/show-branch.c:13 +#: builtin/show-branch.c:14 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -21954,119 +22443,119 @@ msgstr "" " [--more=<n> | --list | --independent | --merge-base]\n" " [--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]" -#: builtin/show-branch.c:17 +#: builtin/show-branch.c:18 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]" -#: builtin/show-branch.c:395 +#: builtin/show-branch.c:396 #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "ignorerar %s; kan inte hantera mer än %d referens" msgstr[1] "ignorerar %s; kan inte hantera mer än %d referenser" -#: builtin/show-branch.c:547 +#: builtin/show-branch.c:548 #, c-format msgid "no matching refs with %s" msgstr "inga motsvarande referenser med %s" -#: builtin/show-branch.c:644 +#: builtin/show-branch.c:645 msgid "show remote-tracking and local branches" msgstr "visa fjärrspårande och lokala grenar" -#: builtin/show-branch.c:646 +#: builtin/show-branch.c:647 msgid "show remote-tracking branches" msgstr "visa fjärrspårande grenar" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:649 msgid "color '*!+-' corresponding to the branch" msgstr "färga \"*!+-\" enligt grenen" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:651 msgid "show <n> more commits after the common ancestor" msgstr "visa <n> ytterligare incheckningar efter gemensam anfader" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:653 msgid "synonym to more=-1" msgstr "synonym till more=-1" -#: builtin/show-branch.c:653 +#: builtin/show-branch.c:654 msgid "suppress naming strings" msgstr "undertyck namnsträngar" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:656 msgid "include the current branch" msgstr "ta med aktuell gren" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:658 msgid "name commits with their object names" msgstr "namnge incheckningar med deras objektnamn" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:660 msgid "show possible merge bases" msgstr "visa möjliga sammanslagningsbaser" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:662 msgid "show refs unreachable from any other ref" msgstr "visa referenser som inte kan nås från någon annan referens" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:664 msgid "show commits in topological order" msgstr "visa incheckningar i topologisk ordning" -#: builtin/show-branch.c:666 +#: builtin/show-branch.c:667 msgid "show only commits not on the first branch" msgstr "visa endast incheckningar inte på den första grenen" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:669 msgid "show merges reachable from only one tip" msgstr "visa sammanslagningar som endast kan nås från en spets" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:671 msgid "topologically sort, maintaining date order where possible" msgstr "sortera topologiskt, behåll datumordning när möjligt" -#: builtin/show-branch.c:673 +#: builtin/show-branch.c:674 msgid "<n>[,<base>]" msgstr "<n>[,<bas>]" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:675 msgid "show <n> most recent ref-log entries starting at base" msgstr "visa <n> nyaste refloggposter med början på bas" -#: builtin/show-branch.c:734 +#: builtin/show-branch.c:735 msgid "no branches given, and HEAD is not valid" msgstr "inga grenar angavs, och HEAD är inte giltigt" -#: builtin/show-branch.c:737 +#: builtin/show-branch.c:738 msgid "--reflog option needs one branch name" msgstr "--reflog behöver ett namn på en gren" -#: builtin/show-branch.c:740 +#: builtin/show-branch.c:741 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "maximalt %d poster kan visas samtidigt." msgstr[1] "maximalt %d poster kan visas samtidigt." -#: builtin/show-branch.c:744 +#: builtin/show-branch.c:745 #, c-format msgid "no such ref %s" msgstr "ingen sådan referens %s" -#: builtin/show-branch.c:830 +#: builtin/show-branch.c:831 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "kan inte hantera mer än %d revision." msgstr[1] "kan inte hantera mer än %d revisioner." -#: builtin/show-branch.c:834 +#: builtin/show-branch.c:835 #, c-format msgid "'%s' is not a valid ref." msgstr "\"%s\" är inte en giltig referens." -#: builtin/show-branch.c:837 +#: builtin/show-branch.c:838 #, c-format msgid "cannot find commit %s (%s)" msgstr "hittar inte incheckning %s (%s)" @@ -22123,24 +22612,20 @@ 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:22 +#: builtin/sparse-checkout.c:23 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <flaggor>" -#: builtin/sparse-checkout.c:46 -msgid "git sparse-checkout list" -msgstr "git sparse-checkout list" - -#: builtin/sparse-checkout.c:60 +#: builtin/sparse-checkout.c:61 msgid "this worktree is not sparse" msgstr "arbetskatalogen är inte gren" -#: builtin/sparse-checkout.c:75 +#: builtin/sparse-checkout.c:76 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:176 +#: builtin/sparse-checkout.c:177 #, c-format msgid "" "directory '%s' contains untracked files, but is not in the sparse-checkout " @@ -22149,98 +22634,131 @@ msgstr "" "katalogen \"%s\" innehåller ospårade filer, men är inte i området som ages i " "\"sparse-checkout\"" -#: builtin/sparse-checkout.c:184 +#: builtin/sparse-checkout.c:185 #, c-format msgid "failed to remove directory '%s'" msgstr "misslyckades ta bort katalogen \"%s\"" -#: builtin/sparse-checkout.c:324 +#: builtin/sparse-checkout.c:327 msgid "failed to create directory for sparse-checkout file" msgstr "misslyckades skapa katalog för \"sparse-checkout\"-filen" -#: builtin/sparse-checkout.c:365 -msgid "unable to upgrade repository format to enable worktreeConfig" -msgstr "kunde inte uppgradera arkivformat för att aktivera worktreeConfig" - -#: builtin/sparse-checkout.c:367 -msgid "failed to set extensions.worktreeConfig setting" -msgstr "misslyckades ändra inställningen extensions.worktreeConfig" +#: builtin/sparse-checkout.c:366 +msgid "failed to initialize worktree config" +msgstr "misslyckades initiera arbetskataloginställning" #: builtin/sparse-checkout.c:411 msgid "failed to modify sparse-index config" msgstr "misslyckades ändra inställning för sparse-index" -#: builtin/sparse-checkout.c:422 -msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" -msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" - -#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729 -#: builtin/sparse-checkout.c:778 +#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793 +#: builtin/sparse-checkout.c:847 msgid "initialize the sparse-checkout in cone mode" msgstr "initiera sparse-checkout i konläge" -#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731 -#: builtin/sparse-checkout.c:780 +#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795 +#: builtin/sparse-checkout.c:849 msgid "toggle the use of a sparse index" msgstr "slå på/av använding av glest index" -#: builtin/sparse-checkout.c:476 +#: builtin/sparse-checkout.c:479 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: builtin/sparse-checkout.c:528 +#: builtin/sparse-checkout.c:531 #, c-format msgid "could not normalize path %s" msgstr "kunde inte normalisera sökvägen \"%s\"" -#: builtin/sparse-checkout.c:557 +#: builtin/sparse-checkout.c:560 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "kan inte ta bort citering av C-sträng \"%s\"" -#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640 +#: builtin/sparse-checkout.c:615 builtin/sparse-checkout.c:643 msgid "unable to load existing sparse-checkout patterns" msgstr "kunde inte läsa in existerande mönster för gles utcheckning" -#: builtin/sparse-checkout.c:616 +#: builtin/sparse-checkout.c:619 msgid "existing sparse-checkout patterns do not use cone mode" msgstr "befintliga filter för gles utcheckning använder inte konläge" -#: builtin/sparse-checkout.c:682 -msgid "git sparse-checkout add (--stdin | <patterns>)" -msgstr "git sparse-checkout add (--stdin | <mönster>)" +#: builtin/sparse-checkout.c:707 +msgid "please run from the toplevel directory in non-cone mode" +msgstr "vänligen kör från toppnivåkatalogen i icke-konläge" + +#: builtin/sparse-checkout.c:712 +msgid "specify directories rather than patterns (no leading slash)" +msgstr "ange kataloger istället för mönster (utan inledande snedstreck)" + +#: builtin/sparse-checkout.c:714 +msgid "" +"specify directories rather than patterns. If your directory starts with a " +"'!', pass --skip-checks" +msgstr "" +"ange kataloger istället för mönster. Om din katalog börjar med ett \"!\", " +"sänd med --skip-checks" + +#: builtin/sparse-checkout.c:716 +msgid "" +"specify directories rather than patterns. If your directory really has any " +"of '*?[]\\' in it, pass --skip-checks" +msgstr "" +"ange kataloger istället för mönster. Om din katalog faktiskt har tecknen '*?" +"[]\\' i namnet, sänd med --skip-checks" + +#: builtin/sparse-checkout.c:732 +#, c-format +msgid "" +"'%s' is not a directory; to treat it as a directory anyway, rerun with --" +"skip-checks" +msgstr "" +"\"%s\" är inte en katalog: för att ändå behandla det som en katalog, kör på " +"nytt med --skip-checks" + +#: builtin/sparse-checkout.c:734 +#, c-format +msgid "" +"pass a leading slash before paths such as '%s' if you want a single file " +"(see NON-CONE PROBLEMS in the git-sparse-checkout manual)." +msgstr "" +"sänd med ett inledande snedstreck före sökvägar som \"%s\" om du vill ha en " +"enstaka file (se NON-CONE PROBLEMS i manualen git-sparse-checkout)." + +#: builtin/sparse-checkout.c:739 +msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)" +msgstr "git sparse-checkout add [--skip-checks] (--stdin | <mönster>)" + +#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797 +msgid "" +"skip some sanity checks on the given paths that might give false positives" +msgstr "" +"hoppa över några kontroller på de angivna sökvägarna som kan ge falska " +"positiva" -#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733 +#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800 msgid "read patterns from standard in" msgstr "läs mönster från standard in" -#: builtin/sparse-checkout.c:699 +#: builtin/sparse-checkout.c:760 msgid "no sparse-checkout to add to" msgstr "ingen sparse-checkout att utöka" -#: builtin/sparse-checkout.c:712 +#: builtin/sparse-checkout.c:775 msgid "" -"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | " -"<patterns>)" +"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] " +"(--stdin | <patterns>)" msgstr "" -"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | " -"<mönster>)" - -#: builtin/sparse-checkout.c:765 -msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]" -msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]" +"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] " +"(--stdin | <mönster>)" -#: builtin/sparse-checkout.c:785 +#: builtin/sparse-checkout.c:854 msgid "must be in a sparse-checkout to reapply sparsity patterns" msgstr "" "måste vara i en gles utcheckning för att tillämpa gleshetsmönster på nytt" -#: builtin/sparse-checkout.c:803 -msgid "git sparse-checkout disable" -msgstr "git sparse-checkout disable" - -#: builtin/sparse-checkout.c:845 +#: builtin/sparse-checkout.c:914 msgid "error while refreshing working directory" msgstr "fel vid uppdatering av arbetskatalog" @@ -22382,168 +22900,152 @@ msgstr "Indexet har inte tagits upp ur \"stash\":en" msgid "could not restore untracked files from stash" msgstr "kunde inte återställa ospårade filer från stash-post" -#: builtin/stash.c:608 builtin/stash.c:706 +#: builtin/stash.c:608 builtin/stash.c:695 msgid "attempt to recreate the index" msgstr "försök återskapa indexet" -#: builtin/stash.c:652 +#: builtin/stash.c:641 #, c-format msgid "Dropped %s (%s)" msgstr "Kastade %s (%s)" -#: builtin/stash.c:655 +#: builtin/stash.c:644 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Kunde inte kasta \"stash\"-post" -#: builtin/stash.c:668 +#: builtin/stash.c:657 #, c-format msgid "'%s' is not a stash reference" msgstr "\"%s\" är inte en \"stash\"-referens" -#: builtin/stash.c:718 +#: builtin/stash.c:707 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:741 +#: builtin/stash.c:730 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: builtin/stash.c:825 +#: builtin/stash.c:809 msgid "failed to parse tree" msgstr "misslyckades tolka träd" -#: builtin/stash.c:836 +#: builtin/stash.c:820 msgid "failed to unpack trees" msgstr "misslyckades packa upp träd" -#: builtin/stash.c:856 +#: builtin/stash.c:840 msgid "include untracked files in the stash" msgstr "ta med ospårade filer i \"stash\"" -#: builtin/stash.c:859 +#: builtin/stash.c:843 msgid "only show untracked files in the stash" msgstr "visa bara ospårade filer i \"stash\"" -#: builtin/stash.c:946 builtin/stash.c:983 +#: builtin/stash.c:930 builtin/stash.c:967 #, c-format msgid "Cannot update %s with %s" msgstr "Kan inte uppdatera %s med %s" -#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750 +#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739 msgid "stash message" msgstr "\"stash\"-meddelande" -#: builtin/stash.c:974 +#: builtin/stash.c:958 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" kräver ett <incheckning>-argument" -#: builtin/stash.c:1159 +#: builtin/stash.c:1143 msgid "No staged changes" msgstr "Inga köade ändringar" -#: builtin/stash.c:1220 +#: builtin/stash.c:1204 msgid "No changes selected" msgstr "Inga ändringar valda" -#: builtin/stash.c:1320 +#: builtin/stash.c:1304 msgid "You do not have the initial commit yet" msgstr "Du har inte den första incheckningen ännu" -#: builtin/stash.c:1347 +#: builtin/stash.c:1331 msgid "Cannot save the current index state" msgstr "Kan inte spara aktuellt tillstånd för indexet" -#: builtin/stash.c:1356 +#: builtin/stash.c:1340 msgid "Cannot save the untracked files" msgstr "Kan inte spara ospårade filer" -#: builtin/stash.c:1367 builtin/stash.c:1386 +#: builtin/stash.c:1351 builtin/stash.c:1370 msgid "Cannot save the current worktree state" msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" -#: builtin/stash.c:1377 +#: builtin/stash.c:1361 msgid "Cannot save the current staged state" msgstr "Kan inte spara aktuellt tillstånd kö" -#: builtin/stash.c:1414 +#: builtin/stash.c:1398 msgid "Cannot record working tree state" msgstr "Kan inte registrera tillstånd för arbetskatalog" -#: builtin/stash.c:1463 +#: builtin/stash.c:1447 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt" -#: builtin/stash.c:1474 +#: builtin/stash.c:1458 msgid "Can't use --staged and --include-untracked or --all at the same time" msgstr "" "Kan inte använda --staged och --include-untracked eller --all samtidigt" -#: builtin/stash.c:1492 +#: builtin/stash.c:1476 msgid "Did you forget to 'git add'?" msgstr "Glömde du använda \"git add\"?" -#: builtin/stash.c:1507 +#: builtin/stash.c:1491 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" -#: builtin/stash.c:1514 +#: builtin/stash.c:1498 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: builtin/stash.c:1529 +#: builtin/stash.c:1513 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" -#: builtin/stash.c:1534 +#: builtin/stash.c:1518 #, c-format msgid "Saved working directory and index state %s" msgstr "Sparade arbetskatalogen och indexstatus %s" -#: builtin/stash.c:1627 +#: builtin/stash.c:1615 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: builtin/stash.c:1667 builtin/stash.c:1739 +#: builtin/stash.c:1656 builtin/stash.c:1728 msgid "keep index" msgstr "behåll indexet" -#: builtin/stash.c:1669 builtin/stash.c:1741 +#: builtin/stash.c:1658 builtin/stash.c:1730 msgid "stash staged changes only" msgstr "stash:a endast köade ändringar" -#: builtin/stash.c:1671 builtin/stash.c:1743 +#: builtin/stash.c:1660 builtin/stash.c:1732 msgid "stash in patch mode" msgstr "\"stash\" i \"patch\"-läge" -#: builtin/stash.c:1672 builtin/stash.c:1744 +#: builtin/stash.c:1661 builtin/stash.c:1733 msgid "quiet mode" msgstr "tyst läge" -#: builtin/stash.c:1674 builtin/stash.c:1746 +#: builtin/stash.c:1663 builtin/stash.c:1735 msgid "include untracked files in stash" msgstr "ta med ospårade filer i \"stash\"" -#: builtin/stash.c:1676 builtin/stash.c:1748 +#: builtin/stash.c:1665 builtin/stash.c:1737 msgid "include ignore files" msgstr "ta med ignorerade filer" -#: builtin/stash.c:1783 -msgid "" -"the stash.useBuiltin support has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" -"stödet för stash.useBuiltin har tagits bort!\n" -"Se posten för det i \"git help config\" för detaljer." - -#: builtin/stripspace.c:18 -msgid "git stripspace [-s | --strip-comments]" -msgstr "git stripspace [-s | --strip-comments]" - -#: builtin/stripspace.c:19 -msgid "git stripspace [-c | --comment-lines]" -msgstr "git stripspace [-c | --comment-lines]" - #: builtin/stripspace.c:37 msgid "skip and remove all lines starting with comment character" msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken" @@ -22552,21 +23054,17 @@ 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:46 builtin/submodule--helper.c:2668 +#: builtin/submodule--helper.c:50 builtin/submodule--helper.c:2486 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" -#: builtin/submodule--helper.c:63 -msgid "submodule--helper print-default-remote takes no arguments" -msgstr "submodule--helper print-default-remote tar inga argument" - -#: builtin/submodule--helper.c:101 +#: builtin/submodule--helper.c:103 #, 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:211 +#: builtin/submodule--helper.c:213 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -22575,26 +23073,26 @@ msgstr "" "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget " "officiella uppström." -#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859 +#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" -#: builtin/submodule--helper.c:410 +#: builtin/submodule--helper.c:418 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605 -#: builtin/submodule--helper.c:628 +#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617 +#: builtin/submodule--helper.c:640 #, 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:520 +#: builtin/submodule--helper.c:528 #, c-format msgid "Entering '%s'\n" msgstr "Går in i \"%s\"\n" -#: builtin/submodule--helper.c:523 +#: builtin/submodule--helper.c:531 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -22603,7 +23101,7 @@ msgstr "" "run_command returnerade icke-nollstatus för %s\n" "." -#: builtin/submodule--helper.c:545 +#: builtin/submodule--helper.c:553 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -22614,67 +23112,67 @@ msgstr "" "undermoduler för %s\n" "." -#: builtin/submodule--helper.c:561 +#: builtin/submodule--helper.c:569 msgid "suppress output of entering each submodule command" msgstr "dölj utdata från för varje undermodulskommando som startas" -#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864 -#: builtin/submodule--helper.c:1453 +#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:1458 msgid "recurse into nested submodules" msgstr "rekursera in i nästlade undermoduler" -#: builtin/submodule--helper.c:568 +#: builtin/submodule--helper.c:576 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]" -#: builtin/submodule--helper.c:642 +#: builtin/submodule--helper.c:654 #, 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:646 +#: builtin/submodule--helper.c:658 #, 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:656 +#: builtin/submodule--helper.c:668 #, 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:663 +#: builtin/submodule--helper.c:675 #, 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:685 +#: builtin/submodule--helper.c:697 msgid "suppress output for initializing a submodule" msgstr "dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:690 +#: builtin/submodule--helper.c:702 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<flaggor>] [<sökväg>]" -#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898 +#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910 #, 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:811 +#: builtin/submodule--helper.c:823 #, 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:838 builtin/submodule--helper.c:1423 +#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1428 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "misslyckades rekursera in i undermodulen \"%s\"" -#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590 +#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595 msgid "suppress submodule status output" msgstr "hindra statusutskrift för undermodul" -#: builtin/submodule--helper.c:863 +#: builtin/submodule--helper.c:875 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -22682,94 +23180,94 @@ msgstr "" "visa incheckning från indexet istället för den som lagrats i undermodulens " "HEAD" -#: builtin/submodule--helper.c:869 +#: builtin/submodule--helper.c:881 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]" -#: builtin/submodule--helper.c:893 +#: builtin/submodule--helper.c:905 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sökväg>" -#: builtin/submodule--helper.c:965 +#: builtin/submodule--helper.c:977 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodule)" -#: builtin/submodule--helper.c:968 +#: builtin/submodule--helper.c:980 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(submodule)->%s(blob)" -#: builtin/submodule--helper.c:981 +#: builtin/submodule--helper.c:993 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1031 +#: builtin/submodule--helper.c:1043 #, c-format msgid "couldn't hash object from '%s'" msgstr "kunde inte hasha objekt från \"%s\"" -#: builtin/submodule--helper.c:1035 +#: builtin/submodule--helper.c:1047 #, c-format msgid "unexpected mode %o\n" msgstr "okänt läge %o\n" -#: builtin/submodule--helper.c:1276 +#: builtin/submodule--helper.c:1288 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "använd incechkning lagrad i indexet istället för undermodulens HEAD" -#: builtin/submodule--helper.c:1278 +#: builtin/submodule--helper.c:1290 msgid "compare the commit in the index with that in the submodule HEAD" msgstr "jämför incheckningen i indexet med den i undermodulens HEAD" -#: builtin/submodule--helper.c:1280 +#: builtin/submodule--helper.c:1292 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "" "hoppa över undermoduler där värdet för \"ignore_config\" är satt till \"all\"" -#: builtin/submodule--helper.c:1282 +#: builtin/submodule--helper.c:1294 msgid "limit the summary size" msgstr "begränsa översiktsstorleken" -#: builtin/submodule--helper.c:1287 +#: builtin/submodule--helper.c:1299 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "" "git submodule--helper summary [<flaggor>] [<incheckning>] [--] [<sökväg>]" -#: builtin/submodule--helper.c:1311 +#: builtin/submodule--helper.c:1323 msgid "could not fetch a revision for HEAD" msgstr "kunde inte hämta en version för HEAD" -#: builtin/submodule--helper.c:1373 +#: builtin/submodule--helper.c:1384 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synkroniserar undermodul-url för \"%s\"\n" -#: builtin/submodule--helper.c:1379 +#: builtin/submodule--helper.c:1390 #, 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:1393 +#: builtin/submodule--helper.c:1399 #, 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:1404 +#: builtin/submodule--helper.c:1409 #, 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:1451 +#: builtin/submodule--helper.c:1456 msgid "suppress output of synchronizing submodule url" msgstr "dölj utdata från synkronisering av undermodul-url" -#: builtin/submodule--helper.c:1458 +#: builtin/submodule--helper.c:1463 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]" -#: builtin/submodule--helper.c:1508 +#: builtin/submodule--helper.c:1513 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory. This will be replaced " @@ -22778,7 +23276,7 @@ msgstr "" "Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog. Denna kommer " "ersättas med en .git-fil med absorbgitdirs." -#: builtin/submodule--helper.c:1525 +#: builtin/submodule--helper.c:1530 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -22787,46 +23285,46 @@ msgstr "" "Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort " "dem" -#: builtin/submodule--helper.c:1533 +#: builtin/submodule--helper.c:1538 #, c-format msgid "Cleared directory '%s'\n" msgstr "Rensade katalogen \"%s\"\n" -#: builtin/submodule--helper.c:1535 +#: builtin/submodule--helper.c:1540 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n" -#: builtin/submodule--helper.c:1546 +#: builtin/submodule--helper.c:1551 #, c-format msgid "could not create empty submodule directory %s" msgstr "kunde inte skapa tom undermodulskatalog %s" -#: builtin/submodule--helper.c:1562 +#: builtin/submodule--helper.c:1567 #, 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:1591 +#: builtin/submodule--helper.c:1596 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:1592 +#: builtin/submodule--helper.c:1597 msgid "unregister all submodules" msgstr "avregistrera alla undermoduler" -#: builtin/submodule--helper.c:1597 +#: builtin/submodule--helper.c:1602 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]" -#: builtin/submodule--helper.c:1611 +#: builtin/submodule--helper.c:1616 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:1656 +#: builtin/submodule--helper.c:1665 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" @@ -22838,102 +23336,102 @@ msgstr "" "submodule.alternateErrorStrategy till \"info\" eller, likvärdigt, klona\n" "med \"--reference-if-able\" istället för \"--reference\"." -#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704 +#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "undermodulen \"%s\" kan inte lägga till suppleant: %s" -#: builtin/submodule--helper.c:1740 +#: builtin/submodule--helper.c:1749 #, 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:1747 +#: builtin/submodule--helper.c:1756 #, 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:1772 +#: builtin/submodule--helper.c:1781 #, 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:1813 +#: builtin/submodule--helper.c:1826 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\"" -#: builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1831 #, c-format msgid "directory not empty: '%s'" msgstr "katalogen inte tom: \"%s\"" -#: builtin/submodule--helper.c:1830 +#: builtin/submodule--helper.c:1843 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" -#: builtin/submodule--helper.c:1862 +#: builtin/submodule--helper.c:1876 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen ska klonas till" -#: builtin/submodule--helper.c:1865 +#: builtin/submodule--helper.c:1879 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:1868 +#: builtin/submodule--helper.c:1882 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265 +#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526 -#: builtin/submodule--helper.c:3258 +#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731 +#: builtin/submodule--helper.c:3376 msgid "force cloning progress" msgstr "tvinga kloningsförlopp" -#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528 +#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733 msgid "disallow cloning into non-empty directory" msgstr "förhindra kloning till icke-tom katalog" -#: builtin/submodule--helper.c:1888 +#: builtin/submodule--helper.c:1903 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " -"<url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter " +"<filter-spec>] --url <url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference " -"<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] --url <url> --" -"path <sökväg>" +"<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] [--filter " +"<filterangivelse>] --url <url> --path <sökväg>" -#: builtin/submodule--helper.c:1925 +#: builtin/submodule--helper.c:1943 #, 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:1929 +#: builtin/submodule--helper.c:1947 #, 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:2044 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:2048 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:2078 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:2107 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" @@ -22948,52 +23446,52 @@ msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" msgid "Failed to clone '%s' a second time, aborting" msgstr "Misslyckades klona \"%s\" för andra gången, avbryter" -#: builtin/submodule--helper.c:2373 +#: builtin/submodule--helper.c:2371 #, c-format msgid "Unable to checkout '%s' in submodule path '%s'" msgstr "Kan inte checka ut \"%s\" i undermodulsökvägen \"%s\"" -#: builtin/submodule--helper.c:2377 +#: builtin/submodule--helper.c:2375 #, c-format msgid "Unable to rebase '%s' in submodule path '%s'" msgstr "Kan inte ombasera \"%s\" i undermodulsökvägen \"%s\"" -#: builtin/submodule--helper.c:2381 +#: builtin/submodule--helper.c:2379 #, c-format msgid "Unable to merge '%s' in submodule path '%s'" msgstr "Kan inte slå ihop \"%s\" i undermodulsökvägen \"%s\"" -#: builtin/submodule--helper.c:2385 +#: builtin/submodule--helper.c:2383 #, c-format msgid "Execution of '%s %s' failed in submodule path '%s'" msgstr "Misslyckades köra \"%s %s\" i undermodulsökvägen \"%s\"" -#: builtin/submodule--helper.c:2409 +#: builtin/submodule--helper.c:2402 #, c-format msgid "Submodule path '%s': checked out '%s'\n" msgstr "Undermodulsökvägen \"%s\": checkade ut \"%s\"\n" -#: builtin/submodule--helper.c:2413 +#: builtin/submodule--helper.c:2406 #, c-format msgid "Submodule path '%s': rebased into '%s'\n" msgstr "Undermodulsökvägen \"%s\": ombaserade in i \"%s\"\n" -#: builtin/submodule--helper.c:2417 +#: builtin/submodule--helper.c:2410 #, c-format msgid "Submodule path '%s': merged in '%s'\n" msgstr "Undermodulsökvägen \"%s\": sammanslagen i \"%s\"\n" -#: builtin/submodule--helper.c:2421 +#: builtin/submodule--helper.c:2414 #, c-format msgid "Submodule path '%s': '%s %s'\n" msgstr "Undermodulsökvägen \"%s\": \"%s %s\"\n" -#: builtin/submodule--helper.c:2445 +#: builtin/submodule--helper.c:2438 #, c-format msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:" msgstr "Kan inte hämta i undermodulsökväg \"%s\"; försökte hämta %s direkt:" -#: builtin/submodule--helper.c:2454 +#: builtin/submodule--helper.c:2447 #, c-format msgid "" "Fetched in submodule path '%s', but it did not contain %s. Direct fetching " @@ -23002,176 +23500,204 @@ msgstr "" "Hämtade i undermodulssökvägen \"%s\", men den innehöll inte %s. Direkt " "hämtning av incheckningen misslyckades." -#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575 -#: builtin/submodule--helper.c:2813 +#: builtin/submodule--helper.c:2481 +#, c-format +msgid "" +"Submodule (%s) branch configured to inherit branch from superproject, but " +"the superproject is not on any branch" +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:2499 +#, 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:2588 +#, c-format +msgid "Unable to find current revision in submodule path '%s'" +msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"%s\"" + +#: builtin/submodule--helper.c:2599 +#, c-format +msgid "Unable to fetch in submodule path '%s'" +msgstr "Kan inte hämta i undermodulsökväg \"%s\"" + +#: builtin/submodule--helper.c:2604 +#, c-format +msgid "Unable to find %s revision in submodule path '%s'" +msgstr "Kan inte hitta %s revision i undermodulsökvägen \"%s\"" + +#: builtin/submodule--helper.c:2640 +#, c-format +msgid "Failed to recurse into submodule path '%s'" +msgstr "Misslyckades rekursera in i undermodulsökväg \"%s\"" + +#: builtin/submodule--helper.c:2699 +msgid "force checkout updates" +msgstr "tvinga utcheckningsuppdateringar" + +#: builtin/submodule--helper.c:2701 +msgid "initialize uninitialized submodules before update" +msgstr "initiera oinitierade undermoduler före uppdateringen" + +#: builtin/submodule--helper.c:2703 +msgid "use SHA-1 of submodule's remote tracking branch" +msgstr "använd SHA-1 från undermodulers fjärrspårningsgren" + +#: builtin/submodule--helper.c:2705 +msgid "traverse submodules recursively" +msgstr "traversera undermoduler rekursivt" + +#: builtin/submodule--helper.c:2707 +msgid "don't fetch new objects from the remote site" +msgstr "hämta inte nya objekt från fjärrplatsen" + +#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580 +#: builtin/submodule--helper.c:2713 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:2512 builtin/submodule--helper.c:2578 +#: builtin/submodule--helper.c:2717 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:2518 +#: builtin/submodule--helper.c:2723 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:2521 +#: builtin/submodule--helper.c:2726 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:2523 +#: builtin/submodule--helper.c:2728 msgid "whether the initial clone should follow the shallow recommendation" msgstr "om den första klonen ska följa rekommendation för grund kloning" -#: builtin/submodule--helper.c:2524 +#: builtin/submodule--helper.c:2729 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:2535 -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:2548 -msgid "bad value for update parameter" -msgstr "felaktigt värde för parametern update" - -#: builtin/submodule--helper.c:2566 -msgid "suppress output for update by rebase or merge" -msgstr "dölj utdata för uppdatering via ombasering eller sammanslagning{" - -#: builtin/submodule--helper.c:2567 -msgid "force checkout updates" -msgstr "tvinga utcheckningsuppdateringar" - -#: builtin/submodule--helper.c:2569 -msgid "don't fetch new objects from the remote site" -msgstr "hämta inte nya objekt från fjärrplatsen" - -#: builtin/submodule--helper.c:2571 -msgid "overrides update mode in case the repository is a fresh clone" -msgstr "överstyr uppdateringsläge om arkviet är en färsk klon" - -#: builtin/submodule--helper.c:2572 -msgid "depth for shallow fetch" -msgstr "djup för grund hämtning" - -#: builtin/submodule--helper.c:2582 -msgid "sha1" -msgstr "sha1" - -#: builtin/submodule--helper.c:2583 -msgid "SHA1 expected by superproject" -msgstr "SHA1 förväntades av överprojekt{" - -#: builtin/submodule--helper.c:2585 -msgid "subsha1" -msgstr "subsha1" - -#: builtin/submodule--helper.c:2586 -msgid "SHA1 of submodule's HEAD" -msgstr "SHA1 för undermodulens \"HEAD\"" - -#: builtin/submodule--helper.c:2592 -msgid "git submodule--helper run-update-procedure [<options>] <path>" -msgstr "git submodule--helper run-update-procedure [<flaggor>] <sökväg>" - -#: builtin/submodule--helper.c:2663 -#, c-format +#: builtin/submodule--helper.c:2741 msgid "" -"Submodule (%s) branch configured to inherit branch from superproject, but " -"the superproject is not on any branch" +"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] " +"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-" +"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] " +"[--] [<path>...]" msgstr "" -"Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men " -"huvudprojektet är inte på någon gren" +"git submodule [--quiet] update [--init [--filter=<filterspecifikationer>]] " +"[--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--" +"[no-]recommend-shallow] [--reference <arkiv>] [--recursive] [--[no-]single-" +"branch] [--] [<sökväg>...]" -#: builtin/submodule--helper.c:2781 -#, 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:2767 +msgid "bad value for update parameter" +msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:2814 +#: builtin/submodule--helper.c:2893 msgid "recurse into submodules" msgstr "rekursera ner i undermoduler" -#: builtin/submodule--helper.c:2820 +#: builtin/submodule--helper.c:2899 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<flaggor>] [<sökväg>...]" -#: builtin/submodule--helper.c:2876 +#: builtin/submodule--helper.c:2955 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:2879 +#: builtin/submodule--helper.c:2958 msgid "unset the config in the .gitmodules file" msgstr "ta bort konfigurationen från .gitmodules-filen" -#: builtin/submodule--helper.c:2884 +#: builtin/submodule--helper.c:2963 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <namn> [<värde>]" -#: builtin/submodule--helper.c:2885 +#: builtin/submodule--helper.c:2964 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <namn>" -#: builtin/submodule--helper.c:2886 -msgid "git submodule--helper config --check-writeable" -msgstr "git submodule--helper config --check-writeable" - -#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121 -#: builtin/submodule--helper.c:3277 +#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238 +#: builtin/submodule--helper.c:3395 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:2921 +#: builtin/submodule--helper.c:3000 msgid "suppress output for setting url of a submodule" msgstr "dölj utdata från inställning av url för undermodul" -#: builtin/submodule--helper.c:2925 +#: builtin/submodule--helper.c:3004 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <sökväg> <nyurl>" -#: builtin/submodule--helper.c:2958 +#: builtin/submodule--helper.c:3037 msgid "set the default tracking branch to master" msgstr "välj master som förvald spårad gren" -#: builtin/submodule--helper.c:2960 +#: builtin/submodule--helper.c:3039 msgid "set the default tracking branch" msgstr "välj förvald spårad gren" -#: builtin/submodule--helper.c:2964 +#: builtin/submodule--helper.c:3043 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <sökväg>" -#: builtin/submodule--helper.c:2965 +#: builtin/submodule--helper.c:3044 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <gren> <sökväg>" -#: builtin/submodule--helper.c:2972 +#: builtin/submodule--helper.c:3051 msgid "--branch or --default required" msgstr "--branch eller --default krävs" -#: builtin/submodule--helper.c:3038 +#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375 +msgid "print only error messages" +msgstr "visa endast felmeddelanden" + +#: builtin/submodule--helper.c:3073 +msgid "force creation" +msgstr "tvinga skapande" + +#: builtin/submodule--helper.c:3081 +msgid "show whether the branch would be created" +msgstr "visa om grenen skulle skapas" + +#: builtin/submodule--helper.c:3085 +msgid "" +"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--" +"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>" +msgstr "" +"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--" +"quiet] [-t|--track] [-n|--dry-run] <namn> <start-oid> <start-namn>" + +#: builtin/submodule--helper.c:3097 +#, c-format +msgid "creating branch '%s'" +msgstr "skapar grenen \"%s\"" + +#: builtin/submodule--helper.c:3155 #, c-format msgid "Adding existing repo at '%s' to the index\n" msgstr "Lägger till befintligt arkiv i \"%s\" i indexet\n" -#: builtin/submodule--helper.c:3041 +#: builtin/submodule--helper.c:3158 #, c-format msgid "'%s' already exists and is not a valid git repo" msgstr "\"%s\" finns redan och är inte ett giltigt git-arkiv" -#: builtin/submodule--helper.c:3054 +#: builtin/submodule--helper.c:3171 #, c-format msgid "A git directory for '%s' is found locally with remote(s):\n" msgstr "En git-katalog för \"%s\" hittades lokalt med fjärr(ar):\n" -#: builtin/submodule--helper.c:3061 +#: builtin/submodule--helper.c:3178 #, c-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -23189,54 +23715,50 @@ msgstr "" "arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n" "flaggan \"--name\"." -#: builtin/submodule--helper.c:3073 +#: builtin/submodule--helper.c:3190 #, c-format msgid "Reactivating local git directory for submodule '%s'\n" msgstr "Aktiverar lokal git-katalog för undermodulen \"%s\" på nytt.\n" -#: builtin/submodule--helper.c:3110 +#: builtin/submodule--helper.c:3227 #, c-format msgid "unable to checkout submodule '%s'" msgstr "Kan inte checka ut undermodulen \"%s\"" -#: builtin/submodule--helper.c:3149 +#: builtin/submodule--helper.c:3266 #, c-format msgid "Failed to add submodule '%s'" msgstr "Misslyckades lägga till undermodulen \"%s\"" -#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158 -#: builtin/submodule--helper.c:3166 +#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275 +#: builtin/submodule--helper.c:3283 #, c-format msgid "Failed to register submodule '%s'" msgstr "Misslyckades registrera undermodulen \"%s\"" -#: builtin/submodule--helper.c:3222 +#: builtin/submodule--helper.c:3339 #, c-format msgid "'%s' already exists in the index" msgstr "\"%s\" finns redan i indexet" -#: builtin/submodule--helper.c:3225 +#: builtin/submodule--helper.c:3342 #, c-format msgid "'%s' already exists in the index and is not a submodule" msgstr "\"%s\" finns redan i indexet och är inte en undermodul" -#: builtin/submodule--helper.c:3254 +#: builtin/submodule--helper.c:3372 msgid "branch of repository to add as submodule" msgstr "gren från arkivet att lägga till som undermodul" -#: builtin/submodule--helper.c:3255 +#: builtin/submodule--helper.c:3373 msgid "allow adding an otherwise ignored submodule path" msgstr "tillåt lägga till en annars ignorerad undermodulsökväg" -#: builtin/submodule--helper.c:3257 -msgid "print only error messages" -msgstr "visa endast felmeddelanden" - -#: builtin/submodule--helper.c:3261 +#: builtin/submodule--helper.c:3379 msgid "borrow the objects from reference repositories" msgstr "låna objekt från referensarkiv" -#: builtin/submodule--helper.c:3263 +#: builtin/submodule--helper.c:3381 msgid "" "sets the submodule’s name to the given string instead of defaulting to its " "path" @@ -23244,30 +23766,30 @@ msgstr "" "sätter undermodulens namn till den angivna strängen istället för att använda " "sökvägen" -#: builtin/submodule--helper.c:3270 +#: builtin/submodule--helper.c:3388 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]" msgstr "git submodule--helper add [<flaggor>] [--] <arkiv> [<sökväg>]" -#: builtin/submodule--helper.c:3298 +#: builtin/submodule--helper.c:3416 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å" -#: builtin/submodule--helper.c:3306 +#: builtin/submodule--helper.c:3425 #, c-format msgid "repo URL: '%s' must be absolute or begin with ./|../" msgstr "arkiv-URL: \"%s\" måste vara absolut eller börja med ./|../" -#: builtin/submodule--helper.c:3341 +#: builtin/submodule--helper.c:3460 #, c-format msgid "'%s' is not a valid submodule name" msgstr "\"%s\" är inte ett giltigt namn på undermodul" -#: builtin/submodule--helper.c:3405 git.c:452 git.c:726 +#: builtin/submodule--helper.c:3520 git.c:453 git.c:729 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" -#: builtin/submodule--helper.c:3411 +#: builtin/submodule--helper.c:3526 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -23301,7 +23823,7 @@ msgstr "skäl" msgid "reason of the update" msgstr "skäl till uppdateringen" -#: builtin/tag.c:25 +#: builtin/tag.c:26 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" " <tagname> [<head>]" @@ -23309,11 +23831,11 @@ msgstr "" "git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>]\n" " <taggnamn> [<huvud>]" -#: builtin/tag.c:27 +#: builtin/tag.c:28 msgid "git tag -d <tagname>..." msgstr "git tag -d <taggnamn>..." -#: builtin/tag.c:28 +#: builtin/tag.c:29 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" @@ -23325,21 +23847,21 @@ msgstr "" " [--format=<format>] [--merged <incheckning>] [--no-merged " "<incheckning>] [<mönster>...]" -#: builtin/tag.c:30 +#: builtin/tag.c:31 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<format>] <taggnamn>..." -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "tag '%s' not found." msgstr "taggen \"%s\" hittades inte." -#: builtin/tag.c:135 +#: builtin/tag.c:136 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tog bort tagg \"%s\" (var %s)\n" -#: builtin/tag.c:170 +#: builtin/tag.c:171 #, c-format msgid "" "\n" @@ -23352,7 +23874,7 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/tag.c:174 +#: builtin/tag.c:175 #, c-format msgid "" "\n" @@ -23367,11 +23889,11 @@ msgstr "" "Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n" "du vill.\n" -#: builtin/tag.c:240 +#: builtin/tag.c:241 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:258 +#: builtin/tag.c:259 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -23384,115 +23906,119 @@ msgstr "" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:274 +#: builtin/tag.c:275 msgid "bad object type." msgstr "felaktig objekttyp." -#: builtin/tag.c:325 +#: builtin/tag.c:326 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:332 +#: builtin/tag.c:333 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:444 +#: builtin/tag.c:445 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:446 +#: builtin/tag.c:447 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:448 +#: builtin/tag.c:449 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:449 +#: builtin/tag.c:450 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:451 +#: builtin/tag.c:452 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:453 +#: builtin/tag.c:454 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:455 +#: builtin/tag.c:456 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:457 +#: builtin/tag.c:458 msgid "force edit of tag message" msgstr "tvinga redigering av incheckningsmeddelande" -#: builtin/tag.c:458 +#: builtin/tag.c:459 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:461 +#: builtin/tag.c:462 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:462 +#: builtin/tag.c:463 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:463 builtin/update-ref.c:511 +#: builtin/tag.c:464 builtin/update-ref.c:511 msgid "create a reflog" msgstr "skapa en reflog" -#: builtin/tag.c:465 +#: builtin/tag.c:466 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:466 +#: builtin/tag.c:467 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:467 builtin/tag.c:469 +#: builtin/tag.c:468 builtin/tag.c:470 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:468 builtin/tag.c:470 +#: builtin/tag.c:469 builtin/tag.c:471 msgid "print only tags that don't contain the commit" msgstr "visa endast taggar som inte innehåller incheckningen" -#: builtin/tag.c:471 +#: builtin/tag.c:472 msgid "print only tags that are merged" msgstr "visa endast taggar som slagits samman" -#: builtin/tag.c:472 +#: builtin/tag.c:473 msgid "print only tags that are not merged" msgstr "visa endast taggar som ej slagits samman" -#: builtin/tag.c:476 +#: builtin/tag.c:477 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:558 +#: builtin/tag.c:559 #, c-format msgid "the '%s' option is only allowed in list mode" msgstr "flaggan \"%s\" är endast tillåten i listläge" -#: builtin/tag.c:597 +#: builtin/tag.c:598 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:602 +#: builtin/tag.c:603 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:633 +#: builtin/tag.c:634 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" +#: builtin/unpack-objects.c:95 +msgid "pack exceeds maximum allowed size" +msgstr "paket är större än tillåten maximal storlek" + #: builtin/unpack-objects.c:504 msgid "Unpacking objects" msgstr "Packar upp objekt" @@ -23552,143 +24078,143 @@ msgstr " OK" msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<flaggor>] [--] [<fil>...]" -#: builtin/update-index.c:974 +#: builtin/update-index.c:993 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är àjour" -#: builtin/update-index.c:977 +#: builtin/update-index.c:996 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:980 +#: builtin/update-index.c:999 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:982 +#: builtin/update-index.c:1001 msgid "let files replace directories and vice-versa" msgstr "låt filer ersätta kataloger och omvänt" -#: builtin/update-index.c:984 +#: builtin/update-index.c:1003 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:986 +#: builtin/update-index.c:1005 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" -#: builtin/update-index.c:989 +#: builtin/update-index.c:1008 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:993 +#: builtin/update-index.c:1012 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:997 +#: builtin/update-index.c:1016 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1017 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1027 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1030 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1033 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1036 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:1020 +#: builtin/update-index.c:1039 msgid "do not touch index-only entries" msgstr "rör inte \"endast index\"-poster" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1041 msgid "add to index only; do not add content to object database" msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1043 msgid "remove named paths even if present in worktree" msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1045 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1047 msgid "read list of paths to be updated from standard input" msgstr "läs lista över sökvägar att uppdatera från standard in" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1051 msgid "add entries from standard input to the index" msgstr "lägg poster från standard in till indexet" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1055 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "återfyll etapp 2 och 3 från angivna sökvägar" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1059 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1063 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1066 msgid "report actions to standard output" msgstr "rapportera åtgärder på standard ut" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1068 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1072 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1074 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1076 msgid "enable/disable untracked cache" msgstr "aktivera/inaktivera ospårad cache" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1078 msgid "test if the filesystem supports untracked cache" msgstr "testa om filsystemet stöder ospårad cache" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1080 msgid "enable untracked cache without testing the filesystem" msgstr "aktivera ospårad cache utan att testa filsystemet" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1082 msgid "write out the index even if is not flagged as changed" msgstr "skriv ut indexet även om det inte angivits som ändrat" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1084 msgid "enable or disable file system monitor" msgstr "aktivera eller inaktivera filsystemsövervakning" -#: builtin/update-index.c:1067 +#: builtin/update-index.c:1086 msgid "mark files as fsmonitor valid" msgstr "markera filer som \"fsmonitor valid\"" -#: builtin/update-index.c:1070 +#: builtin/update-index.c:1089 msgid "clear fsmonitor valid bit" msgstr "töm \"fsmonitor valid\"-bit" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1195 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -23696,7 +24222,7 @@ msgstr "" "core.splitIndex är satt till false; ta bort eller ändra det om du verkligen " "vill aktivera delat index" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1204 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -23704,7 +24230,7 @@ msgstr "" "core.splitIndex är satt till true; ta bort eller ändra det om du verkligen " "vill inaktivera delat index" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1216 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -23712,11 +24238,11 @@ msgstr "" "core.untrackedCache är satt till true; ta bort eller ändra det om du " "verkligen vill inaktivera den ospårade cachen" -#: builtin/update-index.c:1198 +#: builtin/update-index.c:1220 msgid "Untracked cache disabled" msgstr "Ospårad cache är inaktiverad" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1228 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -23724,26 +24250,26 @@ msgstr "" "core.untrackedCache är satt till false; ta bort eller ändra det om du " "verkligen vill aktivera den ospårade cachen" -#: builtin/update-index.c:1210 +#: builtin/update-index.c:1232 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Ospårad cache är aktiverad för \"%s\"" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1241 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "core.fsmonitor inte satt; sätt om du verkligen vill aktivera fsmonitor" -#: builtin/update-index.c:1222 +#: builtin/update-index.c:1246 msgid "fsmonitor enabled" msgstr "fsmonitor aktiverat" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1250 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor är satt; ta bort om du verkligen vill inaktivera fsmonitor" -#: builtin/update-index.c:1229 +#: builtin/update-index.c:1254 msgid "fsmonitor disabled" msgstr "fsmonitor inaktiverat" @@ -23775,10 +24301,6 @@ msgstr "standard in har NUL-terminerade argument" msgid "read updates from stdin" msgstr "läs uppdateringar från standard in" -#: builtin/update-server-info.c:7 -msgid "git update-server-info [--force]" -msgstr "git update-server-info [--force]" - #: builtin/update-server-info.c:15 msgid "update the info files from scratch" msgstr "uppdatera informationsfilerna från grunden" @@ -23860,33 +24382,37 @@ msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<flaggor>] <arbetskatalog>" #: builtin/worktree.c:25 +msgid "git worktree repair [<path>...]" +msgstr "git worktree repair [<sökväg>...]" + +#: builtin/worktree.c:26 msgid "git worktree unlock <path>" msgstr "git worktree unlock <sökväg>" -#: builtin/worktree.c:75 +#: builtin/worktree.c:76 #, c-format msgid "Removing %s/%s: %s" msgstr "Tar bort %s/%s: %s" -#: builtin/worktree.c:148 +#: builtin/worktree.c:149 msgid "report pruned working trees" msgstr "rapportera borttagna arbetskataloger" -#: builtin/worktree.c:150 +#: builtin/worktree.c:151 msgid "expire working trees older than <time>" msgstr "låt tid gå ut för arbetskataloger äldre än <tid>" -#: builtin/worktree.c:220 +#: builtin/worktree.c:221 #, c-format msgid "'%s' already exists" msgstr "\"%s\" finns redan" -#: builtin/worktree.c:229 +#: builtin/worktree.c:230 #, c-format msgid "unusable worktree destination '%s'" msgstr "oanvändbar mål för arbetskatalog \"%s\"" -#: builtin/worktree.c:234 +#: builtin/worktree.c:235 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -23896,7 +24422,7 @@ msgstr "" "använd \"%s -f -f\" för att överstyra, eller \"unlock\" och \"prune\" eller " "\"remove\" för att rensa" -#: builtin/worktree.c:236 +#: builtin/worktree.c:237 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -23906,129 +24432,151 @@ msgstr "" "använd \"%s -f\" för att överstyra, eller \"prune\" eller \"remove\" för att " "rensa" -#: builtin/worktree.c:287 +#: builtin/worktree.c:248 +#, c-format +msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly" +msgstr "" +"misslyckades kopiera \"%s\" till \"%s\"; sparse-checkout kanske inte kommer " +"att fungera korrekt" + +#: builtin/worktree.c:268 +#, c-format +msgid "failed to copy worktree config from '%s' to '%s'" +msgstr "" +"misslyckades kopiera arbetskatalogkonfiguration från \"%s\" till \"%s\"" + +#: builtin/worktree.c:280 builtin/worktree.c:285 +#, c-format +msgid "failed to unset '%s' in '%s'" +msgstr "misslyckades slå av \"%s\" i \"%s\"" + +#: builtin/worktree.c:356 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:309 +#: builtin/worktree.c:378 msgid "initializing" msgstr "initierar" -#: builtin/worktree.c:420 builtin/worktree.c:426 +#: builtin/worktree.c:492 builtin/worktree.c:498 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Förbereder arbetskatalog (ny gren \"%s\")" -#: builtin/worktree.c:422 +#: builtin/worktree.c:494 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Förbereder arbetskatalog (återställer gren \"%s\"; var på %s)" -#: builtin/worktree.c:431 +#: builtin/worktree.c:503 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Förbereder arbetskatalog (checkar ut \"%s\")" -#: builtin/worktree.c:437 +#: builtin/worktree.c:509 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)" -#: builtin/worktree.c:482 +#: builtin/worktree.c:554 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog" -#: builtin/worktree.c:485 +#: builtin/worktree.c:557 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:487 +#: builtin/worktree.c:559 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:489 +#: builtin/worktree.c:561 msgid "populate the new working tree" msgstr "befolka den nya arbetskatalogen" -#: builtin/worktree.c:490 +#: builtin/worktree.c:562 msgid "keep the new working tree locked" msgstr "låt arbetskatalogen förbli låst" -#: builtin/worktree.c:492 builtin/worktree.c:729 +#: builtin/worktree.c:564 builtin/worktree.c:809 msgid "reason for locking" msgstr "orsak till lås" -#: builtin/worktree.c:495 +#: builtin/worktree.c:567 msgid "set up tracking mode (see git-branch(1))" msgstr "ställ in spårningsläge (se git-branch(1))" -#: builtin/worktree.c:498 +#: builtin/worktree.c:570 msgid "try to match the new branch name with a remote-tracking branch" msgstr "försök träffa namn på ny gren mot en fjärrspårande gren" -#: builtin/worktree.c:512 +#: builtin/worktree.c:584 msgid "added with --lock" msgstr "lagt till med --lock" -#: builtin/worktree.c:574 +#: builtin/worktree.c:646 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track kan endast användas när ny gran skapas" -#: builtin/worktree.c:691 +#: builtin/worktree.c:766 msgid "show extended annotations and reasons, if available" msgstr "visa utökade annoteringar och grunder, om tillgängliga" -#: builtin/worktree.c:693 +#: builtin/worktree.c:768 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "" "lägg till \"prunable\"-annoteringar till arbetskataloger äldre än <tid>" -#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848 -#: builtin/worktree.c:972 +#: builtin/worktree.c:770 +msgid "terminate records with a NUL character" +msgstr "avsluta poster med NUL-tecken" + +#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928 +#: builtin/worktree.c:1052 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:743 builtin/worktree.c:776 +#: builtin/worktree.c:823 builtin/worktree.c:856 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:748 +#: builtin/worktree.c:828 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:750 +#: builtin/worktree.c:830 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:778 +#: builtin/worktree.c:858 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" -#: builtin/worktree.c:819 +#: builtin/worktree.c:899 msgid "working trees containing submodules cannot be moved or removed" msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort" -#: builtin/worktree.c:827 +#: builtin/worktree.c:907 msgid "force move even if worktree is dirty or locked" msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst" -#: builtin/worktree.c:850 builtin/worktree.c:974 +#: builtin/worktree.c:930 builtin/worktree.c:1054 #, c-format msgid "'%s' is a main working tree" msgstr "\"%s\" är inte en huvudarbetskatalog" -#: builtin/worktree.c:855 +#: builtin/worktree.c:935 #, c-format msgid "could not figure out destination name from '%s'" msgstr "kunde inte lista ut målnamn från \"%s\"" -#: builtin/worktree.c:868 +#: builtin/worktree.c:948 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -24037,7 +24585,7 @@ msgstr "" "kan inte flytta en låst arbetskatalog, orsak till lås: %s\n" "använd \"move -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:870 +#: builtin/worktree.c:950 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -24045,38 +24593,38 @@ msgstr "" "kan inte flytta en låst arbetskatalog;\n" "använd \"move -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:873 +#: builtin/worktree.c:953 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s" -#: builtin/worktree.c:878 +#: builtin/worktree.c:958 #, c-format msgid "failed to move '%s' to '%s'" msgstr "misslyckades flytta \"%s\" till \"%s\"" -#: builtin/worktree.c:924 +#: builtin/worktree.c:1004 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "misslyckades köra \"git status\" på \"%s\"" -#: builtin/worktree.c:928 +#: builtin/worktree.c:1008 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" "\"%s\" innehåller ändrade eller ospårade filer, använd --force för att ta " "bort det" -#: builtin/worktree.c:933 +#: builtin/worktree.c:1013 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "misslyckades köra \"git status\" på \"%s\", kod %d" -#: builtin/worktree.c:956 +#: builtin/worktree.c:1036 msgid "force removal even if worktree is dirty or locked" msgstr "tvinga ta bort även om arbetskatalogen är smutsig eller låst" -#: builtin/worktree.c:979 +#: builtin/worktree.c:1059 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -24085,7 +24633,7 @@ msgstr "" "kan inte ta bort en låst arbetskatalog, orsak till låset: %s\n" "använd \"remove -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:981 +#: builtin/worktree.c:1061 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -24093,17 +24641,17 @@ msgstr "" "kan inte ta bort en låst arbetskatalog;\n" "använd \"remove -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:984 +#: builtin/worktree.c:1064 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s" -#: builtin/worktree.c:1008 +#: builtin/worktree.c:1088 #, c-format msgid "repair: %s: %s" msgstr "reparera: %s: %s" -#: builtin/worktree.c:1011 +#: builtin/worktree.c:1091 #, c-format msgid "error: %s: %s" msgstr "fel: %s: %s" @@ -24209,29 +24757,29 @@ msgstr "tomt alias för %s" msgid "recursive alias: %s" msgstr "rekursivt alias: %s" -#: git.c:479 +#: git.c:480 msgid "write failure on standard output" msgstr "skrivfel på standard ut" -#: git.c:481 +#: git.c:482 msgid "unknown write failure on standard output" msgstr "okänt skrivfel på standard ut" -#: git.c:483 +#: git.c:484 msgid "close failed on standard output" msgstr "stäng misslyckades på standard ut" -#: git.c:835 +#: git.c:838 #, 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:885 +#: git.c:888 #, c-format msgid "cannot handle %s as a builtin" msgstr "kan inte hantera %s som inbyggd" -#: git.c:898 +#: git.c:901 #, c-format msgid "" "usage: %s\n" @@ -24240,13 +24788,13 @@ msgstr "" "användning: %s\n" "\n" -#: git.c:918 +#: git.c:921 #, 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:930 +#: git.c:933 #, c-format msgid "failed to run command '%s': %s\n" msgstr "misslyckades köra kommandot \"%s\": %s\n" @@ -24402,139 +24950,139 @@ msgstr "" " bad om: %s\n" " omdirigering: %s" -#: remote-curl.c:183 +#: remote-curl.c:184 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "felaktig citering på värde för push-option: \"%s\"" -#: remote-curl.c:304 +#: remote-curl.c:308 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "%sinfo/refs inte giltig: är detta ett git-arkiv?" -#: remote-curl.c:405 +#: remote-curl.c:409 msgid "invalid server response; expected service, got flush packet" msgstr "ogiltigt svar från servern; förväntade tjänst, fick flush-paket" -#: remote-curl.c:436 +#: remote-curl.c:440 #, c-format msgid "invalid server response; got '%s'" msgstr "ogiltigt svar från servern; fick \"%s\"" -#: remote-curl.c:496 +#: remote-curl.c:500 #, c-format msgid "repository '%s' not found" msgstr "arkivet \"%s\" hittades inte" -#: remote-curl.c:500 +#: remote-curl.c:504 #, c-format msgid "Authentication failed for '%s'" msgstr "Autentisering misslyckades \"%s\"" -#: remote-curl.c:504 +#: remote-curl.c:508 #, c-format msgid "unable to access '%s' with http.pinnedPubkey configuration: %s" msgstr "kan inte nå \"%s\" med http.pinnedPubkey inställt till: %s" -#: remote-curl.c:508 +#: remote-curl.c:512 #, c-format msgid "unable to access '%s': %s" msgstr "kan inte komma åt \"%s\": %s" -#: remote-curl.c:514 +#: remote-curl.c:518 #, c-format msgid "redirecting to %s" msgstr "omdirigerar till %s" -#: remote-curl.c:645 +#: remote-curl.c:649 msgid "shouldn't have EOF when not gentle on EOF" msgstr "borde inte ha EOF när inte försiktig på EOF" -#: remote-curl.c:657 +#: remote-curl.c:661 msgid "remote server sent unexpected response end packet" msgstr "fjärrservern sände oväntat svarsavslutningspaketet" -#: remote-curl.c:726 +#: remote-curl.c:730 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "kunde inte spola tillbaka rpc-postdata - försök öka http.postBuffer" -#: remote-curl.c:755 +#: remote-curl.c:759 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "remote-curl: felaktig radlängdstecken: %.4s" -#: remote-curl.c:757 +#: remote-curl.c:761 msgid "remote-curl: unexpected response end packet" msgstr "remote-curl: oväntat svarsavslutningspaketet" -#: remote-curl.c:833 +#: remote-curl.c:837 #, c-format msgid "RPC failed; %s" msgstr "RPC misslyckades; %s" -#: remote-curl.c:873 +#: remote-curl.c:877 msgid "cannot handle pushes this big" msgstr "kan inte hantera så stora sändningar" -#: remote-curl.c:986 +#: remote-curl.c:990 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "kan inte packa upp anrop; zlib-deflate-fel %d" -#: remote-curl.c:990 +#: remote-curl.c:994 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "kan inte packa upp anrop; zlib-slutfel %d" -#: remote-curl.c:1040 +#: remote-curl.c:1044 #, c-format msgid "%d bytes of length header were received" msgstr "%d byte av längd-huvudet togs emot" -#: remote-curl.c:1042 +#: remote-curl.c:1046 #, c-format msgid "%d bytes of body are still expected" msgstr "%d byte av kroppen väntas fortfarande" -#: remote-curl.c:1131 +#: remote-curl.c:1135 msgid "dumb http transport does not support shallow capabilities" msgstr "dum http-transport stöder inte grunda arkiv" -#: remote-curl.c:1146 +#: remote-curl.c:1150 msgid "fetch failed." msgstr "mottagning misslyckades." -#: remote-curl.c:1192 +#: remote-curl.c:1198 msgid "cannot fetch by sha1 over smart http" msgstr "kan inte hämta med sha1 över smart http" -#: remote-curl.c:1236 remote-curl.c:1242 +#: remote-curl.c:1242 remote-curl.c:1248 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "protokollfel: förväntade sha/ref, fick \"%s\"" -#: remote-curl.c:1254 remote-curl.c:1372 +#: remote-curl.c:1260 remote-curl.c:1378 #, c-format msgid "http transport does not support %s" msgstr "http-transporten stöder inte %s" -#: remote-curl.c:1290 +#: remote-curl.c:1296 msgid "git-http-push failed" msgstr "git-http-push misslyckades" -#: remote-curl.c:1478 +#: remote-curl.c:1485 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: användning: git remote-curl <fjärr> [<url>]" -#: remote-curl.c:1510 +#: remote-curl.c:1517 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: fel vid läsning av kommandoström från git" -#: remote-curl.c:1517 +#: remote-curl.c:1524 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: försökte ta emot utan lokalt arkiv" -#: remote-curl.c:1558 +#: remote-curl.c:1565 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: okänt kommando \"%s\" från git" @@ -24547,122 +25095,122 @@ msgstr "behöver en arbetskatalog" msgid "could not find enlistment root" msgstr "kunde inte hitta enrolleringsroten" -#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351 -#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579 +#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350 +#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578 #, c-format msgid "could not switch to '%s'" msgstr "kunde inte växla till \"%s\"" -#: contrib/scalar/scalar.c:180 +#: contrib/scalar/scalar.c:179 #, c-format msgid "could not configure %s=%s" msgstr "kunde inte ställa in %s=%s" -#: contrib/scalar/scalar.c:198 +#: contrib/scalar/scalar.c:197 msgid "could not configure log.excludeDecoration" msgstr "kunde inte ställa in log.excludeDecoration" -#: contrib/scalar/scalar.c:219 +#: contrib/scalar/scalar.c:218 msgid "Scalar enlistments require a worktree" msgstr "Scalar-enrolleringar kräver en arbetskatalog" -#: contrib/scalar/scalar.c:311 +#: contrib/scalar/scalar.c:310 #, c-format msgid "remote HEAD is not a branch: '%.*s'" msgstr "HEAD hos fjärren är inte en gren: \"%.*s\"" -#: contrib/scalar/scalar.c:317 +#: contrib/scalar/scalar.c:316 msgid "failed to get default branch name from remote; using local default" msgstr "" "misslyckades hämta namn på standardgren för fjärr; använder lokalt förval" -#: contrib/scalar/scalar.c:330 +#: contrib/scalar/scalar.c:329 msgid "failed to get default branch name" msgstr "misslyckades hämta namn på standardgren" -#: contrib/scalar/scalar.c:341 +#: contrib/scalar/scalar.c:340 msgid "failed to unregister repository" msgstr "misslyckades avregistrera arkivet" -#: contrib/scalar/scalar.c:356 +#: contrib/scalar/scalar.c:355 msgid "failed to delete enlistment directory" msgstr "misslyckades ta bort enrolleringskatalogen" -#: contrib/scalar/scalar.c:376 +#: contrib/scalar/scalar.c:375 msgid "branch to checkout after clone" msgstr "gren att checka ut efter kloning" -#: contrib/scalar/scalar.c:378 +#: contrib/scalar/scalar.c:377 msgid "when cloning, create full working directory" msgstr "skapa komplett arbetskatalog vid kloning" -#: contrib/scalar/scalar.c:380 +#: contrib/scalar/scalar.c:379 msgid "only download metadata for the branch that will be checked out" msgstr "hämta endast metadata för grenen som skall checkas ut" -#: contrib/scalar/scalar.c:385 +#: contrib/scalar/scalar.c:384 msgid "scalar clone [<options>] [--] <repo> [<dir>]" msgstr "scalar clone [<flaggor>] [--] <arkiv> [<kat>]" -#: contrib/scalar/scalar.c:410 +#: contrib/scalar/scalar.c:409 #, c-format msgid "cannot deduce worktree name from '%s'" msgstr "Kan inte härleda arbetsträdsnamn från \"%s\"" -#: contrib/scalar/scalar.c:419 +#: contrib/scalar/scalar.c:418 #, c-format msgid "directory '%s' exists already" msgstr "katalogen \"%s\" finns redan" -#: contrib/scalar/scalar.c:446 +#: contrib/scalar/scalar.c:445 #, c-format msgid "failed to get default branch for '%s'" msgstr "misslyckades hämta standardgren för \"%s\"" -#: contrib/scalar/scalar.c:457 +#: contrib/scalar/scalar.c:456 #, c-format msgid "could not configure remote in '%s'" msgstr "kunde inte ställa in fjärr i \"%s\"" -#: contrib/scalar/scalar.c:466 +#: contrib/scalar/scalar.c:465 #, c-format msgid "could not configure '%s'" msgstr "kunde inte ställa in \"%s\"" -#: contrib/scalar/scalar.c:469 +#: contrib/scalar/scalar.c:468 msgid "partial clone failed; attempting full clone" msgstr "delvis klon misslyckades; försöker med fullständig klon" -#: contrib/scalar/scalar.c:473 +#: contrib/scalar/scalar.c:472 msgid "could not configure for full clone" msgstr "kunde inte ställa in för komplett klon" -#: contrib/scalar/scalar.c:505 +#: contrib/scalar/scalar.c:504 msgid "`scalar list` does not take arguments" msgstr "\"scalar list\" tar inte argument" -#: contrib/scalar/scalar.c:518 +#: contrib/scalar/scalar.c:517 msgid "scalar register [<enlistment>]" msgstr "scalar register [<enrollering>]" -#: contrib/scalar/scalar.c:545 +#: contrib/scalar/scalar.c:544 msgid "reconfigure all registered enlistments" msgstr "konfigurera alla registrerade enrolleringar på nytt" -#: contrib/scalar/scalar.c:549 +#: contrib/scalar/scalar.c:548 msgid "scalar reconfigure [--all | <enlistment>]" msgstr "scalar reconfigure [--all | <enrollering>]" -#: contrib/scalar/scalar.c:567 +#: contrib/scalar/scalar.c:566 msgid "--all or <enlistment>, but not both" msgstr "--all eller <enrollering>, men inte bägge" -#: contrib/scalar/scalar.c:582 +#: contrib/scalar/scalar.c:581 #, c-format msgid "git repository gone in '%s'" msgstr "git-arkiv försvunnet i \"%s\"" -#: contrib/scalar/scalar.c:622 +#: contrib/scalar/scalar.c:621 msgid "" "scalar run <task> [<enlistment>]\n" "Tasks:\n" @@ -24670,42 +25218,55 @@ msgstr "" "scalar run <uppgift> [<enrollering>]\n" "Uppgifter:\n" -#: contrib/scalar/scalar.c:640 +#: contrib/scalar/scalar.c:639 #, c-format msgid "no such task: '%s'" msgstr "okänd uppgift: \"%s\"" -#: contrib/scalar/scalar.c:690 +#: contrib/scalar/scalar.c:689 msgid "scalar unregister [<enlistment>]" msgstr "scalar unregister [<enrollering>]" -#: contrib/scalar/scalar.c:737 +#: contrib/scalar/scalar.c:736 msgid "scalar delete <enlistment>" msgstr "scalar delete <enrollering>" -#: contrib/scalar/scalar.c:752 +#: contrib/scalar/scalar.c:751 msgid "refusing to delete current working directory" msgstr "vägrar ta bort aktuell arbetskatalog" -#: contrib/scalar/scalar.c:767 +#: contrib/scalar/scalar.c:766 msgid "include Git version" msgstr "ta med Git-version" -#: contrib/scalar/scalar.c:769 +#: contrib/scalar/scalar.c:768 msgid "include Git's build options" msgstr "ta med Gits byggflaggor" -#: contrib/scalar/scalar.c:773 +#: contrib/scalar/scalar.c:772 msgid "scalar verbose [-v | --verbose] [--build-options]" msgstr "scalar verbose [-v | --verbose] [--build-options]" +#: contrib/scalar/scalar.c:813 +msgid "-C requires a <directory>" +msgstr "-C kräver en <katalog>" + +#: contrib/scalar/scalar.c:815 +#, c-format +msgid "could not change to '%s'" +msgstr "kunde inte byta till \"%s\"" + #: contrib/scalar/scalar.c:821 +msgid "-c requires a <key>=<value> argument" +msgstr "-c kräver ett argument på formen <nyckel>=<värde>" + +#: contrib/scalar/scalar.c:839 msgid "" -"scalar <command> [<options>]\n" +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" "\n" "Commands:\n" msgstr "" -"scalar <kommando> [<flaggor>]\n" +"scalar [-C <katalog>] [-c <nyckel>=<värde>] <kommando> [<flaggor>]\n" "\n" "Kommandon:\n" @@ -24717,43 +25278,43 @@ msgstr "ingen kompilatorinformation tillgänglig\n" msgid "no libc information available\n" msgstr "ingen libc-information tillgänglig\n" -#: list-objects-filter-options.h:94 +#: list-objects-filter-options.h:126 msgid "args" msgstr "argument" -#: list-objects-filter-options.h:95 +#: list-objects-filter-options.h:127 msgid "object filtering" msgstr "objektfiltrering" -#: parse-options.h:183 +#: parse-options.h:188 msgid "expiry-date" msgstr "giltig-till" -#: parse-options.h:197 +#: parse-options.h:202 msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakåtkompatibilitet)" -#: parse-options.h:310 +#: parse-options.h:341 msgid "be more verbose" msgstr "var mer pratsam" -#: parse-options.h:312 +#: parse-options.h:343 msgid "be more quiet" msgstr "var mer tyst" -#: parse-options.h:318 +#: parse-options.h:349 msgid "use <n> digits to display object names" msgstr "använd <n> siffror för att visa objektnamn" -#: parse-options.h:337 +#: parse-options.h:368 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer ska tas bort från meddelande" -#: parse-options.h:338 +#: parse-options.h:369 msgid "read pathspec from file" msgstr "läs sökvägsangivelse från fil" -#: parse-options.h:339 +#: parse-options.h:370 msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "med --pathspec-from-file, sökvägsangivelser avdelas med NUL-tecken" @@ -25004,447 +25565,451 @@ msgid "Display help information about Git" msgstr "Visa hjälpinformation om Git" #: command-list.h:108 +msgid "Run git hooks" +msgstr "Kör git-krokar" + +#: command-list.h:109 msgid "Server side implementation of Git over HTTP" msgstr "Serversideimplementation av Git över HTTP" -#: command-list.h:109 +#: command-list.h:110 msgid "Download from a remote Git repository via HTTP" msgstr "Hämta objekt och referenser från annat Git-arkiv över HTTP" -#: command-list.h:110 +#: command-list.h:111 msgid "Push objects over HTTP/DAV to another repository" msgstr "Sänd objekt över HTTP/DAV till ett annat arkiv" -#: command-list.h:111 +#: command-list.h:112 msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "Sänd en samling patchar från stdin till en IMAP-mapp" -#: command-list.h:112 +#: command-list.h:113 msgid "Build pack index file for an existing packed archive" msgstr "SKapa pack-indexfiler för ett befintligt packat arkiv" -#: command-list.h:113 +#: command-list.h:114 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Skapa tomt Git-arkiv eller ominitiera ett befintligt" -#: command-list.h:114 +#: command-list.h:115 msgid "Instantly browse your working repository in gitweb" msgstr "Omedelbart bläddra i din arbetskatalog med gitweb" -#: command-list.h:115 +#: command-list.h:116 msgid "Add or parse structured information in commit messages" msgstr "" "Lägg till eller tolka strukturerad information i incheckningsmeddelanden" -#: command-list.h:116 +#: command-list.h:117 msgid "Show commit logs" msgstr "Visa incheckningsloggar" -#: command-list.h:117 +#: command-list.h:118 msgid "Show information about files in the index and the working tree" msgstr "Visa information om filer i indexet och arbetskatalogen" -#: command-list.h:118 +#: command-list.h:119 msgid "List references in a remote repository" msgstr "Lista referenser i ett fjärrarkiv" -#: command-list.h:119 +#: command-list.h:120 msgid "List the contents of a tree object" msgstr "Visa innehållet i ett trädobjekt" -#: command-list.h:120 +#: command-list.h:121 msgid "Extracts patch and authorship from a single e-mail message" msgstr "Hämta patch och ägarskap från ett enkelt e-postmeddelande" -#: command-list.h:121 +#: command-list.h:122 msgid "Simple UNIX mbox splitter program" msgstr "Enkelt program för att dela en UNIX mbox" -#: command-list.h:122 +#: command-list.h:123 msgid "Run tasks to optimize Git repository data" msgstr "Utför uppgifter för att optimera Git-arkivdata" -#: command-list.h:123 +#: command-list.h:124 msgid "Join two or more development histories together" msgstr "Slå ihop två eller flera utvecklingshistorier" -#: command-list.h:124 +#: command-list.h:125 msgid "Find as good common ancestors as possible for a merge" msgstr "Hitta en så bra anfader som möjligt för sammanslagning" -#: command-list.h:125 +#: command-list.h:126 msgid "Run a three-way file merge" msgstr "Kör en trevägs-filsammanslagning" -#: command-list.h:126 +#: command-list.h:127 msgid "Run a merge for files needing merging" msgstr "Kör en sammanslagning för filer som behöver det" -#: command-list.h:127 +#: command-list.h:128 msgid "The standard helper program to use with git-merge-index" msgstr "Förvalt hjälpprogram att använda tillsammans med git-merge-index" -#: command-list.h:128 +#: command-list.h:129 msgid "Show three-way merge without touching index" msgstr "Visa trevägssammanslagning utan att röra indexet" -#: command-list.h:129 +#: command-list.h:130 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "Kör verktyg för lösning av sammanslagningskonflikter" -#: command-list.h:130 +#: command-list.h:131 msgid "Creates a tag object with extra validation" msgstr "skapar ett taggobjekt med extra validering" -#: command-list.h:131 +#: command-list.h:132 msgid "Build a tree-object from ls-tree formatted text" msgstr "Bygg ett trädobjekt från ls-tree-formaterad text" -#: command-list.h:132 +#: command-list.h:133 msgid "Write and verify multi-pack-indexes" msgstr "Skriv och verifiera multi-pack-index" -#: command-list.h:133 +#: command-list.h:134 msgid "Move or rename a file, a directory, or a symlink" msgstr "Flytta eller byt namn på en fil, katalog eller symbolisk länk" -#: command-list.h:134 +#: command-list.h:135 msgid "Find symbolic names for given revs" msgstr "Hitta symboliska namn för givna referenser" -#: command-list.h:135 +#: command-list.h:136 msgid "Add or inspect object notes" msgstr "Lägg till eller inspektera objektanteckningar" -#: command-list.h:136 +#: command-list.h:137 msgid "Import from and submit to Perforce repositories" msgstr "Importera från eller sänd till Perforce-arkiv" -#: command-list.h:137 +#: command-list.h:138 msgid "Create a packed archive of objects" msgstr "Skapa ett packat arkiv med objekt" -#: command-list.h:138 +#: command-list.h:139 msgid "Find redundant pack files" msgstr "Hitta redundanta pack-filer" -#: command-list.h:139 +#: command-list.h:140 msgid "Pack heads and tags for efficient repository access" msgstr "Packa huvuden och taggar för effektiv arkivåtkomst" -#: command-list.h:140 +#: command-list.h:141 msgid "Compute unique ID for a patch" msgstr "Beräkna unik ID för en patch" -#: command-list.h:141 +#: command-list.h:142 msgid "Prune all unreachable objects from the object database" msgstr "Ta bort alla onåbara objekt från objektdatabasen" -#: command-list.h:142 +#: command-list.h:143 msgid "Remove extra objects that are already in pack files" msgstr "Ta bort extraobjekt som redan finns i pack-filerna" -#: command-list.h:143 +#: command-list.h:144 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Hämta från och integrera med annat arkiv eller en lokal gren" -#: command-list.h:144 +#: command-list.h:145 msgid "Update remote refs along with associated objects" msgstr "Uppdatera fjärr-referenser och tillhörande objekt" -#: command-list.h:145 +#: command-list.h:146 msgid "Applies a quilt patchset onto the current branch" msgstr "Tillämpar en quilt-patchuppsättning på aktiv gren" -#: command-list.h:146 +#: command-list.h:147 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "Jämför två incheckningsintervall (dvs. två versioner av en gren)" -#: command-list.h:147 +#: command-list.h:148 msgid "Reads tree information into the index" msgstr "Läser trädinformation in i indexet" -#: command-list.h:148 +#: command-list.h:149 msgid "Reapply commits on top of another base tip" msgstr "Applicera incheckningar på nytt ovanpå en annan bastopp" -#: command-list.h:149 +#: command-list.h:150 msgid "Receive what is pushed into the repository" msgstr "Ta emot det som sänds till arkivet" -#: command-list.h:150 +#: command-list.h:151 msgid "Manage reflog information" msgstr "Hantera referenslogg-information" -#: command-list.h:151 +#: command-list.h:152 msgid "Manage set of tracked repositories" msgstr "Hantera uppsättningen spårade arkiv" -#: command-list.h:152 +#: command-list.h:153 msgid "Pack unpacked objects in a repository" msgstr "Packa opackade objekt i ett arkiv" -#: command-list.h:153 +#: command-list.h:154 msgid "Create, list, delete refs to replace objects" msgstr "Skapa, visa, ta bort referenser för att ersätta objekt" -#: command-list.h:154 +#: command-list.h:155 msgid "Generates a summary of pending changes" msgstr "Skapar en sammanfattning av väntande ändringar" -#: command-list.h:155 +#: command-list.h:156 msgid "Reuse recorded resolution of conflicted merges" msgstr "Återanvänd sparad lösning av sammanslagningskonflikter" -#: command-list.h:156 +#: command-list.h:157 msgid "Reset current HEAD to the specified state" msgstr "Återställ aktuell HEAD till angivet tillstånd" -#: command-list.h:157 +#: command-list.h:158 msgid "Restore working tree files" msgstr "Återställ filer i arbetskatalogen" -#: command-list.h:158 +#: command-list.h:159 msgid "Lists commit objects in reverse chronological order" msgstr "Visa incheckningsobjekt i omvänd kronologisk ordning" -#: command-list.h:159 +#: command-list.h:160 msgid "Pick out and massage parameters" msgstr "Plocka ut och massera parametrar" -#: command-list.h:160 +#: command-list.h:161 msgid "Revert some existing commits" msgstr "Återställ några befintliga incheckningar" -#: command-list.h:161 +#: command-list.h:162 msgid "Remove files from the working tree and from the index" msgstr "Ta bort filer från arbetskatalogen och från indexet" -#: command-list.h:162 +#: command-list.h:163 msgid "Send a collection of patches as emails" msgstr "Sänd en uppsättning patchar som e-post" -#: command-list.h:163 +#: command-list.h:164 msgid "Push objects over Git protocol to another repository" msgstr "Sänd objekt över Git-protokollet till annat arkiv" -#: command-list.h:164 +#: command-list.h:165 msgid "Git's i18n setup code for shell scripts" msgstr "Git:s i18n-startkod för skalskript" -#: command-list.h:165 +#: command-list.h:166 msgid "Common Git shell script setup code" msgstr "Gemensam skriptstartkod för Git" -#: command-list.h:166 +#: command-list.h:167 msgid "Restricted login shell for Git-only SSH access" msgstr "Begränsat inloggningsskal för SSH-åtkomst till bara Git" -#: command-list.h:167 +#: command-list.h:168 msgid "Summarize 'git log' output" msgstr "Summera \"git log\"-utdata" -#: command-list.h:168 +#: command-list.h:169 msgid "Show various types of objects" msgstr "Visa olika sorters objekt" -#: command-list.h:169 +#: command-list.h:170 msgid "Show branches and their commits" msgstr "Visa grenar och deras incheckningar" -#: command-list.h:170 +#: command-list.h:171 msgid "Show packed archive index" msgstr "Skapa packat arkivindex" -#: command-list.h:171 +#: command-list.h:172 msgid "List references in a local repository" msgstr "Visa referenser i ett lokalt arkiv" -#: command-list.h:172 -msgid "Initialize and modify the sparse-checkout" -msgstr "Initiera och modifiera sparse-checkout" - #: command-list.h:173 +msgid "Reduce your working tree to a subset of tracked files" +msgstr "Reducera din arbetskatalog till en undermängd av de spårade filerna" + +#: command-list.h:174 msgid "Add file contents to the staging area" msgstr "Lägg filinnehållet till indexet" -#: command-list.h:174 +#: command-list.h:175 msgid "Stash the changes in a dirty working directory away" msgstr "Spara undan ändringar i en lortig arbetskatalog" -#: command-list.h:175 +#: command-list.h:176 msgid "Show the working tree status" msgstr "Visa status för arbetskatalogen" -#: command-list.h:176 +#: command-list.h:177 msgid "Remove unnecessary whitespace" msgstr "Ta bort onödiga blanksteg" -#: command-list.h:177 +#: command-list.h:178 msgid "Initialize, update or inspect submodules" msgstr "Initiera, uppdatera eller inspektera undermoduler" -#: command-list.h:178 +#: command-list.h:179 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Dubbelriktad verkan mellan ett Subversion-arkiv och Git" -#: command-list.h:179 +#: command-list.h:180 msgid "Switch branches" msgstr "Byt gren" -#: command-list.h:180 +#: command-list.h:181 msgid "Read, modify and delete symbolic refs" msgstr "Läs, modifiera eller ta bort symbolisk referens" -#: command-list.h:181 +#: command-list.h:182 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:182 +#: command-list.h:183 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:183 +#: command-list.h:184 msgid "Unpack objects from a packed archive" msgstr "Packa upp objekt från ett pakat arkiv" -#: command-list.h:184 +#: command-list.h:185 msgid "Register file contents in the working tree to the index" msgstr "Registrera filinnehållet från arbetskatalogen i indexet" -#: command-list.h:185 +#: command-list.h:186 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:186 +#: command-list.h:187 msgid "Update auxiliary info file to help dumb servers" msgstr "Uppdatera tilläggsinfofil för att hjälpa dumma servrar" -#: command-list.h:187 +#: command-list.h:188 msgid "Send archive back to git-archive" msgstr "Sänd arkivet tillbaka till git-archive" -#: command-list.h:188 +#: command-list.h:189 msgid "Send objects packed back to git-fetch-pack" msgstr "Sänd packade objekt tillbaka till git-fetch-pack" -#: command-list.h:189 +#: command-list.h:190 msgid "Show a Git logical variable" msgstr "Visa en logisk Git-variabel" -#: command-list.h:190 +#: command-list.h:191 msgid "Check the GPG signature of commits" msgstr "Kontrollera GPG-signaturer för incheckningar" -#: command-list.h:191 +#: command-list.h:192 msgid "Validate packed Git archive files" msgstr "Bekräfta packade Git-arkivfiler" -#: command-list.h:192 +#: command-list.h:193 msgid "Check the GPG signature of tags" msgstr "Kontrollera GPG-signaturer i taggar" -#: command-list.h:193 +#: command-list.h:194 msgid "Show logs with difference each commit introduces" msgstr "Visa loggar med differenser varje incheckning introducerar" -#: command-list.h:194 +#: command-list.h:195 msgid "Manage multiple working trees" msgstr "Hantera ytterligare arbetskataloger" -#: command-list.h:195 +#: command-list.h:196 msgid "Create a tree object from the current index" msgstr "Skapa ett trädobjekt från aktuellt index" -#: command-list.h:196 +#: command-list.h:197 msgid "Defining attributes per path" msgstr "Definierar attribut per sökväg" -#: command-list.h:197 +#: command-list.h:198 msgid "Git command-line interface and conventions" msgstr "Gits kommandoradsgränssnitt och -konventioner" -#: command-list.h:198 +#: command-list.h:199 msgid "A Git core tutorial for developers" msgstr "Grundläggande Git-handledning för utvecklare" -#: command-list.h:199 +#: command-list.h:200 msgid "Providing usernames and passwords to Git" msgstr "Tillhandahåll användarnamn och lösenord till Git" -#: command-list.h:200 +#: command-list.h:201 msgid "Git for CVS users" msgstr "Git för CVS-användare" -#: command-list.h:201 +#: command-list.h:202 msgid "Tweaking diff output" msgstr "Justrea diff-utdata" -#: command-list.h:202 +#: command-list.h:203 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:203 +#: command-list.h:204 msgid "Frequently asked questions about using Git" msgstr "Ofta ställda frågor om att använda Git" -#: command-list.h:204 +#: command-list.h:205 msgid "A Git Glossary" msgstr "En Git-ordlista" -#: command-list.h:205 +#: command-list.h:206 msgid "Hooks used by Git" msgstr "Krokar som används av Git" -#: command-list.h:206 +#: command-list.h:207 msgid "Specifies intentionally untracked files to ignore" msgstr "Ange avsiktligen ospårade filer att ignorera" -#: command-list.h:207 +#: command-list.h:208 msgid "The Git repository browser" msgstr "Bläddraren för Git-arkiv" -#: command-list.h:208 +#: command-list.h:209 msgid "Map author/committer names and/or E-Mail addresses" msgstr "Kopplar författar-/incheckarnamn och/eller -e-postadresser" -#: command-list.h:209 +#: command-list.h:210 msgid "Defining submodule properties" msgstr "Ange egenskaper för undermoduler" -#: command-list.h:210 +#: command-list.h:211 msgid "Git namespaces" msgstr "Git-namnrymder" -#: command-list.h:211 +#: command-list.h:212 msgid "Helper programs to interact with remote repositories" msgstr "Hjälpprogram för att interagera med fjärrarkiv" -#: command-list.h:212 +#: command-list.h:213 msgid "Git Repository Layout" msgstr "Gits arkivlayout" -#: command-list.h:213 +#: command-list.h:214 msgid "Specifying revisions and ranges for Git" msgstr "Ange versioner och intervall i Git" -#: command-list.h:214 +#: command-list.h:215 msgid "Mounting one repository inside another" msgstr "Monterar ett arkiv inuti ett annat" -#: command-list.h:215 +#: command-list.h:216 msgid "A tutorial introduction to Git" msgstr "Introduktion till Git" -#: command-list.h:216 +#: command-list.h:217 msgid "A tutorial introduction to Git: part two" msgstr "Introduktion till Git: del två" -#: command-list.h:217 +#: command-list.h:218 msgid "Git web interface (web frontend to Git repositories)" msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)" -#: command-list.h:218 +#: command-list.h:219 msgid "An overview of recommended workflows with Git" msgstr "Översikt över rekommenderade arbetsflöden med Git" @@ -25488,69 +26053,45 @@ 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-submodule.sh:401 -#, 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:411 -#, 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:416 -#, sh-format -msgid "" -"Unable to find current ${remote_name}/${branch} revision in submodule path " -"'$sm_path'" -msgstr "" -"Kan inte hitta aktuell revision för ${remote_name}/${branch} i " -"undermodulsökvägen \"$sm_path\"" - -#: git-submodule.sh:464 -#, sh-format -msgid "Failed to recurse into submodule path '$displaypath'" -msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" - #: git-sh-setup.sh:89 git-sh-setup.sh:94 #, sh-format msgid "usage: $dashless $USAGE" msgstr "använd: $dashless $USAGE" -#: git-sh-setup.sh:183 +#: git-sh-setup.sh:182 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" msgstr "Kunde inte byta katalog till $cdup, toppnivån på arbetskatalogen" -#: git-sh-setup.sh:192 git-sh-setup.sh:199 +#: git-sh-setup.sh:191 git-sh-setup.sh:198 #, sh-format msgid "fatal: $program_name cannot be used without a working tree." msgstr "ödesdigetrt: $program_name kan inte användas utan arbetskatalog." -#: git-sh-setup.sh:213 +#: git-sh-setup.sh:212 msgid "Cannot rewrite branches: You have unstaged changes." msgstr "Kan inte skriva om grenar: Du har oköade ändringar." -#: git-sh-setup.sh:216 +#: git-sh-setup.sh:215 #, sh-format msgid "Cannot $action: You have unstaged changes." msgstr "Kan inte $action: Du har oköade ändringar." -#: git-sh-setup.sh:227 +#: git-sh-setup.sh:226 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "" "Kan inte $action: Ditt index innehåller ändringar som inte checkats in." -#: git-sh-setup.sh:229 +#: git-sh-setup.sh:228 msgid "Additionally, your index contains uncommitted changes." msgstr "Dessutom innehåller dit index ändringar som inte har checkats in." -#: git-sh-setup.sh:349 +#: git-sh-setup.sh:348 msgid "You need to run this command from the toplevel of the working tree." msgstr "Du måste köra kommandot från arbetskatalogens toppnivå." -#: git-sh-setup.sh:354 +#: git-sh-setup.sh:353 msgid "Unable to determine absolute path of git directory" msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" @@ -26233,23 +26774,23 @@ msgstr "kan inte sända brev som sjubitars" msgid "invalid transfer encoding" msgstr "ogiltig överföringskondning" -#: git-send-email.perl:2095 +#: git-send-email.perl:2100 #, perl-format msgid "" -"fatal: %s: rejected by sendemail-validate hook\n" +"fatal: %s: rejected by %s hook\n" "%s\n" "warning: no patches were sent\n" msgstr "" -"ödesdigert: %s: refuserad av sendemail-validate-kroken\n" +"ödesdigert: %s: refuserad av kroken %s\n" "%s\n" "varning: inga patchar har sänts\n" -#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168 +#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173 #, perl-format msgid "unable to open %s: %s\n" msgstr "kunde inte öppna %s: %s\n" -#: git-send-email.perl:2108 +#: git-send-email.perl:2113 #, perl-format msgid "" "fatal: %s:%d is longer than 998 characters\n" @@ -26258,7 +26799,7 @@ msgstr "" "ödesdigert: %s:%d är längre än 998 tecken\n" "varning: inga patchar har sänts\n" -#: git-send-email.perl:2126 +#: git-send-email.perl:2131 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" @@ -26266,11 +26807,270 @@ msgstr "" "säkerhetskopior.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:2130 +#: git-send-email.perl:2135 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "git archive --list" +#~ msgstr "git archive --list" + +#, c-format +#~ msgid "unknown value for --diff-merges: %s" +#~ msgstr "okänt värde för --diff-merges: %s" + +#, c-format +#~ msgid "invalid value '%s' for lsrefs.unborn" +#~ msgstr "ogiltigt värde \"%s\" för lsrefs.unborn" + +#~ msgid "backend for `git stash -p`" +#~ msgstr "bakända för \"git stash -p\"" + +#, c-format +#~ msgid "Invalid value for --empty: %s" +#~ msgstr "Felaktigt värde för --empty: %s" + +#, c-format +#~ msgid "Invalid value for --patch-format: %s" +#~ msgstr "Felaktigt värde för --patch-format: %s" + +#, c-format +#~ msgid "Invalid value for --show-current-patch: %s" +#~ msgstr "Felaktigt värde för --show-current-patch: %s" + +#~ msgid "" +#~ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad " +#~ "| --term-new]" +#~ msgstr "" +#~ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad " +#~ "| --term-new]" + +#~ msgid "git bisect--helper --bisect-next" +#~ msgstr "git bisect--helper --bisect-next" + +#~ msgid "git bisect--helper --bisect-visualize" +#~ msgstr "git bisect--helper --bisect-visualize" + +#, c-format +#~ msgid "invalid color '%s' in color.blame.repeatedLines" +#~ msgstr "felaktig färg \"%s\" i color.blame.repeatedLines" + +#~ msgid "invalid value for blame.coloring" +#~ msgstr "ogiltigt värde för blame.coloring" + +#~ msgid "" +#~ "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e " +#~ "| -p | <type> | --textconv | --filters) [--path=<path>] <object>" +#~ msgstr "" +#~ "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e " +#~ "| -p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>" + +#~ msgid "show object type" +#~ msgstr "visa objekttyp" + +#~ msgid "exit with zero when there's no error" +#~ msgstr "avsluta med noll när det inte uppstått något fel" + +#~ msgid "show info and content of objects fed from the standard input" +#~ msgstr "visa information och innehåll för objekt som listas på standard in" + +#~ msgid "show info about objects fed from the standard input" +#~ msgstr "visa information för objekt som listas på standard in" + +#~ msgid "follow in-tree symlinks (used with --batch or --batch-check)" +#~ msgstr "" +#~ "följ symboliska länkar i trädet (använd med --batch eller --batch-check)" + +#~ msgid "show all objects with --batch or --batch-check" +#~ msgstr "visa alla objekt med --batch eller --batch-check" + +#~ msgid "do not order --batch-all-objects output" +#~ msgstr "ordna inte --batch-all-objects output" + +#~ msgid "set up tracking mode (see git-pull(1))" +#~ msgstr "ställ in spårningsläge (se git-pull(1))" + +#~ msgid "Using both --reset-author and --author does not make sense" +#~ msgstr "Kan inte använda både --reset-author och --author" + +#~ msgid "Options --squash and --fixup cannot be used together" +#~ msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" + +#~ msgid "Only one of -c/-C/-F/--fixup can be used." +#~ msgstr "Endast en av -c/-C/-F/--fixup kan användas." + +#~ msgid "Option -m cannot be combined with -c/-C/-F." +#~ msgstr "Flaggan -m kan inte kombineras med -c/-C/-F." + +#~ msgid "" +#~ "Only one of --include/--only/--all/--interactive/--patch can be used." +#~ msgstr "" +#~ "Endast en av --include/--only/--all/--interactive/--patch kan användas." + +#~ msgid "git count-objects [-v] [-H | --human-readable]" +#~ msgstr "git count-objects [-v] [-H | --human-readable]" + +#, c-format +#~ msgid "configuration fetch.output contains invalid value %s" +#~ msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s" + +#~ msgid "--cached or --untracked cannot be used with --no-index" +#~ msgstr "--cached och --untracked kan inte användas med --no-index" + +#~ msgid "--untracked cannot be used with --cached" +#~ msgstr "--untracked kan inte användas med --cached" + +#~ msgid "git hash-object --stdin-paths" +#~ msgstr "git hash-object --stdin-paths" + +#~ msgid "git help [-g|--guides]" +#~ msgstr "git help [-g|--guides]" + +#~ msgid "git help [-c|--config]" +#~ msgstr "git help [-c|--config]" + +#~ msgid "git mktag" +#~ msgstr "git mktag" + +#~ msgid "git mktree [-z] [--missing] [--batch]" +#~ msgstr "git mktree [-z] [--missing] [--batch]" + +#~ msgid "read from stdin" +#~ msgstr "läs från standard in" + +#~ msgid "git notes merge --commit [-v | -q]" +#~ msgstr "git notes merge --commit [-v | -q]" + +#~ msgid "git notes merge --abort [-v | -q]" +#~ msgstr "git notes merge --abort [-v | -q]" + +#~ msgid "git notes get-ref" +#~ msgstr "git notes get-ref" + +#~ msgid "invalid value for --missing" +#~ msgstr "ogiltigt värde för --missing" + +#~ msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" +#~ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" + +#, c-format +#~ msgid "Invalid value for %s: %s" +#~ msgstr "Felaktigt värde för %s: %s" + +#, c-format +#~ msgid "Invalid value for pull.ff: %s" +#~ msgstr "Felaktigt värde för pull.ff: %s" + +#~ msgid "git rebase --continue | --abort | --skip | --edit-todo" +#~ msgstr "git rebase --continue | --abort | --skip | --edit-todo" + +#, c-format +#~ msgid "'%s' is not a valid timestamp" +#~ msgstr "\"%s\" är inte en giltig tidsstämpel" + +#~ msgid "git reflog [ show | expire | delete | exists ]" +#~ msgstr "git reflog [ show | expire | delete | exists ]" + +#~ msgid "git remote [-v | --verbose]" +#~ msgstr "git remote [-v | --verbose]" + +#~ msgid "git replace [-f] --convert-graft-file" +#~ msgstr "git replace [-f] --convert-graft-file" + +#, c-format +#~ msgid "" +#~ "\n" +#~ "It took %.2f seconds to enumerate unstaged changes after reset. You can\n" +#~ "use '--quiet' to avoid this. Set the config setting reset.quiet to true\n" +#~ "to make this the default.\n" +#~ msgstr "" +#~ "\n" +#~ "Det tog %.2f sekunder att räkna upp oköade ändringar efter " +#~ "återställning.\n" +#~ "Du kan använda \"--quiet\" för att förhindra detta. Ställ " +#~ "konfigurationsvariabeln\n" +#~ "reset.quiet till true för att göra detta till förval.\n" + +#~ msgid "git sparse-checkout list" +#~ msgstr "git sparse-checkout list" + +#~ msgid "unable to upgrade repository format to enable worktreeConfig" +#~ msgstr "kunde inte uppgradera arkivformat för att aktivera worktreeConfig" + +#~ msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" +#~ msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" + +#~ msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]" +#~ msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]" + +#~ msgid "git sparse-checkout disable" +#~ msgstr "git sparse-checkout disable" + +#~ msgid "" +#~ "the stash.useBuiltin support has been removed!\n" +#~ "See its entry in 'git help config' for details." +#~ msgstr "" +#~ "stödet för stash.useBuiltin har tagits bort!\n" +#~ "Se posten för det i \"git help config\" för detaljer." + +#~ msgid "git stripspace [-s | --strip-comments]" +#~ msgstr "git stripspace [-s | --strip-comments]" + +#~ msgid "git stripspace [-c | --comment-lines]" +#~ msgstr "git stripspace [-c | --comment-lines]" + +#~ msgid "submodule--helper print-default-remote takes no arguments" +#~ msgstr "submodule--helper print-default-remote tar inga argument" + +#~ msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" +#~ msgstr "" +#~ "git submodule--helper update-clone [--prefix=<sökväg>] [<sökväg>...]" + +#~ msgid "suppress output for update by rebase or merge" +#~ msgstr "dölj utdata för uppdatering via ombasering eller sammanslagning{" + +#~ msgid "overrides update mode in case the repository is a fresh clone" +#~ msgstr "överstyr uppdateringsläge om arkviet är en färsk klon" + +#~ msgid "depth for shallow fetch" +#~ msgstr "djup för grund hämtning" + +#~ msgid "sha1" +#~ msgstr "sha1" + +#~ msgid "SHA1 expected by superproject" +#~ msgstr "SHA1 förväntades av överprojekt{" + +#~ msgid "subsha1" +#~ msgstr "subsha1" + +#~ msgid "SHA1 of submodule's HEAD" +#~ msgstr "SHA1 för undermodulens \"HEAD\"" + +#~ msgid "git submodule--helper run-update-procedure [<options>] <path>" +#~ msgstr "git submodule--helper run-update-procedure [<flaggor>] <sökväg>" + +#~ msgid "git submodule--helper config --check-writeable" +#~ msgstr "git submodule--helper config --check-writeable" + +#~ msgid "git update-server-info [--force]" +#~ msgstr "git update-server-info [--force]" + +#~ msgid "Initialize and modify the sparse-checkout" +#~ msgstr "Initiera och modifiera sparse-checkout" + +#, sh-format +#~ msgid "" +#~ "Unable to find current ${remote_name}/${branch} revision in submodule " +#~ "path '$sm_path'" +#~ msgstr "" +#~ "Kan inte hitta aktuell revision för ${remote_name}/${branch} i " +#~ "undermodulsökvägen \"$sm_path\"" + +#, sh-format +#~ msgid "Failed to recurse into submodule path '$displaypath'" +#~ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" + #~ msgid "--index outside a repository" #~ msgstr "--index utanför arkiv" @@ -26723,9 +27523,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "cannot store pack file" #~ msgstr "kan inte spara paketfil" -#~ msgid "cannot store index file" -#~ msgstr "kan inte spara indexfil" - #~ msgid "exclude patterns are read from <file>" #~ msgstr "exkludera mönster som läses från <fil>" @@ -26853,21 +27650,12 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "socket/pipe already in use: '%s'" #~ msgstr "uttag/rör används redan: \"%s\"" -#~ msgid "could not start server on: '%s'" -#~ msgstr "kunde inte starta server på: \"%s\"" - #~ msgid "could not spawn daemon in the background" #~ msgstr "kunde inte starta serverprocess i bakgrunden" #~ msgid "waitpid failed" #~ msgstr "\"waitpid\" misslyckades" -#~ msgid "daemon not online yet" -#~ msgstr "serverprocessen ännu inte operativ" - -#~ msgid "daemon failed to start" -#~ msgstr "serverprocessen kunde inte startas" - #~ msgid "waitpid is confused" #~ msgstr "waitpid är förvirrad" @@ -27271,9 +28059,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "Error deleting remote-tracking branch '%s'" #~ msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\"" -#~ msgid "Error deleting branch '%s'" -#~ msgstr "Fel vid borttagning av grenen \"%s\"" - #~ msgid "show parse tree for grep expression" #~ msgstr "visa analysträd för grep-uttryck" @@ -27709,9 +28494,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "error building trees" #~ msgstr "fel vid byggande av träd" -#~ msgid "invalid date format '%s' in '%s'" -#~ msgstr "ogiltigt datumformat \"%s\" i \"%s\"" - #~ msgid "writing root commit" #~ msgstr "skriver rotincheckning" @@ -27917,9 +28699,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgstr "" #~ "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..." -#~ msgid "ignoring unknown color-moved-ws mode '%s'" -#~ msgstr "ignorerar okänt läge för color-mode-ws \"%s\"" - #~ msgid "only 'tree:0' is supported" #~ msgstr "endast \"tree:0\" stöds" @@ -28707,9 +29486,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "Invalid gc.pruneexpire: '%s'" #~ msgstr "Ogiltig gc.pruneexpire: '%s'" -#~ msgid "(detached from %s)" -#~ msgstr "(frånkopplad från %s)" - #~ msgid "No existing author found with '%s'" #~ msgstr "Hittade ingen befintlig författare med \"%s\"" |