From 2591c4cf6d0e0cbe5cf72086f46519554e15118e Mon Sep 17 00:00:00 2001 From: Peter Krefting Date: Mon, 9 Mar 2020 20:57:46 +0100 Subject: [PATCH] l10n: sv.po: Update Swedish translation (4835t0f0u) Signed-off-by: Peter Krefting --- po/sv.po | 5451 +++++++++++++++++++++++++++++------------------------- 1 file changed, 2918 insertions(+), 2533 deletions(-) diff --git a/po/sv.po b/po/sv.po index bc072488ca..ad663f3e83 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.25.0\n" +"Project-Id-Version: git 2.26.0\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2019-12-30 08:48+0800\n" -"PO-Revision-Date: 2020-01-04 19:51+0100\n" +"POT-Creation-Date: 2020-03-06 14:25+0800\n" +"PO-Revision-Date: 2020-03-09 20:54+0100\n" "Last-Translator: Peter Krefting \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -18,250 +18,512 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 2.91.7\n" -#: add-interactive.c:347 +#: add-interactive.c:368 #, c-format msgid "Huh (%s)?" msgstr "Vadå (%s)?" -#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216 -#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643 -#: builtin/rebase.c:2019 builtin/rebase.c:2063 +#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 +#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 +#: builtin/rebase.c:2086 builtin/rebase.c:2130 msgid "could not read index" msgstr "kunde inte läsa indexet" -#: add-interactive.c:555 git-add--interactive.perl:269 +#: add-interactive.c:576 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "binär" -#: add-interactive.c:613 git-add--interactive.perl:278 +#: add-interactive.c:634 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "ingenting" -#: add-interactive.c:614 git-add--interactive.perl:314 +#: add-interactive.c:635 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "oändrad" -#: add-interactive.c:651 git-add--interactive.perl:643 +#: add-interactive.c:672 git-add--interactive.perl:643 msgid "Update" msgstr "Uppdatera" -#: add-interactive.c:668 add-interactive.c:856 +#: add-interactive.c:689 add-interactive.c:877 #, c-format msgid "could not stage '%s'" msgstr "kunde inte köa \"%s\"" -#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409 -#: builtin/rebase.c:895 +#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 +#: builtin/rebase.c:899 msgid "could not write index" msgstr "kunde inte skriva indexet" -#: add-interactive.c:677 git-add--interactive.perl:628 +#: add-interactive.c:698 git-add--interactive.perl:628 #, c-format, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "uppdaterade %d sökväg\n" msgstr[1] "uppdaterade %d sökvägar\n" -#: add-interactive.c:695 git-add--interactive.perl:678 +#: add-interactive.c:716 git-add--interactive.perl:678 #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "observera: %s spåras inte längre.\n" -#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 #: builtin/reset.c:144 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: add-interactive.c:730 git-add--interactive.perl:655 +#: add-interactive.c:751 git-add--interactive.perl:655 msgid "Revert" msgstr "Återställ" -#: add-interactive.c:746 +#: add-interactive.c:767 msgid "Could not parse HEAD^{tree}" msgstr "kunde inte tolka HEAD^{tree}" -#: add-interactive.c:784 git-add--interactive.perl:631 +#: add-interactive.c:805 git-add--interactive.perl:631 #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "återställde %d sökväg\n" msgstr[1] "återställde %d sökvägar\n" -#: add-interactive.c:835 git-add--interactive.perl:695 +#: add-interactive.c:856 git-add--interactive.perl:695 #, c-format msgid "No untracked files.\n" msgstr "Inga ospårade filer.\n" -#: add-interactive.c:839 git-add--interactive.perl:689 +#: add-interactive.c:860 git-add--interactive.perl:689 msgid "Add untracked" msgstr "Lägg till ospårad" -#: add-interactive.c:866 git-add--interactive.perl:625 +#: add-interactive.c:887 git-add--interactive.perl:625 #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "lade till %d sökväg\n" msgstr[1] "lade till %d sökvägar\n" -#: add-interactive.c:896 +#: add-interactive.c:917 #, c-format msgid "ignoring unmerged: %s" msgstr "ignorerar ej sammanslagen: %s" -#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366 +#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 #, c-format msgid "Only binary files changed.\n" msgstr "Endast binära filer ändrade.\n" -#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368 +#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 #, c-format msgid "No changes.\n" msgstr "Inga ändringar.\n" -#: add-interactive.c:914 git-add--interactive.perl:1376 +#: add-interactive.c:935 git-add--interactive.perl:1376 msgid "Patch update" msgstr "Uppdatera patch" -#: add-interactive.c:953 git-add--interactive.perl:1754 +#: add-interactive.c:974 git-add--interactive.perl:1754 msgid "Review diff" msgstr "Granska diff" -#: add-interactive.c:981 +#: add-interactive.c:1002 msgid "show paths with changes" msgstr "visa sökvägar med ändringar" -#: add-interactive.c:983 +#: add-interactive.c:1004 msgid "add working tree state to the staged set of changes" msgstr "lägg arbetskatalogens tillstånd till köade ändringar" -#: add-interactive.c:985 +#: add-interactive.c:1006 msgid "revert staged set of changes back to the HEAD version" msgstr "återställ köade ändringar tillbaka till HEAD-versionen" -#: add-interactive.c:987 +#: add-interactive.c:1008 msgid "pick hunks and update selectively" msgstr "välj stycken och uppdatera selektivt" -#: add-interactive.c:989 +#: add-interactive.c:1010 msgid "view diff between HEAD and index" msgstr "visa skillnad mellan HEAD och index" -#: add-interactive.c:991 +#: add-interactive.c:1012 msgid "add contents of untracked files to the staged set of changes" msgstr "lägg innehåll i ospårade filer till köade ändringar" -#: add-interactive.c:999 add-interactive.c:1048 +#: add-interactive.c:1020 add-interactive.c:1069 msgid "Prompt help:" msgstr "Kommandoradshjälp:" -#: add-interactive.c:1001 +#: add-interactive.c:1022 msgid "select a single item" msgstr "markera en post" -#: add-interactive.c:1003 +#: add-interactive.c:1024 msgid "select a range of items" msgstr "markera intervall av poster" -#: add-interactive.c:1005 +#: add-interactive.c:1026 msgid "select multiple ranges" msgstr "markera flera intervall" -#: add-interactive.c:1007 add-interactive.c:1052 +#: add-interactive.c:1028 add-interactive.c:1073 msgid "select item based on unique prefix" msgstr "markera post baserad på unikt prefix" -#: add-interactive.c:1009 +#: add-interactive.c:1030 msgid "unselect specified items" msgstr "avmarkera angivna poster" -#: add-interactive.c:1011 +#: add-interactive.c:1032 msgid "choose all items" msgstr "välj alla poster" -#: add-interactive.c:1013 +#: add-interactive.c:1034 msgid "(empty) finish selecting" msgstr "(tomt) avsluta markering" -#: add-interactive.c:1050 +#: add-interactive.c:1071 msgid "select a numbered item" msgstr "markera en numrerad post" -#: add-interactive.c:1054 +#: add-interactive.c:1075 msgid "(empty) select nothing" msgstr "(tomt) markera ingenting" -#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851 +#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848 +#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 msgid "What now" msgstr "Vad nu" -#: add-interactive.c:1115 git-add--interactive.perl:213 +#: add-interactive.c:1136 git-add--interactive.perl:213 msgid "staged" msgstr "köad" -#: add-interactive.c:1115 git-add--interactive.perl:213 +#: add-interactive.c:1136 git-add--interactive.perl:213 msgid "unstaged" msgstr "ej köad" -#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2197 #: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144 -#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878 -#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213 +#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 +#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 +#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213 msgid "path" msgstr "sökväg" -#: add-interactive.c:1122 +#: add-interactive.c:1143 msgid "could not refresh index" msgstr "kunde inte uppdatera indexet" -#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765 +#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 #, c-format msgid "Bye.\n" msgstr "Hej då.\n" -#: add-patch.c:15 -#, c-format -msgid "Stage mode change [y,n,a,q,d%s,?]? " -msgstr "Köa ändrat läge [y,n,a,q,d%s,?]? " +#: add-patch.c:33 git-add--interactive.perl:1428 +#, c-format, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? " -#: add-patch.c:16 -#, c-format -msgid "Stage deletion [y,n,a,q,d%s,?]? " -msgstr "Köa borttagning [y,n,a,q,d%s,?]? " +#: add-patch.c:34 git-add--interactive.perl:1429 +#, c-format, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "Köa borttagning [y,n,q,a,d%s,?]? " -#: add-patch.c:17 -#, c-format -msgid "Stage this hunk [y,n,a,q,d%s,?]? " -msgstr "Köa stycket [y,n,a,q,d%s,?]? " +#: add-patch.c:35 git-add--interactive.perl:1430 +#, c-format, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "Köa stycket [y,n,q,a,d%s,?]? " -#: add-patch.c:111 +#: add-patch.c:37 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"staging." +msgstr "" +"Om patchen kan appliceras rent kommer det redigerade stycket att köas " +"omedelbart." + +#: add-patch.c:40 +msgid "" +"y - stage this hunk\n" +"n - do not stage this hunk\n" +"q - quit; do not stage this hunk or any of the remaining ones\n" +"a - stage this hunk and all later hunks in the file\n" +"d - do not stage this hunk or any of the later hunks in the file\n" +msgstr "" +"y - köa stycket\n" +"n - köa inte stycket\n" +"q - avsluta; köa inte stycket eller något av de följande\n" +"a - köa stycket och alla följande i filen\n" +"d - köa inte stycket eller något av de följande i filen\n" + +#: add-patch.c:54 git-add--interactive.perl:1433 +#, c-format, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? " + +#: add-patch.c:55 git-add--interactive.perl:1434 +#, c-format, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? " + +#: add-patch.c:56 git-add--interactive.perl:1435 +#, c-format, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "Stash:a stycket [y,n,q,a,d%s,?]? " + +#: add-patch.c:58 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"stashing." +msgstr "" +"Om patchen kan appliceras rent kommer det redigerade stycket att läggas till " +"i \"stash\" omedelbart." + +#: add-patch.c:61 +msgid "" +"y - stash this hunk\n" +"n - do not stash this hunk\n" +"q - quit; do not stash this hunk or any of the remaining ones\n" +"a - stash this hunk and all later hunks in the file\n" +"d - do not stash this hunk or any of the later hunks in the file\n" +msgstr "" +"y - \"stash\":a stycket\n" +"n - \"stash\":a inte stycket\n" +"q - avsluta; \"stash\":a inte stycket eller något av de följande\n" +"a - \"stash\":a stycket och alla följande i filen\n" +"d - \"stash\":a inte stycket eller något av de följande i filen\n" + +#: add-patch.c:77 git-add--interactive.perl:1438 +#, c-format, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "Ta bort ändrat läge från kön [y,n,q,a,d%s,?]? " + +#: add-patch.c:78 git-add--interactive.perl:1439 +#, c-format, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "Ta bort borttagning från kön [y,n,q,a,d%s,?]? " + +#: add-patch.c:79 git-add--interactive.perl:1440 +#, c-format, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "Ta bort stycket från kön [y,n,q,a,d%s,?]? " + +#: add-patch.c:81 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"unstaging." +msgstr "" +"Om patchen kan appliceras rent kommer det redigerade stycket att tas bort " +"från kön omedelbart." + +#: add-patch.c:84 +msgid "" +"y - unstage this hunk\n" +"n - do not unstage this hunk\n" +"q - quit; do not unstage this hunk or any of the remaining ones\n" +"a - unstage this hunk and all later hunks in the file\n" +"d - do not unstage this hunk or any of the later hunks in the file\n" +msgstr "" +"y - ta bort stycket från kön\n" +"n - ta inte bort stycket från kön\n" +"q - avsluta; ta inte bort stycket eller något av de följande från kön\n" +"a - ta bort stycket och alla följande i filen från kön\n" +"d - ta inte bort stycket eller något av de följande i filen från kön\n" + +#: add-patch.c:99 git-add--interactive.perl:1443 +#, c-format, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "Applicera ändrat läge på indexet [y,n,q,a,d%s,?]? " + +#: add-patch.c:100 git-add--interactive.perl:1444 +#, c-format, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "Applicera borttagning på indexet [y,n,q,a,d%s,?]? " + +#: add-patch.c:101 git-add--interactive.perl:1445 +#, c-format, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "Applicera stycket på indexet [y,n,q,a,d%s,?]? " + +#: add-patch.c:103 add-patch.c:168 add-patch.c:211 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"applying." +msgstr "" +"Om patchen kan appliceras rent kommer det redigerade stycket att markeras " +"för applicering omedelbart." + +#: add-patch.c:106 +msgid "" +"y - apply this hunk to index\n" +"n - do not apply this hunk to index\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - applicera stycket på indexet\n" +"n - applicera inte stycket på indexet\n" +"q - avsluta; applicera inte stycket eller något av de följande\n" +"a - applicera stycket och alla följande i filen\n" +"d - applicera inte stycket eller något av de följande i filen\n" + +#: add-patch.c:121 git-add--interactive.perl:1448 +#: git-add--interactive.perl:1463 +#, c-format, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d%s,?]? " + +#: add-patch.c:122 git-add--interactive.perl:1449 +#: git-add--interactive.perl:1464 +#, c-format, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d%s,?]? " + +#: add-patch.c:123 git-add--interactive.perl:1450 +#: git-add--interactive.perl:1465 +#, c-format, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d%s,?]? " + +#: add-patch.c:125 add-patch.c:147 add-patch.c:190 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"discarding." +msgstr "" +"Om patchen kan appliceras rent kommer det redigerade stycket att markeras " +"för kasta omedelbart." + +#: add-patch.c:128 add-patch.c:193 +msgid "" +"y - discard this hunk from worktree\n" +"n - do not discard this hunk from worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file\n" +msgstr "" +"y - förkasta stycket från arbetskatalogen\n" +"n - förkasta inte stycket från arbetskatalogen\n" +"q - avsluta; förkasta inte stycket eller något av de följande\n" +"a - förkasta stycket och alla följande i filen\n" +"d - förkasta inte stycket eller något av de följande i filen\n" + +#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 +#, c-format, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d%s,?]? " + +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454 +#, c-format, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d%s,?]? " + +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455 +#, c-format, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d%s,?]? " + +#: add-patch.c:150 +msgid "" +"y - discard this hunk from index and worktree\n" +"n - do not discard this hunk from index and worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file\n" +msgstr "" +"y - förkasta stycket från indexet och arbetskatalogen\n" +"n - förkasta inte stycket från indexet och arbetskatalogen\n" +"q - avsluta; förkasta inte stycket eller något av de följande\n" +"a - förkasta stycket och alla följande i filen\n" +"d - förkasta inte stycket eller något av de följande i filen\n" + +#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 +#, c-format, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d%s,?]? " + +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459 +#, c-format, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d%s,?]? " + +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460 +#, c-format, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d%s,?]? " + +#: add-patch.c:171 +msgid "" +"y - apply this hunk to index and worktree\n" +"n - do not apply this hunk to index and worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - applicera stycket på indexet och arbetskatalogen\n" +"n - applicera inte stycket på indexet och arbetskatalogen\n" +"q - avsluta; applicera inte stycket eller något av de följande\n" +"a - applicera stycket och alla följande i filen\n" +"d - applicera inte stycket eller något av de följande i filen\n" + +#: add-patch.c:214 +msgid "" +"y - apply this hunk to worktree\n" +"n - do not apply this hunk to worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - applicera stycket på arbetskatalogen\n" +"n - applicera inte stycket på arbetskatalogen\n" +"q - avsluta; applicera inte stycket eller något av de följande\n" +"a - applicera stycket och alla följande i filen\n" +"d - applicera inte stycket eller något av de följande i filen\n" + +#: add-patch.c:318 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "kunde inte tolka styckehuvudet \"%.*s\"" -#: add-patch.c:130 add-patch.c:134 +#: add-patch.c:337 add-patch.c:341 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "kunde inte tolka färgat styckehuvud \"%.*s\"" -#: add-patch.c:176 +#: add-patch.c:395 msgid "could not parse diff" msgstr "kunde inte tolka diff" -#: add-patch.c:194 +#: add-patch.c:414 msgid "could not parse colored diff" msgstr "kunde inte tolka färgad diff" -#: add-patch.c:508 +#: add-patch.c:428 +#, c-format +msgid "failed to run '%s'" +msgstr "misslyckades att köra \"%s\"" + +#: add-patch.c:587 +msgid "mismatched output from interactive.diffFilter" +msgstr "omaka utdata från interactive.diffFilter" + +#: add-patch.c:588 +msgid "" +"Your filter must maintain a one-to-one correspondence\n" +"between its input and output lines." +msgstr "" +"Alla rader i indata måste ha en motsvarande rad i utdata från\n" +"ditt filter." + +#: add-patch.c:761 #, c-format msgid "" "expected context line #%d in\n" @@ -270,7 +532,7 @@ msgstr "" "förväntade sammanhangsrad %d i\n" "%.*s" -#: add-patch.c:523 +#: add-patch.c:776 #, c-format msgid "" "hunks do not overlap:\n" @@ -283,11 +545,11 @@ msgstr "" "\tavslutas inte med:\n" "%.*s" -#: add-patch.c:799 git-add--interactive.perl:1112 +#: add-patch.c:1052 git-add--interactive.perl:1112 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n" -#: add-patch.c:803 +#: add-patch.c:1056 #, c-format msgid "" "---\n" @@ -300,16 +562,8 @@ msgstr "" "Ta bort \"%c\" rader genom att radera dem.\n" "Rader som börjar med %c kommer att tas bort.\n" -#: add-patch.c:810 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for staging.\n" -msgstr "" -"Om patchen kan appliceras rent kommer det redigerade stycket att\n" -"köas omedelbart.\n" - #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:818 git-add--interactive.perl:1126 +#: add-patch.c:1070 git-add--interactive.perl:1126 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -319,11 +573,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:851 +#: add-patch.c:1103 msgid "could not parse hunk header" msgstr "kunde inte tolka styckehuvud" -#: add-patch.c:895 add-patch.c:1294 +#: add-patch.c:1148 msgid "'git apply --cached' failed" msgstr "\"git apply --cached\" misslyckades" @@ -339,28 +593,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:952 git-add--interactive.perl:1239 +#: add-patch.c:1218 git-add--interactive.perl:1239 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) " "[y/n]? " -#: add-patch.c:1009 -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"a - stage this and all the remaining hunks\n" -"d - do not stage this hunk nor any of the remaining hunks\n" -msgstr "" -"y - köa stycket\n" -"n - köa inte stycket\n" -"q - avsluta; köa inte stycket eller något av de följande\n" -"a - köa detta och alla följande stycken\n" -"d - köa inte stycket eller något av de stycken som följer\n" +#: add-patch.c:1261 +msgid "The selected hunks do not apply to the index!" +msgstr "Markerade stycken kan inte appliceras på indexet!" -#: add-patch.c:1016 +#: add-patch.c:1262 git-add--interactive.perl:1343 +msgid "Apply them to the worktree anyway? " +msgstr "Applicera dem på arbetskatalogen trots det? " + +#: add-patch.c:1269 git-add--interactive.perl:1346 +msgid "Nothing was applied.\n" +msgstr "Ingenting applicerades.\n" + +#: add-patch.c:1326 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -382,109 +634,113 @@ msgstr "" "e - redigera aktuellt stycke manuellt\n" "? - visa hjälp\n" -#: add-patch.c:1137 add-patch.c:1147 +#: add-patch.c:1447 add-patch.c:1457 msgid "No previous hunk" msgstr "Inget föregående stycke" -#: add-patch.c:1142 add-patch.c:1152 +#: add-patch.c:1452 add-patch.c:1462 msgid "No next hunk" msgstr "Inget följande stycke" -#: add-patch.c:1158 +#: add-patch.c:1468 msgid "No other hunks to goto" msgstr "Inga andra stycken att gå till" -#: add-patch.c:1169 git-add--interactive.perl:1577 +#: add-patch.c:1479 git-add--interactive.perl:1577 msgid "go to which hunk ( to see more)? " msgstr "gå till vilket stycke ( för att se fler)? " -#: add-patch.c:1170 git-add--interactive.perl:1579 +#: add-patch.c:1480 git-add--interactive.perl:1579 msgid "go to which hunk? " msgstr "gå till vilket stycke? " -#: add-patch.c:1181 +#: add-patch.c:1491 #, c-format msgid "Invalid number: '%s'" msgstr "Ogiltigt siffervärde: \"%s\"" -#: add-patch.c:1186 +#: add-patch.c:1496 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "Beklagar, det finns bara %d stycke." msgstr[1] "Beklagar, det finns bara %d stycken." -#: add-patch.c:1195 +#: add-patch.c:1505 msgid "No other hunks to search" msgstr "Inga andra stycken att söka efter" -#: add-patch.c:1201 git-add--interactive.perl:1623 +#: add-patch.c:1511 git-add--interactive.perl:1623 msgid "search for regex? " msgstr "sök efter reguljärt uttryck? " -#: add-patch.c:1216 +#: add-patch.c:1526 #, c-format msgid "Malformed search regexp %s: %s" msgstr "Felaktigt format på reguljärt sökuttryck %s: %s" -#: add-patch.c:1233 +#: add-patch.c:1543 msgid "No hunk matches the given pattern" msgstr "Inga stycken motsvarar givet mönster" -#: add-patch.c:1240 +#: add-patch.c:1550 msgid "Sorry, cannot split this hunk" msgstr "Beklagar, kan inte dela stycket" -#: add-patch.c:1244 +#: add-patch.c:1554 #, c-format msgid "Split into %d hunks." msgstr "Dela i %d stycken." -#: add-patch.c:1248 +#: add-patch.c:1558 msgid "Sorry, cannot edit this hunk" msgstr "Beklagar, kan inte redigera stycket" -#: advice.c:111 +#: add-patch.c:1609 +msgid "'git apply' failed" +msgstr "\"git apply\" misslyckades" + +#: advice.c:115 #, c-format msgid "%shint: %.*s%s\n" msgstr "%stips: %.*s%s\n" -#: advice.c:164 +#: advice.c:168 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:166 +#: advice.c:170 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:168 +#: advice.c:172 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:170 +#: advice.c:174 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:172 +#: advice.c:176 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:174 +#: advice.c:178 #, 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:182 +#: advice.c:186 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." @@ -492,23 +748,23 @@ msgstr "" "Rätta dem i din arbetskatalog och använd sedan \"git add/rm \"\n" "som lämpligt för att ange lösning och checka in." -#: advice.c:190 +#: advice.c:194 msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:195 builtin/merge.c:1332 +#: advice.c:199 builtin/merge.c:1335 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: advice.c:197 +#: advice.c:201 msgid "Please, commit your changes before merging." msgstr "Checka in dina ändringar innan du utför sammanslagningen." -#: advice.c:198 +#: advice.c:202 msgid "Exiting because of unfinished merge." msgstr "Avslutar på grund av ofullbordad sammanslagning." -#: advice.c:204 +#: advice.c:208 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -762,7 +1018,7 @@ 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:3162 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -770,412 +1026,412 @@ msgstr "" "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande " "innehållet." -#: apply.c:3170 +#: apply.c:3171 #, 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:3188 +#: apply.c:3189 #, 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:3201 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: apply.c:3207 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)" -#: apply.c:3228 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: apply.c:3351 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" -#: apply.c:3411 +#: apply.c:3413 #, 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:3440 apply.c:3683 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: apply.c:3526 apply.c:3698 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: apply.c:3535 apply.c:3706 +#: apply.c:3537 apply.c:3708 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: apply.c:3570 +#: apply.c:3572 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: apply.c:3573 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Faller tillbaka på trevägssammanslagning...\n" -#: apply.c:3589 apply.c:3593 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kunde inte läsa aktuellt innehåll i \"%s\"" -#: apply.c:3605 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n" -#: apply.c:3619 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Applicerade patchen på \"%s\" med konflikter.\n" -#: apply.c:3624 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Tillämpade patchen på \"%s\" rent.\n" -#: apply.c:3650 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: apply.c:3723 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: apply.c:3725 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1320 +#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1325 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg \"%s\"" -#: apply.c:3934 +#: apply.c:3936 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: apply.c:3937 +#: apply.c:3939 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: apply.c:3957 +#: apply.c:3959 #, 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:3962 +#: apply.c:3964 #, 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:3982 +#: apply.c:3984 #, 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:3986 +#: apply.c:3988 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: apply.c:4001 +#: apply.c:4003 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: apply.c:4093 +#: apply.c:4095 #, 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:4100 +#: apply.c:4102 #, 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:4103 +#: apply.c:4105 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller är oanvändbar (%s)." -#: apply.c:4112 +#: apply.c:4114 #, c-format msgid "could not add %s to temporary index" msgstr "kunde inte lägga till %s till temporärt index" -#: apply.c:4122 +#: apply.c:4124 #, c-format msgid "could not write temporary index to %s" msgstr "kunde inte skriva temporärt index till %s" -#: apply.c:4260 +#: apply.c:4262 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: apply.c:4294 +#: apply.c:4296 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: apply.c:4300 +#: apply.c:4302 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: apply.c:4308 +#: apply.c:4310 #, 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:4314 apply.c:4459 +#: apply.c:4316 apply.c:4461 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: apply.c:4357 +#: apply.c:4359 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" -#: apply.c:4361 +#: apply.c:4363 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: apply.c:4431 +#: apply.c:4433 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: apply.c:4529 +#: apply.c:4531 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: apply.c:4537 +#: apply.c:4539 msgid "internal error" msgstr "internt fel" -#: apply.c:4540 +#: apply.c:4542 #, 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:4551 +#: apply.c:4553 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192 +#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" -#: apply.c:4573 +#: apply.c:4575 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: apply.c:4577 +#: apply.c:4579 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4696 +#: apply.c:4698 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4704 +#: apply.c:4706 msgid "unrecognized input" msgstr "indata känns inte igen" -#: apply.c:4724 +#: apply.c:4726 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4881 +#: apply.c:4883 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4908 +#: apply.c:4910 #, 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:4914 apply.c:4929 +#: apply.c:4916 apply.c:4931 #, 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:4922 +#: apply.c:4924 #, 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:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: apply.c:4966 +#: apply.c:4968 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:4969 +#: apply.c:4971 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:4971 builtin/am.c:2206 +#: apply.c:4973 builtin/am.c:2206 msgid "num" msgstr "antal" -#: apply.c:4972 +#: apply.c:4974 msgid "remove leading slashes from traditional diff paths" msgstr "ta bort inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:4975 +#: apply.c:4977 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:4977 +#: apply.c:4979 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:4981 +#: apply.c:4983 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:4983 +#: apply.c:4985 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:4985 +#: apply.c:4987 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:4987 +#: apply.c:4989 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:4989 +#: apply.c:4991 msgid "mark new files with `git add --intent-to-add`" msgstr "markera nya filer med \"git add --intent-to-add\"" -#: apply.c:4991 +#: apply.c:4993 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:4993 +#: apply.c:4995 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:4996 +#: apply.c:4998 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:4998 +#: apply.c:5000 msgid "attempt three-way merge if a patch does not apply" msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" -#: apply.c:5000 +#: apply.c:5002 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: apply.c:5005 +#: apply.c:5007 msgid "ensure at least lines of context match" msgstr "se till att åtminstone rader sammanhang är lika" -#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98 +#: apply.c:5008 builtin/am.c:2185 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1474 +#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 msgid "action" msgstr "åtgärd" -#: apply.c:5007 +#: apply.c:5009 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:5010 apply.c:5013 +#: apply.c:5012 apply.c:5015 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:5016 +#: apply.c:5018 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:5018 +#: apply.c:5020 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:5020 +#: apply.c:5022 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:5022 +#: apply.c:5024 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22 -#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774 +#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 +#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 #: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "var pratsam" -#: apply.c:5025 +#: apply.c:5027 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:5028 +#: apply.c:5030 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:5030 builtin/am.c:2194 +#: apply.c:5032 builtin/am.c:2194 msgid "root" msgstr "rot" -#: apply.c:5031 +#: apply.c:5033 msgid "prepend to all filenames" msgstr "lägg till i alla filnamn" @@ -1198,7 +1454,7 @@ msgstr "" msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote [--exec ] --list" -#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299 +#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" @@ -1239,8 +1495,8 @@ msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" #: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887 #: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 #: parse-options.h:190 @@ -1276,7 +1532,7 @@ msgid "list supported archive formats" msgstr "visa understödda arkivformat" #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884 +#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 msgid "repo" msgstr "arkiv" @@ -1315,17 +1571,17 @@ msgstr "Okänt arkivformat \"%s\"" msgid "Argument not supported for format '%s': -%d" msgstr "Argumentet stöd inte för formatet \"%s\": -%d" -#: archive-tar.c:125 archive-zip.c:350 +#: archive-tar.c:125 archive-zip.c:351 #, c-format msgid "cannot stream blob %s" msgstr "kan inte strömma blob:en %s" -#: archive-tar.c:266 archive-zip.c:368 +#: archive-tar.c:266 archive-zip.c:369 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "filens läge stöds ej: 0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:358 +#: archive-tar.c:293 archive-zip.c:359 #, c-format msgid "cannot read %s" msgstr "kan inte läsa %s" @@ -1354,12 +1610,12 @@ msgstr "sökvägen är inte giltig UTF-8: %s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s" -#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233 +#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: archive-zip.c:614 +#: archive-zip.c:615 #, c-format msgid "timestamp too large for this system: %" msgstr "tidsstämpeln för stor för detta system: %" @@ -1392,12 +1648,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:733 +#: bisect.c:745 #, c-format msgid "Not a valid commit name %s" msgstr "Namnet på incheckningen är inte giltigt: %s" -#: bisect.c:758 +#: bisect.c:770 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1406,7 +1662,7 @@ msgstr "" "Sammanslagningsbasen %s är trasig.\n" "Det betyder att felet har rättats mellan %s och [%s].\n" -#: bisect.c:763 +#: bisect.c:775 #, c-format msgid "" "The merge base %s is new.\n" @@ -1415,7 +1671,7 @@ msgstr "" "Sammanslagningsbasen %s är ny.\n" "Egenskapen har ändrats mellan %s och [%s].\n" -#: bisect.c:768 +#: bisect.c:780 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1424,7 +1680,7 @@ msgstr "" "Sammanslagningsbasen %s är %s.\n" "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n" -#: bisect.c:776 +#: bisect.c:788 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1435,7 +1691,7 @@ msgstr "" "git bisect kan inte fungera korrekt i detta fall.\n" "Kanske du skrev fel %s- och %s-revisioner?\n" -#: bisect.c:789 +#: bisect.c:801 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1447,36 +1703,36 @@ msgstr "" "%s.\n" "Vi fortsätter ändå." -#: bisect.c:822 +#: bisect.c:840 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisect: en sammanslagningsbas måste testas\n" -#: bisect.c:865 +#: bisect.c:890 #, c-format msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:966 builtin/merge.c:149 #, c-format msgid "could not read file '%s'" msgstr "kunde inte läsa filen \"%s\"" -#: bisect.c:958 +#: bisect.c:997 msgid "reading bisect refs failed" msgstr "misslyckades läsa bisect-referenser" -#: bisect.c:977 +#: bisect.c:1019 #, c-format msgid "%s was both %s and %s\n" msgstr "%s var både %s och %s\n" -#: bisect.c:985 +#: bisect.c:1028 #, c-format msgid "" "No testable commit found.\n" @@ -1485,7 +1741,7 @@ msgstr "" "Ingen testbar incheckning hittades.\n" "Kanske du startade med felaktiga sökvägsparametrar?\n" -#: bisect.c:1004 +#: bisect.c:1057 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1495,7 +1751,7 @@ msgstr[1] "(ungefär %d steg)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1063 #, 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" @@ -1516,10 +1772,10 @@ msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093 -#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991 -#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411 -#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 +#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 +#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 +#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -1694,8 +1950,8 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil" msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108 -#: builtin/commit.c:811 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 +#: builtin/commit.c:815 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -1765,13 +2021,13 @@ msgstr "kan inte skapa \"%s\"" msgid "index-pack died" msgstr "index-pack dog" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398 -#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 +#: commit.c:51 sequencer.c:2719 builtin/am.c:354 builtin/am.c:398 +#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -1801,29 +2057,29 @@ msgstr "" "Slå av detta meddelande genom att skriva\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1152 +#: commit.c:1153 #, 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:1155 +#: commit.c:1157 #, 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:1158 +#: commit.c:1160 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: commit.c:1161 +#: commit.c:1163 #, 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:1415 +#: commit.c:1417 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" @@ -1833,242 +2089,242 @@ msgstr "" "Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n" "i18n.commitencoding till den teckenkodning som används i ditt projekt.\n" -#: commit-graph.c:130 +#: commit-graph.c:122 msgid "commit-graph file is too small" msgstr "incheckningsgraffilen %s är för liten" -#: commit-graph.c:195 +#: commit-graph.c:189 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X" -#: commit-graph.c:202 +#: commit-graph.c:196 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "incheckningsgrafens version %X stämmer inte med versionen %X" -#: commit-graph.c:209 +#: commit-graph.c:203 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X" -#: commit-graph.c:232 +#: commit-graph.c:226 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" "incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara " "ofullständig" -#: commit-graph.c:243 +#: commit-graph.c:237 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen" -#: commit-graph.c:286 +#: commit-graph.c:280 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger" -#: commit-graph.c:350 +#: commit-graph.c:343 msgid "commit-graph has no base graphs chunk" msgstr "incheckningsgrafen har inga bas-graf-stycken" -#: commit-graph.c:360 +#: commit-graph.c:353 msgid "commit-graph chain does not match" msgstr "incheckningsgrafens kedja stämmer inte" -#: commit-graph.c:407 +#: commit-graph.c:401 #, 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:433 +#: commit-graph.c:425 msgid "unable to find all commit-graph files" msgstr "kan inte hitta alla incheckingsgraffiler" -#: commit-graph.c:564 commit-graph.c:624 +#: commit-graph.c:558 commit-graph.c:618 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig" -#: commit-graph.c:585 +#: commit-graph.c:579 #, c-format msgid "could not find commit %s" msgstr "kunde inte hitta incheckningen %s" -#: commit-graph.c:858 builtin/am.c:1287 +#: commit-graph.c:852 builtin/am.c:1287 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: commit-graph.c:1017 builtin/pack-objects.c:2641 +#: commit-graph.c:1011 builtin/pack-objects.c:2782 #, c-format msgid "unable to get type of object %s" msgstr "kunde inte hämta typ för objektet %s" -#: commit-graph.c:1049 +#: commit-graph.c:1043 msgid "Loading known commits in commit graph" msgstr "Läser in kända incheckningar i incheckningsgraf" -#: commit-graph.c:1066 +#: commit-graph.c:1060 msgid "Expanding reachable commits in commit graph" msgstr "Expanderar nåbara incheckningar i incheckningsgraf" -#: commit-graph.c:1085 +#: commit-graph.c:1079 msgid "Clearing commit marks in commit graph" msgstr "Rensar incheckningsmärken i incheckningsgraf" -#: commit-graph.c:1104 +#: commit-graph.c:1098 msgid "Computing commit graph generation numbers" msgstr "Beräknar generationsvärden för incheckningsgraf" -#: commit-graph.c:1179 +#: commit-graph.c:1173 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket" msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket" -#: commit-graph.c:1192 +#: commit-graph.c:1186 #, c-format msgid "error adding pack %s" msgstr "fel vid tillägg av paketet %s" -#: commit-graph.c:1196 +#: commit-graph.c:1190 #, c-format msgid "error opening index for %s" msgstr "fel vid öppning av indexet för %s" -#: commit-graph.c:1220 +#: commit-graph.c:1214 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "Söker incheckningar för incheckingsgraf från %d referens" msgstr[1] "Söker incheckningar för incheckingsgraf från %d referenser" -#: commit-graph.c:1240 +#: commit-graph.c:1234 #, c-format msgid "invalid commit object id: %s" msgstr "ogiltigt inchecknings-objekt-id %s" -#: commit-graph.c:1255 +#: commit-graph.c:1249 msgid "Finding commits for commit graph among packed objects" msgstr "Söker incheckningar för incheckingsgraf i packade objekt" -#: commit-graph.c:1270 +#: commit-graph.c:1264 msgid "Counting distinct commits in commit graph" msgstr "Räknar olika incheckningar i incheckningsgraf" -#: commit-graph.c:1300 +#: commit-graph.c:1294 msgid "Finding extra edges in commit graph" msgstr "Söker ytterligare kanter i incheckingsgraf" -#: commit-graph.c:1346 +#: commit-graph.c:1340 msgid "failed to write correct number of base graph ids" msgstr "kunde inte skriva korrekt antal bas-graf-id:n" -#: commit-graph.c:1379 midx.c:814 +#: commit-graph.c:1373 midx.c:814 #, c-format msgid "unable to create leading directories of %s" msgstr "kunde inte skapa inledande kataloger för %s" -#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248 +#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: commit-graph.c:1451 +#: commit-graph.c:1445 #, 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:1492 +#: commit-graph.c:1486 msgid "unable to open commit-graph chain file" msgstr "Kunde inte öppna incheckningsgrafkedjefilen" -#: commit-graph.c:1504 +#: commit-graph.c:1498 msgid "failed to rename base commit-graph file" msgstr "kunde inte byta namn på bas-incheckingsgraffilen" -#: commit-graph.c:1524 +#: commit-graph.c:1518 msgid "failed to rename temporary commit-graph file" msgstr "kunde inte byta namn på temporär incheckningsgraffil" -#: commit-graph.c:1635 +#: commit-graph.c:1631 msgid "Scanning merged commits" msgstr "Söker sammanslagna incheckningar" -#: commit-graph.c:1646 +#: commit-graph.c:1642 #, c-format msgid "unexpected duplicate commit id %s" msgstr "oväntat duplicerat inchecknings-id %s" -#: commit-graph.c:1670 +#: commit-graph.c:1665 msgid "Merging commit-graph" msgstr "Slår ihop incheckningsgraf" -#: commit-graph.c:1860 +#: commit-graph.c:1844 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar" -#: commit-graph.c:1871 +#: commit-graph.c:1855 msgid "too many commits to write graph" msgstr "för många incheckningar för att skriva graf" -#: commit-graph.c:1961 +#: commit-graph.c:1944 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig" -#: commit-graph.c:1971 +#: commit-graph.c:1954 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s" -#: commit-graph.c:1981 commit-graph.c:1996 +#: commit-graph.c:1964 commit-graph.c:1979 #, 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:1988 +#: commit-graph.c:1971 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "kunde inte tolka incheckning %s från incheckningsgraf" -#: commit-graph.c:2006 +#: commit-graph.c:1989 msgid "Verifying commits in commit graph" msgstr "Bekräftar incheckningar i incheckningsgrafen" -#: commit-graph.c:2020 +#: commit-graph.c:2003 #, 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:2027 +#: commit-graph.c:2010 #, 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:2037 +#: commit-graph.c:2020 #, 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:2046 +#: commit-graph.c:2029 #, 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:2059 +#: commit-graph.c:2042 #, 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:2064 +#: commit-graph.c:2047 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2076,7 +2332,7 @@ msgstr "" "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-" "noll på annan plats" -#: commit-graph.c:2068 +#: commit-graph.c:2051 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2084,12 +2340,12 @@ msgstr "" "incheckningsgrafen har generationsnummer skilt från noll för incheckningen " "%s, men noll på annan plats" -#: commit-graph.c:2083 +#: commit-graph.c:2066 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "incheckningsgrafens generation för incheckningen %s är %u != %u" -#: commit-graph.c:2089 +#: commit-graph.c:2072 #, c-format msgid "commit date for commit %s in commit-graph is % != %" msgstr "" @@ -2138,7 +2394,7 @@ msgstr "nyckeln innehåller inte ett stycke: %s" msgid "key does not contain variable name: %s" msgstr "nyckeln innehåller inte variabelnamn: %s" -#: config.c:406 sequencer.c:2530 +#: config.c:406 sequencer.c:2444 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" @@ -2281,7 +2537,7 @@ msgstr "felformat värde för %s: %s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "måste vara en av nothing, matching, simple, upstream eller current" -#: config.c:1518 builtin/pack-objects.c:3394 +#: config.c:1518 builtin/pack-objects.c:3541 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" @@ -2306,105 +2562,105 @@ msgstr "kan inte slå upp konfigurerings-bloben \"%s\"" msgid "failed to parse %s" msgstr "kunde inte tolka %s" -#: config.c:1745 +#: config.c:1743 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:2096 +#: config.c:2097 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2266 +#: config.c:2267 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:2311 +#: config.c:2312 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100" -#: config.c:2357 +#: config.c:2358 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2359 +#: config.c:2360 #, 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:2440 +#: config.c:2441 #, c-format msgid "invalid section name '%s'" msgstr "felaktigt sektionsnamn \"%s\"" -#: config.c:2472 +#: config.c:2473 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2501 +#: config.c:2502 #, c-format msgid "failed to write new configuration file %s" msgstr "kan inte skriva nya konfigurationsfilen \"%s\"" -#: config.c:2753 config.c:3077 +#: config.c:2754 config.c:3078 #, c-format msgid "could not lock config file %s" msgstr "kunde inte låsa konfigurationsfilen %s" -#: config.c:2764 +#: config.c:2765 #, c-format msgid "opening %s" msgstr "öppnar %s" -#: config.c:2799 builtin/config.c:328 +#: config.c:2800 builtin/config.c:344 #, c-format msgid "invalid pattern: %s" msgstr "ogiltigt mönster: %s" -#: config.c:2824 +#: config.c:2825 #, c-format msgid "invalid config file %s" msgstr "ogiltig konfigurationsfil: \"%s\"" -#: config.c:2837 config.c:3090 +#: config.c:2838 config.c:3091 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:2848 +#: config.c:2849 #, c-format msgid "unable to mmap '%s'" msgstr "kunde inte utföra mmap på \"%s\"" -#: config.c:2857 config.c:3095 +#: config.c:2858 config.c:3096 #, c-format msgid "chmod on %s failed" msgstr "chmod misslyckades på %s" -#: config.c:2942 config.c:3192 +#: config.c:2943 config.c:3193 #, c-format msgid "could not write config file %s" msgstr "kunde inte skriva konfigurationsfilen %s" -#: config.c:2976 +#: config.c:2977 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:2978 builtin/remote.c:781 +#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" -#: config.c:3068 +#: config.c:3069 #, c-format msgid "invalid section name: %s" msgstr "felaktigt namn på stycke: %s" -#: config.c:3235 +#: config.c:3236 #, c-format msgid "missing value for '%s'" msgstr "värde saknas för \"%s\"" @@ -2570,19 +2826,19 @@ msgstr "kunde inte grena (fork)" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43 +#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" -#: connected.c:101 +#: connected.c:110 msgid "Could not run 'git rev-list'" msgstr "Kunde inte köra \"git rev-list\"" -#: connected.c:121 +#: connected.c:130 msgid "failed write to rev-list" msgstr "kunde inte skriva till rev-list" -#: connected.c:128 +#: connected.c:137 msgid "failed to close rev-list's stdin" msgstr "kunde inte stänga rev-list:s standard in" @@ -3417,61 +3673,61 @@ msgid "" msgstr "" "du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt." -#: dir.c:554 +#: dir.c:555 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några av git kända filer" -#: dir.c:664 +#: dir.c:695 dir.c:724 dir.c:737 #, c-format msgid "unrecognized pattern: '%s'" msgstr "okänt mönster: %s" -#: dir.c:682 dir.c:696 +#: dir.c:754 dir.c:768 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "okänt negativt mönster: %s" -#: dir.c:714 +#: dir.c:786 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "" "din \"sparse-checkout\"-fil kan ha problem: mönstret \"%s\" förekommer flera " "gånger" -#: dir.c:724 +#: dir.c:796 msgid "disabling cone pattern matching" msgstr "inaktiverar konmönstermatchning" -#: dir.c:1101 +#: dir.c:1173 #, c-format msgid "cannot use %s as an exclude file" msgstr "kan inte använda %s som exkluderingsfil" -#: dir.c:2078 +#: dir.c:2144 #, c-format msgid "could not open directory '%s'" msgstr "kunde inte öppna katalogen \"%s\"" -#: dir.c:2415 +#: dir.c:2479 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:2539 +#: dir.c:2603 msgid "untracked cache is disabled on this system or location" msgstr "ospårad cache är inaktiverad på systemet eller platsen" -#: dir.c:3343 +#: dir.c:3407 #, c-format msgid "index file corrupt in repo %s" msgstr "indexfilen trasig i arkivet %s" -#: dir.c:3388 dir.c:3393 +#: dir.c:3452 dir.c:3457 #, c-format msgid "could not create directories for %s" msgstr "kunde inte skapa kataloger för %s" -#: dir.c:3422 +#: dir.c:3486 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" @@ -3717,7 +3973,7 @@ msgstr "fel vid hantering av önskade referenser: %d" msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1785 builtin/clone.c:688 +#: fetch-pack.c:1785 builtin/clone.c:689 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" @@ -3731,19 +3987,19 @@ msgstr "ingen sådan fjärreferens: %s" 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:223 +#: gpg-interface.c:408 +msgid "gpg failed to sign the data" +msgstr "gpg misslyckades signera data" + +#: gpg-interface.c:434 msgid "could not create temporary file" msgstr "kunde inte skapa temporära fil" -#: gpg-interface.c:226 +#: gpg-interface.c:437 #, c-format msgid "failed writing detached signature to '%s'" msgstr "misslyckades skriva fristående signatur till \"%s\"" -#: gpg-interface.c:390 -msgid "gpg failed to sign the data" -msgstr "gpg misslyckades signera data" - #: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" @@ -3757,18 +4013,18 @@ msgstr "" "angivet mönster innehåller NULL-byte (via -f ). Detta stöds endast med -" "P under PCRE v2" -#: grep.c:2124 +#: grep.c:2128 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:2152 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" @@ -3984,7 +4240,7 @@ msgstr "tomt ident-namn (för <%s>) ej tillåtet" msgid "name consists only of disallowed characters: %s" msgstr "namnet består enbart av ej tillåtna tecken: %s" -#: ident.c:436 builtin/commit.c:631 +#: ident.c:436 builtin/commit.c:635 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" @@ -4070,116 +4326,116 @@ msgid "failed to read the cache" msgstr "misslyckades läsa cachen" #: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 -#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809 +#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 #: builtin/stash.c:264 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: merge-recursive.c:367 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(felaktig incheckning)\n" -#: merge-recursive.c:390 +#: merge-recursive.c:379 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" "add_cahceinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen." -#: merge-recursive.c:399 +#: merge-recursive.c:388 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar " "sammanslagningen." -#: merge-recursive.c:885 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:896 +#: merge-recursive.c:885 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Tar bort %s för att göra plats för underkatalog\n" -#: merge-recursive.c:910 merge-recursive.c:929 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:919 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:960 builtin/cat-file.c:41 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:965 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:990 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "misslyckades öppna \"%s\": %s" -#: merge-recursive.c:1001 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "misslyckades skapa symboliska länken \"%s\": %s" -#: merge-recursive.c:1006 +#: merge-recursive.c:995 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "vet inte hur %06o %s \"%s\" skall hanteras" -#: merge-recursive.c:1199 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)" -#: merge-recursive.c:1206 +#: merge-recursive.c:1198 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)" -#: merge-recursive.c:1213 +#: merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Misslyckades slå ihop undermodulen %s (incheckningar följer inte " "sammanslagningsbasen)" -#: merge-recursive.c:1221 merge-recursive.c:1233 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Snabbspolar undermodulen %s till följande incheckning:" -#: merge-recursive.c:1224 merge-recursive.c:1236 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Snabbspolar undermodulen %s" -#: merge-recursive.c:1259 +#: merge-recursive.c:1251 #, 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:1263 +#: merge-recursive.c:1255 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)" -#: merge-recursive.c:1264 +#: merge-recursive.c:1256 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:1267 +#: merge-recursive.c:1259 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4196,32 +4452,32 @@ msgstr "" "\n" "vilket godtar lösningen.\n" -#: merge-recursive.c:1276 +#: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)" -#: merge-recursive.c:1349 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:1354 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:1386 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1410 +#: merge-recursive.c:1402 #, 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:1482 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4230,7 +4486,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:1487 +#: merge-recursive.c:1479 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4239,7 +4495,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:1494 +#: merge-recursive.c:1486 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4248,7 +4504,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:1499 +#: merge-recursive.c:1491 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4257,35 +4513,35 @@ 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:1534 +#: merge-recursive.c:1526 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1534 +#: merge-recursive.c:1526 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175 +#: merge-recursive.c:1606 merge-recursive.c:2530 merge-recursive.c:3175 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Vägrar förlora lortig fil vid \"%s\"" -#: merge-recursive.c:1624 +#: merge-recursive.c:1616 #, 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:1682 +#: merge-recursive.c:1674 #, 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:1713 +#: merge-recursive.c:1705 #, 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:1718 +#: merge-recursive.c:1710 #, 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" @@ -4387,7 +4643,7 @@ msgstr "tillägg/tillägg" msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:3147 git-submodule.sh:993 +#: merge-recursive.c:3147 git-submodule.sh:1003 msgid "submodule" msgstr "undermodul" @@ -4505,7 +4761,7 @@ msgstr "" msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874 +#: merge-recursive.c:3832 builtin/merge.c:697 builtin/merge.c:877 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -4738,25 +4994,30 @@ msgstr "objektet %s har okänd typ-id %d" msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" -#: object.c:266 object.c:277 +#: object.c:266 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "hashvärde stämmer inte överens %s" -#: packfile.c:641 +#: packfile.c:629 msgid "offset before end of packfile (broken .idx?)" msgstr "offset före slutet av packfilen (trasig .idx?)" -#: packfile.c:1888 +#: packfile.c:1899 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset före slutet av packindex för %s (trasigt index?)" -#: packfile.c:1892 +#: packfile.c:1903 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex för %s (trunkerat index?)" +#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 +#, c-format +msgid "unable to get size of %s" +msgstr "kan inte hämta storlek på %s" + #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -4787,36 +5048,36 @@ msgstr "%s är inte tillgängligt" msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffix" -#: parse-options.c:389 +#: parse-options.c:388 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)" -#: parse-options.c:423 parse-options.c:431 +#: parse-options.c:422 parse-options.c:430 #, c-format -msgid "did you mean `--%s` (with two dashes ?)" -msgstr "menade du \"--%s\" (med två bindestreck?)" +msgid "did you mean `--%s` (with two dashes)?" +msgstr "menade du \"--%s\" (med två bindestreck)?" -#: parse-options.c:860 +#: parse-options.c:859 #, c-format msgid "unknown option `%s'" msgstr "okänd flagga \"%s\"" -#: parse-options.c:862 +#: parse-options.c:861 #, c-format msgid "unknown switch `%c'" msgstr "okänd flagga \"%c\"" -#: parse-options.c:864 +#: parse-options.c:863 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "okänd icke-ascii-flagga i strängen: \"%s\"" -#: parse-options.c:888 +#: parse-options.c:887 msgid "..." msgstr "..." -#: parse-options.c:907 +#: parse-options.c:906 #, c-format msgid "usage: %s" msgstr "användning: %s" @@ -4824,21 +5085,21 @@ msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:913 +#: parse-options.c:912 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:916 +#: parse-options.c:915 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:955 +#: parse-options.c:954 msgid "-NUM" msgstr "-TAL" -#: parse-options.c:969 +#: parse-options.c:968 #, c-format msgid "alias of --%s" msgstr "alias för --%s" @@ -4925,25 +5186,25 @@ msgstr "%s: \"literal\" och \"glob\" är inkompatibla" #: pathspec.c:442 #, c-format -msgid "%s: '%s' is outside repository" -msgstr "%s: \"%s\" är utanför arkivet" +msgid "%s: '%s' is outside repository at '%s'" +msgstr "%s: \"%s\" är utanför arkivet på \"%s\"" -#: pathspec.c:516 +#: pathspec.c:517 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "\"%s\" (minnesstöd: \"%c\")" -#: pathspec.c:526 +#: pathspec.c:527 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s" -#: pathspec.c:593 +#: pathspec.c:594 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" -#: pathspec.c:638 +#: pathspec.c:639 #, c-format msgid "line is badly quoted: %s" msgstr "linjen er felaktigt citerad: %s" @@ -5029,7 +5290,7 @@ msgstr "kunde inte starta \"log\"" msgid "could not read `log` output" msgstr "kunde inte läsa utdata från \"log\"" -#: range-diff.c:96 sequencer.c:5163 +#: range-diff.c:96 sequencer.c:5020 #, c-format msgid "could not parse commit '%s'" msgstr "kunde inte tolka incheckningen \"%s\"" @@ -5083,16 +5344,16 @@ msgstr "kan inte lägga till \"%s\" till indexet" msgid "unable to stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: read-cache.c:1325 +#: read-cache.c:1330 #, 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:1531 +#: read-cache.c:1536 msgid "Refresh index" msgstr "Uppdatera indexet" -#: read-cache.c:1646 +#: read-cache.c:1651 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5101,7 +5362,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1656 +#: read-cache.c:1661 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5110,150 +5371,161 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1712 +#: read-cache.c:1717 #, c-format msgid "bad signature 0x%08x" msgstr "felaktig signatur 0x%08x" -#: read-cache.c:1715 +#: read-cache.c:1720 #, c-format msgid "bad index version %d" msgstr "felaktig indexversion %d" -#: read-cache.c:1724 +#: read-cache.c:1729 msgid "bad index file sha1 signature" msgstr "felaktig sha1-signatur för indexfil" -#: read-cache.c:1754 +#: read-cache.c:1759 #, 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:1756 +#: read-cache.c:1761 #, c-format msgid "ignoring %.4s extension" msgstr "ignorerar filtillägget %.4s" -#: read-cache.c:1793 +#: read-cache.c:1798 #, c-format msgid "unknown index entry format 0x%08x" msgstr "okänt format 0x%08x på indexpost" -#: read-cache.c:1809 +#: read-cache.c:1814 #, 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:1866 +#: read-cache.c:1871 msgid "unordered stage entries in index" msgstr "osorterade köposter i index" -#: read-cache.c:1869 +#: read-cache.c:1874 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "flera köposter för den sammanslagna filen \"%s\"" -#: read-cache.c:1872 +#: read-cache.c:1877 #, c-format msgid "unordered stage entries for '%s'" msgstr "osorterade köposter för \"%s\"" -#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470 -#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367 -#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 -#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332 +#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 +#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 +#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 +#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:271 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "indexfilen trasig" -#: read-cache.c:2119 +#: read-cache.c:2124 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "kunde inte läsa in cache_entries-tråden: %s" -#: read-cache.c:2132 +#: read-cache.c:2137 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "kunde inte utföra join på cache_entries-tråden: %s" -#: read-cache.c:2165 +#: read-cache.c:2170 #, c-format msgid "%s: index file open failed" msgstr "%s: öppning av indexfilen misslyckades" -#: read-cache.c:2169 +#: read-cache.c:2174 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: kan inte ta startus på det öppna indexet" -#: read-cache.c:2173 +#: read-cache.c:2178 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: indexfilen mindre än förväntat" -#: read-cache.c:2177 +#: read-cache.c:2182 #, c-format msgid "%s: unable to map index file" msgstr "%s: kan inte koppla indexfilen" -#: read-cache.c:2219 +#: read-cache.c:2224 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "kunde inte skapa load_index_extensions-tråden: %s" -#: read-cache.c:2246 +#: read-cache.c:2251 #, 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:2278 +#: read-cache.c:2283 #, c-format msgid "could not freshen shared index '%s'" msgstr "kunde inte uppdatera delat index \"%s\"" -#: read-cache.c:2325 +#: read-cache.c:2330 #, 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:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119 +#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069 +#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" -#: read-cache.c:3137 +#: read-cache.c:3142 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte öppna git-katalog: %s" -#: read-cache.c:3149 +#: read-cache.c:3154 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort länken: %s" -#: read-cache.c:3174 +#: read-cache.c:3179 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "kan inte rätta behörighetsbitar på \"%s\"" -#: read-cache.c:3323 +#: read-cache.c:3328 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: kan inte återgå till kö 0" -#: rebase-interactive.c:26 +#: rebase-interactive.c:11 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --" +"continue\".\n" +"Avbryt ombaseringen med \"git rebase --abort\".\n" + +#: rebase-interactive.c:33 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar." -#: rebase-interactive.c:35 +#: rebase-interactive.c:42 msgid "" "\n" "Commands:\n" @@ -5297,14 +5569,14 @@ msgstr "" "\n" "Du kan byta ordning på raderna; de utförs uppifrån och ned.\n" -#: rebase-interactive.c:56 +#: rebase-interactive.c:63 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Ombasera %s på %s (%d kommando)" msgstr[1] "Ombasera %s på %s (%d kommandon)" -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -5313,7 +5585,7 @@ msgstr "" "Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en " "incheckning.\n" -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -5321,7 +5593,7 @@ msgstr "" "\n" "Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n" -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5335,7 +5607,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5345,22 +5617,19 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 -msgid "Note that empty commits are commented out" -msgstr "Observera att tomma incheckningar är utkommenterade" - -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536 -#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 +#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 #, c-format msgid "could not write '%s'" msgstr "kunde inte skriva \"%s\"" -#: rebase-interactive.c:108 +#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 +#: builtin/rebase.c:234 #, c-format -msgid "could not copy '%s' to '%s'." -msgstr "kunde inte kopiera \"%s\" till \"%s\"." +msgid "could not write '%s'." +msgstr "kunde inte skriva \"%s\"." -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -5369,7 +5638,7 @@ msgstr "" "Varning: vissa incheckningar kan av misstag ha tappats.\n" "Tappade incheckningar (nyaste först):\n" -#: rebase-interactive.c:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -5389,6 +5658,13 @@ msgstr "" "\" (fel).\n" "\n" +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 +#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 +#: builtin/rebase.c:246 +#, c-format +msgid "could not read '%s'." +msgstr "kunde inte läsa \"%s\"." + #: refs.c:262 #, c-format msgid "%s does not point to a valid object!" @@ -5424,15 +5700,15 @@ msgstr "referensen \"%s\" finns redan" msgid "unexpected object ID when writing '%s'" msgstr "oväntat objekt-id vid skrivning \"%s\"" -#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997 -#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142 +#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 +#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 #: wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" -#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714 -#: builtin/rebase.c:1031 +#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:714 +#: builtin/rebase.c:1029 #, c-format msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" @@ -5486,18 +5762,18 @@ msgstr "\"%s\" finns; kan inte skapa \"%s\"" msgid "cannot process '%s' and '%s' at the same time" msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt" -#: refs/files-backend.c:1234 +#: refs/files-backend.c:1233 #, c-format msgid "could not remove reference %s" msgstr "kunde inte ta bort referensen %s" -#: refs/files-backend.c:1248 refs/packed-backend.c:1541 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541 #: refs/packed-backend.c:1551 #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" -#: refs/files-backend.c:1251 refs/packed-backend.c:1554 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" @@ -5762,45 +6038,45 @@ msgstr "flaggan \"%s\" måste peka på en incheckning" msgid "config remote shorthand cannot begin with '/': %s" msgstr "konfigurerad kortform för fjärr kan inte börja med \"/\": %s" -#: remote.c:413 +#: remote.c:414 msgid "more than one receivepack given, using the first" msgstr "mer än en receivepack angavs, använder den första" -#: remote.c:421 +#: remote.c:422 msgid "more than one uploadpack given, using the first" msgstr "mer än en uploadpack angavs, använder den första" -#: remote.c:611 +#: remote.c:612 #, 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:615 +#: remote.c:616 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spårar vanligtvis %s, inte %s" -#: remote.c:619 +#: remote.c:620 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#: remote.c:687 +#: remote.c:688 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\"" -#: remote.c:697 +#: remote.c:698 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\"" -#: remote.c:1003 +#: remote.c:1004 #, c-format msgid "src refspec %s does not match any" msgstr "käll-referensspecifikationen %s motsvarar ingen" -#: remote.c:1008 +#: remote.c:1009 #, c-format msgid "src refspec %s matches more than one" msgstr "käll-referensspecifikationen %s motsvarar mer än en" @@ -5809,7 +6085,7 @@ msgstr "käll-referensspecifikationen %s motsvarar mer än en" #. :" push, and "being pushed ('%s')" is #. the . #. -#: remote.c:1023 +#: remote.c:1024 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5832,7 +6108,7 @@ msgstr "" "\n" "Inget av dem fungerade, så vi gav upp. Ange fullständig referens." -#: remote.c:1043 +#: remote.c:1044 #, c-format msgid "" "The part of the refspec is a commit object.\n" @@ -5843,7 +6119,7 @@ msgstr "" "Var det meningen att skapa en ny gren genom att sända\n" "till \"%s:refs/heads/%s\"?" -#: remote.c:1048 +#: remote.c:1049 #, c-format msgid "" "The part of the refspec is a tag object.\n" @@ -5854,7 +6130,7 @@ msgstr "" "Var det meningen att skapa en ny tagg genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1053 +#: remote.c:1054 #, c-format msgid "" "The part of the refspec is a tree object.\n" @@ -5865,7 +6141,7 @@ msgstr "" "Var det meningen att tagga ett nytt träd genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1058 +#: remote.c:1059 #, c-format msgid "" "The part of the refspec is a blob object.\n" @@ -5876,114 +6152,114 @@ msgstr "" "Var det meningen att tagga en ny blob genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1094 +#: remote.c:1095 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s kan inte slås upp till en gren" -#: remote.c:1105 +#: remote.c:1106 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte" -#: remote.c:1117 +#: remote.c:1118 #, c-format msgid "dst refspec %s matches more than one" msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en" -#: remote.c:1124 +#: remote.c:1125 #, 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:1627 remote.c:1728 +#: remote.c:1628 remote.c:1729 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: remote.c:1636 +#: remote.c:1637 #, c-format msgid "no such branch: '%s'" msgstr "okänd gren: \"%s\"" -#: remote.c:1639 +#: remote.c:1640 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppström angiven för grenen \"%s\"" -#: remote.c:1645 +#: remote.c:1646 #, 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:1660 +#: remote.c:1661 #, 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:1672 +#: remote.c:1673 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "grenen \"%s\" har ingen fjärr för \"push\"" -#: remote.c:1682 +#: remote.c:1683 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\"" -#: remote.c:1695 +#: remote.c:1696 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mål (push.default är \"ingenting\")" -#: remote.c:1717 +#: remote.c:1718 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mål" -#: remote.c:1843 +#: remote.c:1844 #, c-format msgid "couldn't find remote ref %s" msgstr "Kunde inte hitta fjärr-referensen %s" -#: remote.c:1856 +#: remote.c:1857 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignorerar märklig referens \"%s\" lokalt" -#: remote.c:2019 +#: remote.c:2020 #, 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:2023 +#: remote.c:2024 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:2026 +#: remote.c:2027 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:2030 +#: remote.c:2031 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n" -#: remote.c:2033 +#: remote.c:2034 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (använd \"%s\" för detaljer)\n" -#: remote.c:2037 +#: remote.c:2038 #, 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:2043 +#: remote.c:2044 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:2046 +#: remote.c:2047 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5993,11 +6269,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2054 +#: remote.c:2055 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:2057 +#: remote.c:2058 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6012,11 +6288,11 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2067 +#: remote.c:2068 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:2250 +#: remote.c:2251 #, c-format msgid "cannot parse expected object name '%s'" msgstr "kan inte tolka förväntat objektnamn \"%s\"" @@ -6031,7 +6307,7 @@ msgstr "felaktig ersättningsreferensnamn: %s" msgid "duplicate replace ref: %s" msgstr "duplicerat ersättningsreferensnamn: %s" -#: replace-object.c:73 +#: replace-object.c:82 #, c-format msgid "replace depth too high for object %s" msgstr "ersättningsdjupet för högt för objektet %s" @@ -6094,8 +6370,8 @@ msgstr "kan inte ta bort lös länk \"%s\"" msgid "Recorded preimage for '%s'" msgstr "Sparade förhandsbild för \"%s\"" -#: rerere.c:881 submodule.c:2067 builtin/log.c:1871 -#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 +#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" @@ -6146,16 +6422,16 @@ msgstr "--first-parent är inkompatibelt med --bisect" msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L stöder ännu inte andra diff-format än -p och -s" -#: run-command.c:762 +#: run-command.c:763 msgid "open /dev/null failed" msgstr "misslyckades öppna /dev/null" -#: run-command.c:1268 +#: run-command.c:1269 #, c-format msgid "cannot create async thread: %s" msgstr "kan inte skapa asynkron tråd: %s" -#: run-command.c:1332 +#: run-command.c:1333 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -6202,39 +6478,39 @@ msgstr "mottagarsidan stöder inte push med --atomic" msgid "the receiving end does not support push options" msgstr "mottagarsidan stöder inte push-flaggor" -#: sequencer.c:189 +#: sequencer.c:191 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\"" -#: sequencer.c:294 +#: sequencer.c:296 #, c-format msgid "could not delete '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369 +#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:323 +#: sequencer.c:325 msgid "revert" msgstr "revert" -#: sequencer.c:325 +#: sequencer.c:327 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:327 -msgid "rebase -i" -msgstr "rebase -i" - #: sequencer.c:329 +msgid "rebase" +msgstr "rebase" + +#: sequencer.c:331 #, c-format msgid "unknown action: %d" msgstr "okänd funktion: %d" -#: sequencer.c:387 +#: sequencer.c:389 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" @@ -6242,7 +6518,7 @@ msgstr "" "efter att ha löst konflikterna, markera de rättade sökvägarna\n" "med \"git add \" eller \"git rm \"" -#: sequencer.c:390 +#: sequencer.c:392 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '\n" @@ -6252,114 +6528,110 @@ msgstr "" "med \"git add \" eller \"git rm \"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:403 sequencer.c:2993 +#: sequencer.c:405 sequencer.c:2901 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:410 +#: sequencer.c:412 #, c-format msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013 -#: sequencer.c:3277 +#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 +#: sequencer.c:3185 #, c-format msgid "failed to finalize '%s'" msgstr "misslyckades färdigställa \"%s\"" -#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259 -#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117 -#: builtin/rebase.c:589 +#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 +#: sequencer.c:3276 builtin/am.c:244 builtin/commit.c:787 builtin/merge.c:1120 +#: builtin/rebase.c:593 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: sequencer.c:464 +#: sequencer.c:466 #, c-format msgid "your local changes would be overwritten by %s." msgstr "dina lokala ändringar skulle skrivas över av %s." -#: sequencer.c:468 +#: sequencer.c:470 msgid "commit your changes or stash them to proceed." msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta." -#: sequencer.c:500 +#: sequencer.c:502 #, c-format msgid "%s: fast-forward" msgstr "%s: snabbspola" -#: sequencer.c:539 builtin/tag.c:565 +#: sequencer.c:541 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:633 +#: sequencer.c:635 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:650 +#: sequencer.c:652 msgid "unable to update cache tree" msgstr "kan inte uppdatera cacheträd" -#: sequencer.c:664 +#: sequencer.c:666 msgid "could not resolve HEAD commit" msgstr "kunde inte bestämma HEAD:s incheckning" -#: sequencer.c:744 +#: sequencer.c:746 #, c-format msgid "no key present in '%.*s'" msgstr "ingen nyckel i \"%.*s\"" -#: sequencer.c:755 +#: sequencer.c:757 #, c-format msgid "unable to dequote value of '%s'" msgstr "kan inte ta bort citering av värdet \"%s\"" -#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074 +#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:705 +#: builtin/am.c:797 builtin/merge.c:1117 builtin/rebase.c:1072 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: sequencer.c:802 +#: sequencer.c:804 msgid "'GIT_AUTHOR_NAME' already given" msgstr "\"GIT_AUTHOR_NAME\" har redan angivits" -#: sequencer.c:807 +#: sequencer.c:809 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits" -#: sequencer.c:812 +#: sequencer.c:814 msgid "'GIT_AUTHOR_DATE' already given" msgstr "\"GIT_AUTHOR_DATE\" har redan angivits" -#: sequencer.c:816 +#: sequencer.c:818 #, c-format msgid "unknown variable '%s'" msgstr "okänd variabel \"%s\"" -#: sequencer.c:821 +#: sequencer.c:823 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "\"GIT_AUTHOR_NAME\" saknas" -#: sequencer.c:823 +#: sequencer.c:825 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "\"GIT_AUTHOR_EMAIL\" saknas" -#: sequencer.c:825 +#: sequencer.c:827 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "\"GIT_AUTHOR_DATE\" saknas" -#: sequencer.c:902 sequencer.c:1427 -msgid "malformed ident line" -msgstr "felaktig ident-rad" - -#: sequencer.c:925 +#: sequencer.c:876 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6388,11 +6660,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1218 +#: sequencer.c:1148 msgid "'prepare-commit-msg' hook failed" msgstr "kroken \"prepare-commit-msg\" misslyckades" -#: sequencer.c:1224 +#: sequencer.c:1154 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6419,7 +6691,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1237 +#: sequencer.c:1167 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6444,331 +6716,326 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1279 +#: sequencer.c:1209 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: sequencer.c:1281 +#: sequencer.c:1211 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: sequencer.c:1327 +#: sequencer.c:1257 msgid "unable to resolve HEAD after creating commit" msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning" -#: sequencer.c:1329 +#: sequencer.c:1259 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: sequencer.c:1333 +#: sequencer.c:1263 msgid " (root-commit)" msgstr " (rotincheckning)" -#: sequencer.c:1354 +#: sequencer.c:1284 msgid "could not parse HEAD" msgstr "kunde inte tolka HEAD" -#: sequencer.c:1356 +#: sequencer.c:1286 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s är inte en incheckning!" -#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569 +#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: sequencer.c:1411 sequencer.c:2055 +#: sequencer.c:1342 sequencer.c:1968 msgid "unable to parse commit author" msgstr "kunde inte tolka incheckningens författare" -#: sequencer.c:1431 -msgid "corrupted author without date information" -msgstr "trasig författare utan datuminformation" - -#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684 +#: sequencer.c:1353 builtin/am.c:1561 builtin/merge.c:687 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: sequencer.c:1480 sequencer.c:1550 +#: sequencer.c:1386 sequencer.c:1447 #, c-format msgid "unable to read commit message from '%s'" msgstr "kunde inte läsa incheckningsmeddelande från \"%s\"" -#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883 -#: builtin/merge.c:908 +#: sequencer.c:1413 builtin/am.c:1583 builtin/commit.c:1673 builtin/merge.c:886 +#: builtin/merge.c:911 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: sequencer.c:1577 +#: sequencer.c:1474 #, c-format msgid "could not parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: sequencer.c:1582 +#: sequencer.c:1479 #, c-format msgid "could not parse parent commit %s" msgstr "kunde inte tolka föräldraincheckningen %s" -#: sequencer.c:1656 sequencer.c:1767 +#: sequencer.c:1562 sequencer.c:1673 #, c-format msgid "unknown command: %d" msgstr "okänt kommando: %d" -#: sequencer.c:1714 sequencer.c:1739 +#: sequencer.c:1620 sequencer.c:1645 #, c-format msgid "This is a combination of %d commits." msgstr "Det här är en kombination av %d incheckningar." -#: sequencer.c:1724 +#: sequencer.c:1630 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:1726 sequencer.c:3304 +#: sequencer.c:1632 sequencer.c:3212 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:1728 +#: sequencer.c:1634 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:1734 +#: sequencer.c:1640 #, c-format msgid "cannot write '%s'" msgstr "kan inte skriva \"%s\"" -#: sequencer.c:1741 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Det här är 1:a incheckningsmeddelandet:" -#: sequencer.c:1749 +#: sequencer.c:1655 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:1756 +#: sequencer.c:1662 #, c-format msgid "This is the commit message #%d:" msgstr "Det här är incheckningsmeddelande %d:" -#: sequencer.c:1762 +#: sequencer.c:1668 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Incheckningsmeddelande %d kommer hoppas över:" -#: sequencer.c:1850 +#: sequencer.c:1756 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:1857 +#: sequencer.c:1763 msgid "cannot fixup root commit" msgstr "kan inte göra \"fixup\" på rotincheckning" -#: sequencer.c:1876 +#: sequencer.c:1782 #, 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:1884 sequencer.c:1892 +#: sequencer.c:1790 sequencer.c:1798 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:1898 +#: sequencer.c:1804 #, 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:1917 +#: sequencer.c:1823 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:1982 +#: sequencer.c:1888 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:2037 +#: sequencer.c:1943 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:2038 +#: sequencer.c:1944 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:2105 +#: sequencer.c:1961 +#, 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:2018 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:2112 +#: sequencer.c:2025 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:2189 +#: sequencer.c:2102 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s tar inte argument: \"%s\"" -#: sequencer.c:2198 +#: sequencer.c:2111 #, c-format msgid "missing arguments for %s" msgstr "argument saknas för %s" -#: sequencer.c:2235 +#: sequencer.c:2142 #, c-format -msgid "could not parse '%.*s'" -msgstr "kunde inte tolka \"%.*s\"" +msgid "could not parse '%s'" +msgstr "kunde inte tolka \"%s\"" -#: sequencer.c:2289 +#: sequencer.c:2203 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:2300 +#: sequencer.c:2214 #, c-format msgid "cannot '%s' without a previous commit" msgstr "kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197 -#: builtin/rebase.c:223 builtin/rebase.c:248 -#, c-format -msgid "could not read '%s'." -msgstr "kunde inte läsa \"%s\"." - -#: sequencer.c:2384 +#: sequencer.c:2298 msgid "cancelling a cherry picking in progress" msgstr "avbryter pågående \"cherry-pick\"" -#: sequencer.c:2391 +#: sequencer.c:2305 msgid "cancelling a revert in progress" msgstr "avbryter pågående \"revert\"" -#: sequencer.c:2435 +#: sequencer.c:2349 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:2437 +#: sequencer.c:2351 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: \"%s\"" -#: sequencer.c:2442 +#: sequencer.c:2356 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:2453 +#: sequencer.c:2367 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:2455 +#: sequencer.c:2369 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:2533 +#: sequencer.c:2447 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:2630 +#: sequencer.c:2540 msgid "unusable squash-onto" msgstr "oanvändbar squash-onto" -#: sequencer.c:2646 +#: sequencer.c:2556 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: \"%s\"" -#: sequencer.c:2736 sequencer.c:4463 +#: sequencer.c:2644 sequencer.c:4361 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:2752 +#: sequencer.c:2660 msgid "revert is already in progress" msgstr "en \"revert\" pågår redan" -#: sequencer.c:2754 +#: sequencer.c:2662 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "testa \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2757 +#: sequencer.c:2665 msgid "cherry-pick is already in progress" msgstr "en \"cherry-pick\" pågår redan" -#: sequencer.c:2759 +#: sequencer.c:2667 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2773 +#: sequencer.c:2681 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:2788 +#: sequencer.c:2696 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:2848 sequencer.c:4209 +#: sequencer.c:2756 sequencer.c:4099 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:2850 sequencer.c:2861 +#: sequencer.c:2758 sequencer.c:2769 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:2852 sequencer.c:2896 +#: sequencer.c:2760 sequencer.c:2804 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:2882 builtin/grep.c:736 +#: sequencer.c:2790 builtin/grep.c:724 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:2884 +#: sequencer.c:2792 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:2885 +#: sequencer.c:2793 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:2891 +#: sequencer.c:2799 #, 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:2902 +#: sequencer.c:2810 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:2943 +#: sequencer.c:2851 msgid "no revert in progress" msgstr "ingen \"revers\" pågår" -#: sequencer.c:2951 +#: sequencer.c:2859 msgid "no cherry-pick in progress" msgstr "ingen \"cherry-pick\" pågår" -#: sequencer.c:2961 +#: sequencer.c:2869 msgid "failed to skip the commit" msgstr "kunde inte hoppa över incheckningen" -#: sequencer.c:2968 +#: sequencer.c:2876 msgid "there is nothing to skip" msgstr "ingenting att hoppa över" -#: sequencer.c:2971 +#: sequencer.c:2879 #, c-format msgid "" "have you committed already?\n" @@ -6777,21 +7044,21 @@ msgstr "" "har du redan checkat in?\n" "testa \"git %s --continue\"" -#: sequencer.c:3095 sequencer.c:4121 +#: sequencer.c:3003 sequencer.c:4011 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:3134 sequencer.c:4101 +#: sequencer.c:3042 sequencer.c:3991 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:3151 +#: sequencer.c:3059 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "kan inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3159 +#: sequencer.c:3067 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6810,22 +7077,22 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:3169 +#: sequencer.c:3077 #, c-format msgid "Could not apply %s... %.*s" msgstr "Kunde inte tillämpa %s... %.*s" -#: sequencer.c:3176 +#: sequencer.c:3084 #, c-format msgid "Could not merge %.*s" msgstr "Kunde inte slå ihop %.*s" -#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641 +#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3221 +#: sequencer.c:3129 #, c-format msgid "" "execution failed: %s\n" @@ -6840,11 +7107,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3227 +#: sequencer.c:3135 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:3233 +#: sequencer.c:3141 #, c-format msgid "" "execution succeeded: %s\n" @@ -6861,72 +7128,72 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3294 +#: sequencer.c:3202 #, c-format msgid "illegal label name: '%.*s'" msgstr "ogiltigt etikettnamn: \"%.*s\"" -#: sequencer.c:3348 +#: sequencer.c:3256 msgid "writing fake root commit" msgstr "skriver fejkad rotincheckning" -#: sequencer.c:3353 +#: sequencer.c:3261 msgid "writing squash-onto" msgstr "skriver squash-onto" -#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882 +#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 #, c-format msgid "failed to find tree of %s" msgstr "kunde inte hitta trädet för %s." -#: sequencer.c:3436 +#: sequencer.c:3344 #, c-format msgid "could not resolve '%s'" msgstr "kunde inte upplösa \"%s\"" -#: sequencer.c:3467 +#: sequencer.c:3375 msgid "cannot merge without a current revision" msgstr "kan inte slå ihop utan en aktuell incheckning" -#: sequencer.c:3489 +#: sequencer.c:3397 #, c-format msgid "unable to parse '%.*s'" msgstr "kan inte tolka \"%.*s\"" -#: sequencer.c:3498 +#: sequencer.c:3406 #, c-format msgid "nothing to merge: '%.*s'" msgstr "inget att slå samman: \"%.*s\"" -#: sequencer.c:3510 +#: sequencer.c:3418 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:3526 +#: sequencer.c:3434 #, c-format msgid "could not get commit message of '%s'" msgstr "kunde inte läsa incheckningsmeddelande för \"%s\"" -#: sequencer.c:3688 +#: sequencer.c:3594 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "kunde inte ens försöka slå ihop \"%.*s\"" -#: sequencer.c:3704 +#: sequencer.c:3610 msgid "merge: Unable to write new index file" msgstr "sammanslagning: Kunde inte skriva ny indexfil" -#: sequencer.c:3773 builtin/rebase.c:733 +#: sequencer.c:3679 builtin/rebase.c:737 #, c-format msgid "Applied autostash.\n" msgstr "Tillämpade autostash.\n" -#: sequencer.c:3785 +#: sequencer.c:3691 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6937,31 +7204,26 @@ 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:3849 -#, c-format -msgid "could not checkout %s" -msgstr "kunde inte checka ut %s" - -#: sequencer.c:3863 +#: sequencer.c:3755 #, c-format msgid "%s: not a valid OID" msgstr "%s: inte ett giltigt OID" -#: sequencer.c:3868 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" -#: sequencer.c:3883 +#: sequencer.c:3775 #, c-format msgid "Stopped at HEAD\n" msgstr "Stoppade på HEAD\n" -#: sequencer.c:3885 +#: sequencer.c:3777 #, c-format msgid "Stopped at %s\n" msgstr "Stoppade på %s\n" -#: sequencer.c:3893 +#: sequencer.c:3785 #, c-format msgid "" "Could not execute the todo command\n" @@ -6982,48 +7244,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3979 +#: sequencer.c:3869 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:4050 +#: sequencer.c:3940 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:4109 +#: sequencer.c:3999 msgid "could not read orig-head" msgstr "kunde inte läsa orig-head" -#: sequencer.c:4114 +#: sequencer.c:4004 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:4128 +#: sequencer.c:4018 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:4221 +#: sequencer.c:4111 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:4230 +#: sequencer.c:4120 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:4232 +#: sequencer.c:4122 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:4234 +#: sequencer.c:4124 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:4237 +#: sequencer.c:4127 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7033,69 +7295,59 @@ 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:4273 sequencer.c:4312 +#: sequencer.c:4163 sequencer.c:4202 #, c-format msgid "could not write file: '%s'" msgstr "kunde inte skriva fil: \"%s\"" -#: sequencer.c:4327 +#: sequencer.c:4217 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:4334 +#: sequencer.c:4224 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:4440 +#: sequencer.c:4338 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:4444 +#: sequencer.c:4342 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:4479 +#: sequencer.c:4377 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" -#: sequencer.c:4952 +#: sequencer.c:4846 msgid "make_script: unhandled options" msgstr "make_script: flaggor som inte stöds" -#: sequencer.c:4955 +#: sequencer.c:4849 msgid "make_script: error preparing revisions" msgstr "make_script: fel när revisioner skulle förberedas" -#: sequencer.c:5113 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --" -"continue\".\n" -"Avbryt ombaseringen med \"git rebase --abort\".\n" - -#: sequencer.c:5226 sequencer.c:5243 +#: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "inget att göra" -#: sequencer.c:5257 +#: sequencer.c:5119 msgid "could not skip unnecessary pick commands" msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon" -#: sequencer.c:5351 +#: sequencer.c:5213 msgid "the script was already rearranged." msgstr "skriptet har redan omordnats." #: setup.c:124 #, c-format -msgid "'%s' is outside repository" -msgstr "\"%s\" är utanför arkivet" +msgid "'%s' is outside repository at '%s'" +msgstr "\"%s\" är utanför arkivet på \"%s\"" -#: setup.c:174 +#: setup.c:175 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -7105,7 +7357,7 @@ msgstr "" "Använd \"git -- ..\" för att ange sökvägar som inte finns " "lokalt." -#: setup.c:187 +#: setup.c:188 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -7117,12 +7369,12 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git [...] -- [...]\"" -#: setup.c:236 +#: setup.c:254 #, 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:255 +#: setup.c:273 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -7133,92 +7385,92 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git [...] -- [...]\"" -#: setup.c:391 +#: setup.c:409 msgid "unable to set up work tree using invalid config" msgstr "kan inte skapa arbetskatalog med felaktig konfiguration" -#: setup.c:395 +#: setup.c:413 msgid "this operation must be run in a work tree" msgstr "funktionen måste köras i en arbetskatalog" -#: setup.c:541 +#: setup.c:559 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Förväntade git-arkivversion <= %d, hittade %d" -#: setup.c:549 +#: setup.c:567 msgid "unknown repository extensions found:" msgstr "okända arkivutökningar hittades:" -#: setup.c:568 +#: setup.c:586 #, c-format msgid "error opening '%s'" msgstr "fel vid öppning av \"%s\"" -#: setup.c:570 +#: setup.c:588 #, 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:572 +#: setup.c:590 #, c-format msgid "error reading %s" msgstr "fel vid läsning av %s" -#: setup.c:574 +#: setup.c:592 #, c-format msgid "invalid gitfile format: %s" msgstr "ogiltigt gitfilformat: %s" -#: setup.c:576 +#: setup.c:594 #, c-format msgid "no path in gitfile: %s" msgstr "ingen sökväg i gitfil: %s" -#: setup.c:578 +#: setup.c:596 #, c-format msgid "not a git repository: %s" msgstr "inte ett git-arkiv: %s" -#: setup.c:677 +#: setup.c:695 #, c-format msgid "'$%s' too big" msgstr "\"$%s\" för stor" -#: setup.c:691 +#: setup.c:709 #, c-format msgid "not a git repository: '%s'" msgstr "inte ett git-arkiv: \"%s\"" -#: setup.c:720 setup.c:722 setup.c:753 +#: setup.c:738 setup.c:740 setup.c:771 #, c-format msgid "cannot chdir to '%s'" msgstr "kan inte byta katalog (chdir) till \"%s\"" -#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838 +#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 msgid "cannot come back to cwd" msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)" -#: setup.c:852 +#: setup.c:870 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "misslyckades ta status på \"%*ss%s%s\"" -#: setup.c:1090 +#: setup.c:1108 msgid "Unable to read current working directory" msgstr "Kan inte läsa aktuell arbetskatalog" -#: setup.c:1099 setup.c:1105 +#: setup.c:1117 setup.c:1123 #, c-format msgid "cannot change to '%s'" msgstr "kan inte byta till \"%s\"" -#: setup.c:1110 +#: setup.c:1128 #, 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:1116 +#: setup.c:1134 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7228,7 +7480,7 @@ msgstr "" "monteringspunkten %s)\n" "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." -#: setup.c:1227 +#: setup.c:1245 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7237,15 +7489,15 @@ 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:1271 +#: setup.c:1289 msgid "open /dev/null or dup failed" msgstr "misslyckades öppna /dev/null eller \"dup\"" -#: setup.c:1286 +#: setup.c:1304 msgid "fork failed" msgstr "\"fork\" misslyckades" -#: setup.c:1291 +#: setup.c:1309 msgid "setsid failed" msgstr "\"setsid\" misslyckades" @@ -7325,195 +7577,195 @@ msgstr "mmap misslyckades" msgid "object file %s is empty" msgstr "objektfilen %s är tom" -#: sha1-file.c:1252 sha1-file.c:2392 +#: sha1-file.c:1263 sha1-file.c:2443 #, c-format msgid "corrupt loose object '%s'" msgstr "trasigt löst objekt \"%s\"" -#: sha1-file.c:1254 sha1-file.c:2396 +#: sha1-file.c:1265 sha1-file.c:2447 #, c-format msgid "garbage at end of loose object '%s'" msgstr "skräp i slutet av löst objekt \"%s\"" -#: sha1-file.c:1296 +#: sha1-file.c:1307 msgid "invalid object type" msgstr "felaktig objekttyp" -#: sha1-file.c:1380 +#: sha1-file.c:1391 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "kan inte packa upp %s-huvud med --allow-unknown-type" -#: sha1-file.c:1383 +#: sha1-file.c:1394 #, c-format msgid "unable to unpack %s header" msgstr "kan inte packa upp %s-huvudet" -#: sha1-file.c:1389 +#: sha1-file.c:1400 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "kan inte tolka %s-huvud med --allow-unknown-type" -#: sha1-file.c:1392 +#: sha1-file.c:1403 #, c-format msgid "unable to parse %s header" msgstr "kan inte tolka %s-huvud" -#: sha1-file.c:1584 +#: sha1-file.c:1629 #, c-format msgid "failed to read object %s" msgstr "misslyckades läsa objektet %s" -#: sha1-file.c:1588 +#: sha1-file.c:1633 #, c-format msgid "replacement %s not found for %s" msgstr "ersättningen %s hittades inte för %s" -#: sha1-file.c:1592 +#: sha1-file.c:1637 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "löst objekt %s (lagrat i %s) är trasigt" -#: sha1-file.c:1596 +#: sha1-file.c:1641 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "packat objekt %s (lagrat i %s) är trasigt" -#: sha1-file.c:1699 +#: sha1-file.c:1746 #, c-format msgid "unable to write file %s" msgstr "kunde inte skriva filen %s" -#: sha1-file.c:1706 +#: sha1-file.c:1753 #, c-format msgid "unable to set permission to '%s'" msgstr "kan inte sätta behörigheten till \"%s\"" -#: sha1-file.c:1713 +#: sha1-file.c:1760 msgid "file write error" msgstr "fel vid skrivning av fil" -#: sha1-file.c:1732 +#: sha1-file.c:1780 msgid "error when closing loose object file" msgstr "fel vid stängning av fil för löst objekt" -#: sha1-file.c:1797 +#: sha1-file.c:1845 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s" -#: sha1-file.c:1799 +#: sha1-file.c:1847 msgid "unable to create temporary file" msgstr "kan inte skapa temporär fil" -#: sha1-file.c:1823 +#: sha1-file.c:1871 msgid "unable to write loose object file" msgstr "kunde inte skriva fil för löst objekt" -#: sha1-file.c:1829 +#: sha1-file.c:1877 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)" -#: sha1-file.c:1833 +#: sha1-file.c:1881 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "\"deflateend\" på objektet %s misslyckades (%d)" -#: sha1-file.c:1837 +#: sha1-file.c:1885 #, c-format msgid "confused by unstable object source data for %s" msgstr "förvirrad av instabil objektkälldata för %s" -#: sha1-file.c:1847 builtin/pack-objects.c:925 +#: sha1-file.c:1895 builtin/pack-objects.c:1054 #, c-format msgid "failed utime() on %s" msgstr "\"utime()\" misslyckades på %s" -#: sha1-file.c:1922 +#: sha1-file.c:1972 #, c-format msgid "cannot read object for %s" msgstr "kan inte läsa objekt för %s" -#: sha1-file.c:1962 +#: sha1-file.c:2011 msgid "corrupt commit" msgstr "trasik incheckning" -#: sha1-file.c:1970 +#: sha1-file.c:2019 msgid "corrupt tag" msgstr "trasig tagg" -#: sha1-file.c:2069 +#: sha1-file.c:2119 #, c-format msgid "read error while indexing %s" msgstr "läsfel vid indexering av %s" -#: sha1-file.c:2072 +#: sha1-file.c:2122 #, c-format msgid "short read while indexing %s" msgstr "för lite lästes vid indexering av %s" -#: sha1-file.c:2145 sha1-file.c:2154 +#: sha1-file.c:2195 sha1-file.c:2205 #, c-format msgid "%s: failed to insert into database" msgstr "%s: misslyckades lägga in i databasen" -#: sha1-file.c:2160 +#: sha1-file.c:2211 #, c-format msgid "%s: unsupported file type" msgstr "%s: filtypen stöds ej" -#: sha1-file.c:2184 +#: sha1-file.c:2235 #, c-format msgid "%s is not a valid object" msgstr "%s är inte ett giltigt objekt" -#: sha1-file.c:2186 +#: sha1-file.c:2237 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt \"%s\"-objekt" -#: sha1-file.c:2213 builtin/index-pack.c:155 +#: sha1-file.c:2264 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "kan inte öppna %s" -#: sha1-file.c:2403 sha1-file.c:2455 +#: sha1-file.c:2454 sha1-file.c:2507 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "hash stämmer inte för %s (förväntade %s)" -#: sha1-file.c:2427 +#: sha1-file.c:2478 #, c-format msgid "unable to mmap %s" msgstr "kan inte utföra \"mmap\" för %s" -#: sha1-file.c:2432 +#: sha1-file.c:2483 #, c-format msgid "unable to unpack header of %s" msgstr "kan inte packa upp huvud för %s" -#: sha1-file.c:2438 +#: sha1-file.c:2489 #, c-format msgid "unable to parse header of %s" msgstr "kan inte tolka huvud för %s" -#: sha1-file.c:2449 +#: sha1-file.c:2500 #, c-format msgid "unable to unpack contents of %s" msgstr "kan inte tolka innehåll i %s" -#: sha1-name.c:487 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "kort SHA1 %s är tvetydig" -#: sha1-name.c:498 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "Kandidaterna är:" -#: sha1-name.c:797 +#: sha1-name.c:796 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" @@ -7535,44 +7787,110 @@ msgstr "" "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n" "genom att köra \"git config advice.objectNameWarning false\"" +#: sha1-name.c:916 +#, c-format +msgid "log for '%.*s' only goes back to %s" +msgstr "loggen för \"%.*s\" räcker bara tillbaka till %s" + +#: sha1-name.c:924 +#, c-format +msgid "log for '%.*s' only has %d entries" +msgstr "loggen för \"%.*s\" har bara %d poster" + +#: sha1-name.c:1689 +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "Sökvägen \"%s\" finns på disken, men inte i \"%.*s\"" + +#: sha1-name.c:1695 +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" +"sökvägen \"%s\" finns, men inte i \"%s\"\n" +"tips: Menade du \"%.*s:%s\", även känd som \"%.*s:./%s\"?" + +#: sha1-name.c:1704 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "sökvägen \"%s\" finns inte i \"%.*s\"" + +#: sha1-name.c:1732 +#, c-format +msgid "" +"path '%s' is in the index, but not at stage %d\n" +"hint: Did you mean ':%d:%s'?" +msgstr "" +"sökvägen \"%s\" finns i indexet men inte i etapp %d\n" +"tips: Menade du \":%d:%s\"?" + +#: sha1-name.c:1748 +#, c-format +msgid "" +"path '%s' is in the index, but not '%s'\n" +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" +msgstr "" +"sökvägen \"%s\" finns i indexet, men inte i \"%s\"\n" +"tips: Menade du \":%d:%s\", även känd som \":%d:./%s\"?" + +#: sha1-name.c:1756 +#, 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" + +#: sha1-name.c:1758 +#, 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)" + +#: sha1-name.c:1771 +msgid "relative path syntax can't be used outside working tree" +msgstr "relativ sökväg kan inte användas utanför arbetskatalogen" + +#: sha1-name.c:1909 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "felaktigt objektnamn \"%.*s\"." + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:822 +#: strbuf.c:837 #, c-format msgid "%u.%2.2u GiB" msgstr "%u,%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:824 +#: strbuf.c:839 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u,%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:832 +#: strbuf.c:847 #, c-format msgid "%u.%2.2u MiB" msgstr "%u,%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:834 +#: strbuf.c:849 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u,%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:841 +#: strbuf.c:856 #, c-format msgid "%u.%2.2u KiB" msgstr "%u,%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:843 +#: strbuf.c:858 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u,%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:849 +#: strbuf.c:864 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7580,14 +7898,14 @@ msgstr[0] "%u byte" msgstr[1] "%u bytes" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:851 +#: strbuf.c:866 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u byte/s" msgstr[1] "%u bytes/s" -#: strbuf.c:1149 +#: strbuf.c:1164 #, c-format msgid "could not edit '%s'" msgstr "kunde inte redigera \"%s\"" @@ -7622,56 +7940,127 @@ msgstr "i ej utcheckad undermodul \"%s\"" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" +#: submodule.c:434 +#, c-format +msgid "bad --ignore-submodules argument: %s" +msgstr "felaktigt argument till --ignore-submodules: %s" + +#: submodule.c:815 +#, c-format +msgid "" +"Submodule in commit %s at path: '%s' collides with a submodule named the " +"same. Skipping it." +msgstr "" +"Undermodulen i incheckning %s på sökvägen: \"%s\" krockar med en undermodul " +"med samma namn. Hoppar över den." + #: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning" -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016 +#: submodule.c:995 +#, c-format +msgid "" +"Could not run 'git rev-list --not --remotes -n 1' command in " +"submodule %s" +msgstr "" +"kunde inte köra \"git rev-list --not --remotes -n 1\" i " +"undermodulen \"%s\"" + +#: submodule.c:1118 +#, c-format +msgid "process for submodule '%s' failed" +msgstr "process för undermodulen \"%s\" misslyckades" + +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens." -#: submodule.c:1481 +#: submodule.c:1158 #, c-format -msgid "Could not access submodule '%s'" -msgstr "kunde inte komma åt undermodulen \"%s\"" +msgid "Pushing submodule '%s'\n" +msgstr "Sänder undermodulen \"%s\"\n" -#: submodule.c:1651 +#: submodule.c:1161 +#, c-format +msgid "Unable to push submodule '%s'\n" +msgstr "Kunde inte sända undermodulen \"%s\"\n" + +#: submodule.c:1453 +#, c-format +msgid "Fetching submodule %s%s\n" +msgstr "Hämtar undermodulen %s%s\n" + +#: submodule.c:1483 +#, c-format +msgid "Could not access submodule '%s'\n" +msgstr "Kunde inte komma åt undermodulen \"%s\"\n" + +#: submodule.c:1637 +#, c-format +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "" +"Fel vid hämtning av undermodul:\n" +"%s" + +#: submodule.c:1662 #, c-format msgid "'%s' not recognized as a git repository" msgstr "\"%s\" känns inte igen som ett git-arkiv" -#: submodule.c:1789 +#: submodule.c:1679 +#, 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:1720 +#, c-format +msgid "'git status --porcelain=2' failed in submodule %s" +msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\"" + +#: submodule.c:1800 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "kunde inte starta \"git status\" i undermodulen \"%s\"" -#: submodule.c:1802 +#: submodule.c:1813 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "kunde inte köra \"git status\" i undermodulen \"%s\"" -#: submodule.c:1817 +#: submodule.c:1828 #, 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:1907 +#: submodule.c:1855 submodule.c:2165 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "kunde inte rekursera in i undermodulen \"%s\"" + +#: submodule.c:1876 +msgid "could not reset submodule index" +msgstr "kunde inte återställa indexet i undermodul" + +#: submodule.c:1918 #, c-format msgid "submodule '%s' has dirty index" msgstr "undermodulen \"%s\" har ett smutsigt index" -#: submodule.c:1959 +#: submodule.c:1970 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Undermoduler \"%s\" kunde inte uppdateras." -#: submodule.c:2027 +#: submodule.c:2038 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\"" -#: submodule.c:2048 +#: submodule.c:2059 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7679,17 +8068,17 @@ msgstr "" "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " "stöds ej" -#: submodule.c:2060 submodule.c:2119 +#: submodule.c:2071 submodule.c:2130 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" -#: submodule.c:2064 +#: submodule.c:2075 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog" -#: submodule.c:2071 +#: submodule.c:2082 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7700,16 +8089,11 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:2154 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "kunde inte rekursera in i undermodulen \"%s\"" - -#: submodule.c:2198 +#: submodule.c:2209 msgid "could not start ls-files in .." msgstr "kunde inte starta ls-files i .." -#: submodule.c:2237 +#: submodule.c:2248 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en oväntad returkod %d" @@ -7733,7 +8117,7 @@ msgstr "ignorerar \"%s\" som kan tolkas som en kommandoradsflagga: %s" msgid "invalid value for %s" msgstr "ogiltigt värde för %s" -#: submodule-config.c:769 +#: submodule-config.c:765 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Kunde inte uppdatera .gitmodules-posten %s" @@ -7749,7 +8133,7 @@ msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\"" msgid "unknown value '%s' for key '%s'" msgstr "okänt värde \"%s\" för nyckeln \"%s\"" -#: trailer.c:539 trailer.c:544 builtin/remote.c:295 +#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "mer än en %s" @@ -7881,7 +8265,7 @@ msgstr "Avbryter." msgid "failed to push all needed submodules" msgstr "kunde inte sända alla nödvändiga undermoduler" -#: transport.c:1345 transport-helper.c:656 +#: transport.c:1345 transport-helper.c:657 msgid "operation not supported by protocol" msgstr "funktionen stöds inte av protokollet" @@ -7894,7 +8278,7 @@ msgstr "komplett skrivning till fjärrhjälpare misslyckades" msgid "unable to find remote helper for '%s'" msgstr "kan inte hitta fjärrhjälpare för \"%s\"" -#: transport-helper.c:160 transport-helper.c:570 +#: transport-helper.c:160 transport-helper.c:571 msgid "can't dup helper output fd" msgstr "kunde inte duplicera utdata-filhandtag" @@ -7913,100 +8297,100 @@ msgstr "" "fjärrhjälparen behöver implementera förmåga för referensspecifikationer " "(refspec)" -#: transport-helper.c:284 transport-helper.c:424 +#: transport-helper.c:284 transport-helper.c:425 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s sade oväntat: \"%s\"" -#: transport-helper.c:413 +#: transport-helper.c:414 #, c-format msgid "%s also locked %s" msgstr "%s låste också %s" -#: transport-helper.c:492 +#: transport-helper.c:493 msgid "couldn't run fast-import" msgstr "kunde inte köra fast-import" -#: transport-helper.c:515 +#: transport-helper.c:516 msgid "error while running fast-import" msgstr "fel när fast-import kördes" -#: transport-helper.c:544 transport-helper.c:1133 +#: transport-helper.c:545 transport-helper.c:1134 #, c-format msgid "could not read ref %s" msgstr "kunde inte läsa referensen %s" -#: transport-helper.c:589 +#: transport-helper.c:590 #, c-format msgid "unknown response to connect: %s" msgstr "okänt svar på ansluntning: %s" -#: transport-helper.c:611 +#: transport-helper.c:612 msgid "setting remote service path not supported by protocol" msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst" -#: transport-helper.c:613 +#: transport-helper.c:614 msgid "invalid remote service path" msgstr "felaktig sökväg till fjärrtjänst" -#: transport-helper.c:659 +#: transport-helper.c:660 #, c-format msgid "can't connect to subservice %s" msgstr "kan inte ansluta till undertjänsten %s" -#: transport-helper.c:735 +#: transport-helper.c:736 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\"" -#: transport-helper.c:788 +#: transport-helper.c:789 #, c-format msgid "helper reported unexpected status of %s" msgstr "hjälparen returnerade oväntad status %s" -#: transport-helper.c:849 +#: transport-helper.c:850 #, c-format msgid "helper %s does not support dry-run" msgstr "hjälparen %s stöder inte dry-run" -#: transport-helper.c:852 +#: transport-helper.c:853 #, c-format msgid "helper %s does not support --signed" msgstr "hjälparen %s stöder inte --signed" -#: transport-helper.c:855 +#: transport-helper.c:856 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "hjälparen %s stöder inte --signed=if-asked" -#: transport-helper.c:860 +#: transport-helper.c:861 #, c-format msgid "helper %s does not support --atomic" msgstr "hjälparen %s stöder inte --atomic" -#: transport-helper.c:866 +#: transport-helper.c:867 #, c-format msgid "helper %s does not support 'push-option'" msgstr "hjälparen %s stöder inte \"push-option\"" -#: transport-helper.c:964 +#: transport-helper.c:965 msgid "remote-helper doesn't support push; refspec needed" msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs" -#: transport-helper.c:969 +#: transport-helper.c:970 #, c-format msgid "helper %s does not support 'force'" msgstr "hjälparen %s stöder inte \"force\"" -#: transport-helper.c:1016 +#: transport-helper.c:1017 msgid "couldn't run fast-export" msgstr "kunde inte köra fast-export" -#: transport-helper.c:1021 +#: transport-helper.c:1022 msgid "error while running fast-export" msgstr "fel vid körning av fast-export" -#: transport-helper.c:1046 +#: transport-helper.c:1047 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8015,68 +8399,63 @@ msgstr "" "Inga gemensamma referenser och inga angavs; gör inget.\n" "Du kanske borde ange en gren såsom \"master\".\n" -#: transport-helper.c:1119 +#: transport-helper.c:1120 #, c-format msgid "malformed response in ref list: %s" msgstr "felformat svar i referenslistan: %s" -#: transport-helper.c:1271 +#: transport-helper.c:1272 #, c-format msgid "read(%s) failed" msgstr "läs(%s) misslyckades" -#: transport-helper.c:1298 +#: transport-helper.c:1299 #, c-format msgid "write(%s) failed" msgstr "skriv(%s) misslyckades" -#: transport-helper.c:1347 +#: transport-helper.c:1348 #, c-format msgid "%s thread failed" msgstr "%s-tråden misslyckades" -#: transport-helper.c:1351 +#: transport-helper.c:1352 #, c-format msgid "%s thread failed to join: %s" msgstr "%s-tråden misslyckades ansluta: %s" -#: transport-helper.c:1370 transport-helper.c:1374 +#: transport-helper.c:1371 transport-helper.c:1375 #, 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:1411 +#: transport-helper.c:1412 #, c-format msgid "%s process failed to wait" msgstr "processen %s misslyckades vänta" -#: transport-helper.c:1415 +#: transport-helper.c:1416 #, c-format msgid "%s process failed" msgstr "processen %s misslyckades" -#: transport-helper.c:1433 transport-helper.c:1442 +#: transport-helper.c:1434 transport-helper.c:1443 msgid "can't start thread for copying data" msgstr "kan inte skapa tråd för kopiering av data" -#: tree-walk.c:33 +#: tree-walk.c:32 msgid "too-short tree object" msgstr "trädobjekt för kort" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "felformat läge i trädpost" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "tomt filnamn i trädpost" -#: tree-walk.c:48 -#, c-format -msgid "filename in tree entry contains backslash: '%s'" -msgstr "filnamnet i trädet innehåller omvänt snedstreck: \"%s\"" - -#: tree-walk.c:124 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "trädfil för kort" @@ -8326,7 +8705,7 @@ msgstr "" "sökvägar på ett okänsligt filsystem) och endast en från samma\n" "kollisionsgrupp finns i arbetskatalogen:\n" -#: unpack-trees.c:1441 +#: unpack-trees.c:1445 msgid "Updating index flags" msgstr "Uppdaterar indexflaggor" @@ -8359,32 +8738,32 @@ msgstr "felaktigt portnummer" msgid "invalid '..' path segment" msgstr "felaktigt \"..\"-sökvägssegment" -#: worktree.c:258 builtin/am.c:2084 +#: worktree.c:259 builtin/am.c:2084 #, c-format msgid "failed to read '%s'" msgstr "misslyckades läsa \"%s\"" -#: worktree.c:304 +#: worktree.c:305 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen" -#: worktree.c:315 +#: worktree.c:316 #, 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:327 +#: worktree.c:328 #, c-format msgid "'%s' does not exist" msgstr "\"%s\" finns inte" -#: worktree.c:333 +#: worktree.c:334 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "\"%s\" är inte en .git-fil, felkod %d" -#: worktree.c:341 +#: worktree.c:342 #, c-format msgid "'%s' does not point back to '%s'" msgstr "\"%s\" pekar inte tillbaka till \"%s\"" @@ -8934,122 +9313,126 @@ msgstr "misslyckades ta bort länken \"%s\"" msgid "git add [] [--] ..." msgstr "git add [] [--] ..." -#: builtin/add.c:87 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:92 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:288 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:102 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:177 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:252 builtin/rev-parse.c:899 +#: builtin/add.c:266 builtin/rev-parse.c:899 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:263 +#: builtin/add.c:277 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning." -#: builtin/add.c:267 +#: builtin/add.c:281 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:270 +#: builtin/add.c:284 msgid "editing patch failed" msgstr "redigering av patch misslyckades" -#: builtin/add.c:273 +#: builtin/add.c:287 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:275 +#: builtin/add.c:289 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:280 +#: builtin/add.c:294 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:288 +#: builtin/add.c:302 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:308 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:548 -#: builtin/remote.c:1344 builtin/rm.c:241 builtin/send-pack.c:165 +#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 +#: builtin/remote.c:1421 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:311 +#: builtin/add.c:325 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:312 builtin/checkout.c:1482 builtin/reset.c:307 +#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 msgid "select hunks interactively" msgstr "välj stycken interaktivt" -#: builtin/add.c:313 +#: builtin/add.c:327 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:314 +#: builtin/add.c:328 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:315 +#: builtin/add.c:329 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:316 +#: builtin/add.c:330 msgid "renormalize EOL of tracked files (implies -u)" msgstr "åternormalisera radslut i spårade filer (implicerar -u)" -#: builtin/add.c:317 +#: builtin/add.c:331 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:318 +#: builtin/add.c:332 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:321 +#: builtin/add.c:335 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:323 +#: builtin/add.c:337 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:324 +#: builtin/add.c:338 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:325 +#: builtin/add.c:339 msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: builtin/add.c:327 builtin/update-index.c:1004 +#: builtin/add.c:341 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" -#: builtin/add.c:329 +#: builtin/add.c:343 msgid "warn when adding an embedded repository" msgstr "varna när ett inbyggt arkiv läggs till" -#: builtin/add.c:347 +#: builtin/add.c:345 +msgid "backend for `git stash -p`" +msgstr "bakända för \"git stash -p\"" + +#: builtin/add.c:363 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9080,60 +9463,70 @@ msgstr "" "\n" "Se \"git help submodule\" för ytterligare information." -#: builtin/add.c:375 +#: builtin/add.c:391 #, c-format msgid "adding embedded git repository: %s" msgstr "lägger till inbäddat git-arkiv: %s" -#: builtin/add.c:393 -#, c-format -msgid "Use -f if you really want to add them.\n" -msgstr "Använd -f om du verkligen vill lägga till dem.\n" +#: builtin/add.c:410 +msgid "" +"Use -f if you really want to add them.\n" +"Turn this message off by running\n" +"\"git config advice.addIgnoredFile false\"" +msgstr "" +"Använd -f om du verkligen vill lägga till dem.\n" +"Slå av detta meddelande med\n" +"\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:400 +#: builtin/add.c:419 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:428 builtin/commit.c:348 +#: builtin/add.c:447 builtin/commit.c:348 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch" -#: builtin/add.c:434 +#: builtin/add.c:464 msgid "--pathspec-from-file is incompatible with --edit" msgstr "--pathspec-from-file är inkompatibelt med --edit" -#: builtin/add.c:446 +#: builtin/add.c:476 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:449 +#: builtin/add.c:479 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" -#: builtin/add.c:453 +#: builtin/add.c:483 #, 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:471 builtin/checkout.c:1648 builtin/commit.c:354 +#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 #: builtin/reset.c:327 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar" -#: builtin/add.c:478 builtin/checkout.c:1660 builtin/commit.c:360 +#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 #: builtin/reset.c:333 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul kräver --pathspec-from-file" -#: builtin/add.c:482 +#: builtin/add.c:512 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:483 -#, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Kanske menade du att skriva \"git add .\"?\n" +#: builtin/add.c:514 +msgid "" +"Maybe you wanted to say 'git add .'?\n" +"Turn this message off by running\n" +"\"git config advice.addEmptyPathspec false\"" +msgstr "" +"Tänkte du kanske säga \"git add .\"?\n" +"Slå av detta meddelande genom att köra\n" +"\"git config advice.addEmptyPathspec false\"" #: builtin/am.c:347 msgid "could not parse author script" @@ -9276,7 +9669,7 @@ msgstr "Incheckningskroppen är:" msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: " -#: builtin/am.c:1695 builtin/commit.c:394 +#: builtin/am.c:1695 builtin/commit.c:398 msgid "unable to write index file" msgstr "kan inte skriva indexfil" @@ -9412,9 +9805,9 @@ msgstr "ta bort allting före en saxlinje" msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2203 builtin/commit.c:1386 builtin/fmt-merge-msg.c:673 -#: builtin/fmt-merge-msg.c:676 builtin/grep.c:883 builtin/merge.c:249 -#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1469 +#: builtin/am.c:2203 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 +#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 #: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 #: parse-options.h:154 parse-options.h:175 parse-options.h:316 @@ -9422,7 +9815,7 @@ msgid "n" msgstr "n" #: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "format" @@ -9466,13 +9859,13 @@ msgstr "ljug om incheckningsdatum" msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1507 -#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:509 -#: builtin/rebase.c:1513 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1512 +#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 +#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2242 builtin/rebase.c:510 builtin/rebase.c:1514 +#: builtin/am.c:2242 builtin/rebase.c:518 builtin/rebase.c:1557 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" @@ -9682,7 +10075,7 @@ msgstr "" "Du måste sedan ange åtminstone en %s och en %s version.\n" "(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)" -#: builtin/bisect--helper.c:322 +#: builtin/bisect--helper.c:310 #, c-format msgid "bisecting only with a %s commit" msgstr "utför bisect med endast en %s incheckning" @@ -9691,15 +10084,15 @@ msgstr "utför bisect med endast en %s incheckning" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:330 +#: builtin/bisect--helper.c:318 msgid "Are you sure [Y/n]? " msgstr "Är du säker [Y=ja/N=nej]? " -#: builtin/bisect--helper.c:377 +#: builtin/bisect--helper.c:379 msgid "no terms defined" msgstr "inga termer angivna" -#: builtin/bisect--helper.c:380 +#: builtin/bisect--helper.c:382 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -9708,7 +10101,7 @@ msgstr "" "Aktuella termer är %s för det gamla tillståndet\n" "och %s för det nya tillståndet.\n" -#: builtin/bisect--helper.c:390 +#: builtin/bisect--helper.c:392 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -9717,113 +10110,113 @@ msgstr "" "ogiltigt argument %s för \"git bisect terms\".\n" "Flaggor som stöds är: --term-good|--term-old och --term-bad|--term-new." -#: builtin/bisect--helper.c:476 +#: builtin/bisect--helper.c:478 #, c-format msgid "unrecognized option: '%s'" msgstr "okänd flagga: %s" -#: builtin/bisect--helper.c:480 +#: builtin/bisect--helper.c:482 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "\"%s\" verkar inte vara en giltig revision" -#: builtin/bisect--helper.c:512 +#: builtin/bisect--helper.c:514 msgid "bad HEAD - I need a HEAD" msgstr "felaktigt HEAD - Jag behöver ett HEAD" -#: builtin/bisect--helper.c:527 +#: builtin/bisect--helper.c:529 #, c-format msgid "checking out '%s' failed. Try 'git bisect start '." msgstr "" "misslyckades checka ut \"%s\". Försök \"git bisect reset \"." # cogito-relaterat -#: builtin/bisect--helper.c:548 +#: builtin/bisect--helper.c:550 msgid "won't bisect on cg-seek'ed tree" msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts" -#: builtin/bisect--helper.c:551 +#: builtin/bisect--helper.c:553 msgid "bad HEAD - strange symbolic ref" msgstr "felaktigt HEAD - konstig symbolisk referens" -#: builtin/bisect--helper.c:575 +#: builtin/bisect--helper.c:577 #, c-format msgid "invalid ref: '%s'" msgstr "ogiltig referens: \"%s\"" -#: builtin/bisect--helper.c:631 +#: builtin/bisect--helper.c:633 msgid "perform 'git bisect next'" msgstr "utför 'git bisect next'" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:635 msgid "write the terms to .git/BISECT_TERMS" msgstr "skriv termerna i .git/BISECT_TERMS" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:637 msgid "cleanup the bisection state" msgstr "städar upp bisect-tillstånd" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:639 msgid "check for expected revs" msgstr "kontrollera för förväntade versioner" -#: builtin/bisect--helper.c:639 +#: builtin/bisect--helper.c:641 msgid "reset the bisection state" msgstr "återställ bisect-tillstånd" -#: builtin/bisect--helper.c:641 +#: builtin/bisect--helper.c:643 msgid "write out the bisection state in BISECT_LOG" msgstr "skriver bisect-tillståndet i BISECT_LOG" -#: builtin/bisect--helper.c:643 +#: builtin/bisect--helper.c:645 msgid "check and set terms in a bisection state" msgstr "visa och ange termer för bisect-tillstånd" -#: builtin/bisect--helper.c:645 +#: builtin/bisect--helper.c:647 msgid "check whether bad or good terms exist" msgstr "se efter om termer för rätt och fel finns" -#: builtin/bisect--helper.c:647 +#: builtin/bisect--helper.c:649 msgid "print out the bisect terms" msgstr "skriv ut termer för bisect" -#: builtin/bisect--helper.c:649 +#: builtin/bisect--helper.c:651 msgid "start the bisect session" msgstr "påbörja bisect-körningen" -#: builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:653 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning" -#: builtin/bisect--helper.c:653 +#: builtin/bisect--helper.c:655 msgid "no log for BISECT_WRITE" msgstr "ingen logg för BISECT_WRITE" -#: builtin/bisect--helper.c:670 +#: builtin/bisect--helper.c:673 msgid "--write-terms requires two arguments" msgstr "--write-terms kräver två argument" -#: builtin/bisect--helper.c:674 +#: builtin/bisect--helper.c:677 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state tar inga argument" -#: builtin/bisect--helper.c:681 +#: builtin/bisect--helper.c:684 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:685 +#: builtin/bisect--helper.c:688 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write kräver antingen 4 eller 5 argument" -#: builtin/bisect--helper.c:691 +#: builtin/bisect--helper.c:694 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms kräver tre argument" -#: builtin/bisect--helper.c:697 +#: builtin/bisect--helper.c:700 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check kräver 2 eller 3 argument" -#: builtin/bisect--helper.c:703 +#: builtin/bisect--helper.c:706 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms kräver noll eller ett argument" @@ -10207,7 +10600,7 @@ msgstr "ställ in spårningsläge (se git-pull(1))" msgid "do not use" msgstr "använd ej" -#: builtin/branch.c:626 builtin/rebase.c:505 +#: builtin/branch.c:626 builtin/rebase.c:513 msgid "upstream" msgstr "uppströms" @@ -10318,7 +10711,7 @@ msgstr "sortering och filtrering skiljer gemener och VERSALER" msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/branch.c:684 builtin/clone.c:784 +#: builtin/branch.c:684 builtin/clone.c:785 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" @@ -10423,19 +10816,19 @@ msgstr "git bundle list-heads [...]" msgid "git bundle unbundle [...]" msgstr "git bundle unbundle [...]" -#: builtin/bundle.c:66 builtin/pack-objects.c:3228 +#: builtin/bundle.c:66 builtin/pack-objects.c:3375 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/bundle.c:68 builtin/pack-objects.c:3230 +#: builtin/bundle.c:68 builtin/pack-objects.c:3377 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/bundle.c:70 builtin/pack-objects.c:3232 +#: builtin/bundle.c:70 builtin/pack-objects.c:3379 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/bundle.c:73 builtin/pack-objects.c:3235 +#: builtin/bundle.c:73 builtin/pack-objects.c:3382 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" @@ -10456,11 +10849,11 @@ msgstr "%s är okej\n" msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/bundle.c:168 builtin/remote.c:1609 +#: builtin/bundle.c:168 builtin/remote.c:1686 msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; måste skrivas före ett underkommando" -#: builtin/bundle.c:190 builtin/remote.c:1640 +#: builtin/bundle.c:190 builtin/remote.c:1717 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" @@ -10513,7 +10906,7 @@ msgstr "för blob-objekt, kör filter på objektets innehåll" msgid "for blob objects, run filters on object's content" msgstr "för blob-objekt, kör filger på objektets innehåll" -#: builtin/cat-file.c:645 git-submodule.sh:992 +#: builtin/cat-file.c:645 git-submodule.sh:1002 msgid "blob" msgstr "blob" @@ -10574,8 +10967,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:1435 builtin/gc.c:537 -#: builtin/worktree.c:506 +#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 +#: builtin/worktree.c:499 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -10587,27 +10980,27 @@ msgstr "visa indatasökvägar som inte träffas" msgid "ignore index when checking" msgstr "ignorera index vid kontroll" -#: builtin/check-ignore.c:160 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "kan inte ange sökvägsnamn med --stdin" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "-z kan endast användas tillsammans med --stdin" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "ingen sökväg angavs" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 msgid "--quiet is only valid with a single pathname" msgstr "--quiet kan endast användas med ett enkelt sökvägsnamn" -#: builtin/check-ignore.c:171 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "kan inte använda både --quiet och --verbose" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching är endast giltig med --verbose" @@ -10665,9 +11058,9 @@ msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1385 builtin/submodule--helper.c:1388 -#: builtin/submodule--helper.c:1396 builtin/submodule--helper.c:1882 -#: builtin/worktree.c:679 +#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 +#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 +#: builtin/worktree.c:672 msgid "string" msgstr "sträng" @@ -10782,11 +11175,11 @@ msgstr "\"%s\" eller \"%s\" kan inte användas med %s" msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:682 builtin/sparse-checkout.c:82 +#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:732 +#: builtin/checkout.c:734 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10795,50 +11188,50 @@ msgstr "" "kan inte fortsätta med köade ändringar i följande filer:\n" "%s" -#: builtin/checkout.c:835 +#: builtin/checkout.c:837 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:877 +#: builtin/checkout.c:879 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:881 builtin/clone.c:716 +#: builtin/checkout.c:883 builtin/clone.c:717 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:885 +#: builtin/checkout.c:887 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:888 +#: builtin/checkout.c:890 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:892 +#: builtin/checkout.c:894 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:894 builtin/checkout.c:1291 +#: builtin/checkout.c:896 builtin/checkout.c:1320 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:896 +#: builtin/checkout.c:898 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:947 +#: builtin/checkout.c:949 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:953 +#: builtin/checkout.c:955 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10861,7 +11254,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:972 +#: builtin/checkout.c:974 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10888,28 +11281,19 @@ msgstr[1] "" " git branch %s\n" "\n" -#: builtin/checkout.c:1007 +#: builtin/checkout.c:1009 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:1011 +#: builtin/checkout.c:1013 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:1051 builtin/checkout.c:1286 +#: builtin/checkout.c:1053 builtin/checkout.c:1315 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:1178 -msgid "only one reference expected" -msgstr "endast en referens förväntades" - -#: builtin/checkout.c:1195 -#, c-format -msgid "only one reference expected, %d given." -msgstr "endast en referens förväntades, %d gavs." - -#: builtin/checkout.c:1232 +#: builtin/checkout.c:1128 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -10918,232 +11302,8 @@ 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:1245 builtin/worktree.c:290 builtin/worktree.c:455 -#, c-format -msgid "invalid reference: %s" -msgstr "felaktig referens: %s" - -#: builtin/checkout.c:1258 builtin/checkout.c:1622 -#, c-format -msgid "reference is not a tree: %s" -msgstr "referensen är inte ett träd: %s" - -#: builtin/checkout.c:1305 -#, c-format -msgid "a branch is expected, got tag '%s'" -msgstr "förväntade gren, fick taggen \"%s\"" - -#: builtin/checkout.c:1307 -#, c-format -msgid "a branch is expected, got remote branch '%s'" -msgstr "förväntade gren, fick fjärrgrenen \"%s\"" - -#: builtin/checkout.c:1308 builtin/checkout.c:1316 -#, c-format -msgid "a branch is expected, got '%s'" -msgstr "förväntade gren, fick \"%s\"" - -#: builtin/checkout.c:1311 -#, c-format -msgid "a branch is expected, got commit '%s'" -msgstr "förväntade gren, fick incheckningen \"%s\"" - -#: builtin/checkout.c:1327 +#: builtin/checkout.c:1135 msgid "" -"cannot switch branch while merging\n" -"Consider \"git merge --quit\" or \"git worktree add\"." -msgstr "" -"kan inte växla gren vid sammanslagning\n" -"Överväg \"git merge --quit\" eller \"git worktree add\"." - -#: builtin/checkout.c:1331 -msgid "" -"cannot switch branch in the middle of an am session\n" -"Consider \"git am --quit\" or \"git worktree add\"." -msgstr "" -"kan inte växla gren mitt i en \"am\"-körning\n" -"Överväg \"git am --quit\" eller \"git worktree add\"." - -#: builtin/checkout.c:1335 -msgid "" -"cannot switch branch while rebasing\n" -"Consider \"git rebase --quit\" or \"git worktree add\"." -msgstr "" -"kan inte växla gren vid ombasering\n" -"Överväg \"git rebase --quit\" eller \"git worktree add\"." - -#: builtin/checkout.c:1339 -msgid "" -"cannot switch branch while cherry-picking\n" -"Consider \"git cherry-pick --quit\" or \"git worktree add\"." -msgstr "" -"kan inte växla gren i en \"cherry-pick\"\n" -"Överväg \"git cherry-pick --quit\" eller \"git worktree add\"." - -#: builtin/checkout.c:1343 -msgid "" -"cannot switch branch while reverting\n" -"Consider \"git revert --quit\" or \"git worktree add\"." -msgstr "" -"kan inte växla gren i en \"revert\"\n" -"Överväg \"git revert --quit\" eller \"git worktree add\"." - -#: builtin/checkout.c:1347 -msgid "you are switching branch while bisecting" -msgstr "då växlar grenar medan du gör en \"bisect\"" - -#: builtin/checkout.c:1354 -msgid "paths cannot be used with switching branches" -msgstr "sökvägar kan inte användas vid byte av gren" - -#: builtin/checkout.c:1357 builtin/checkout.c:1361 builtin/checkout.c:1365 -#, c-format -msgid "'%s' cannot be used with switching branches" -msgstr "\"%s\" kan inte användas vid byte av gren" - -#: builtin/checkout.c:1369 builtin/checkout.c:1372 builtin/checkout.c:1375 -#: builtin/checkout.c:1380 builtin/checkout.c:1385 -#, c-format -msgid "'%s' cannot be used with '%s'" -msgstr "\"%s\" kan inte användas med \"%s\"" - -#: builtin/checkout.c:1382 -#, c-format -msgid "'%s' cannot take " -msgstr "\"%s\" kan inte ta " - -#: builtin/checkout.c:1390 -#, c-format -msgid "Cannot switch branch to a non-commit '%s'" -msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" - -#: builtin/checkout.c:1397 -msgid "missing branch or commit argument" -msgstr "saknar gren- eller incheckingsargument" - -#: builtin/checkout.c:1439 builtin/clone.c:91 builtin/commit-graph.c:52 -#: builtin/commit-graph.c:113 builtin/fetch.c:167 builtin/merge.c:285 -#: builtin/multi-pack-index.c:27 builtin/pull.c:138 builtin/push.c:563 -#: builtin/send-pack.c:174 -msgid "force progress reporting" -msgstr "tvinga förloppsrapportering" - -#: builtin/checkout.c:1440 -msgid "perform a 3-way merge with the new branch" -msgstr "utför en 3-vägssammanslagning för den nya grenen" - -#: builtin/checkout.c:1441 builtin/log.c:1690 parse-options.h:322 -msgid "style" -msgstr "stil" - -#: builtin/checkout.c:1442 -msgid "conflict style (merge or diff3)" -msgstr "konfliktstil (merge eller diff3)" - -#: builtin/checkout.c:1454 builtin/worktree.c:503 -msgid "detach HEAD at named commit" -msgstr "koppla från HEAD vid namngiven incheckning" - -#: builtin/checkout.c:1455 -msgid "set upstream info for new branch" -msgstr "sätt uppströmsinformation för ny gren" - -#: builtin/checkout.c:1457 -msgid "force checkout (throw away local modifications)" -msgstr "tvinga utcheckning (kasta bort lokala ändringar)" - -#: builtin/checkout.c:1459 -msgid "new-branch" -msgstr "ny-gren" - -#: builtin/checkout.c:1459 -msgid "new unparented branch" -msgstr "ny gren utan förälder" - -#: builtin/checkout.c:1461 builtin/merge.c:288 -msgid "update ignored files (default)" -msgstr "uppdatera ignorerade filer (standard)" - -#: builtin/checkout.c:1464 -msgid "do not check if another worktree is holding the given ref" -msgstr "" -"kontrollera inte om en annan arbetskatalog håller den angivna referensen" - -#: builtin/checkout.c:1477 -msgid "checkout our version for unmerged files" -msgstr "checka ut vår version för ej sammanslagna filer" - -#: builtin/checkout.c:1480 -msgid "checkout their version for unmerged files" -msgstr "checka ut deras version för ej sammanslagna filer" - -#: builtin/checkout.c:1484 -msgid "do not limit pathspecs to sparse entries only" -msgstr "begränsa inte sökvägar till endast glesa poster" - -#: builtin/checkout.c:1537 -msgid "-b, -B and --orphan are mutually exclusive" -msgstr "-b, -B och --orphan är ömsesidigt uteslutande" - -#: builtin/checkout.c:1540 -msgid "-p and --overlay are mutually exclusive" -msgstr "-p och --overlay är ömsesidigt uteslutande" - -#: builtin/checkout.c:1577 -msgid "--track needs a branch name" -msgstr "--track behöver ett namn på en gren" - -#: builtin/checkout.c:1582 -msgid "missing branch name; try -b" -msgstr "grennamn saknas; försök med -b" - -#: builtin/checkout.c:1615 -#, c-format -msgid "could not resolve %s" -msgstr "kunde inte upplösa %s" - -#: builtin/checkout.c:1631 -msgid "invalid path specification" -msgstr "felaktig sökvägsangivelse" - -#: builtin/checkout.c:1638 -#, c-format -msgid "'%s' is not a commit and a branch '%s' cannot be created from it" -msgstr "" -"\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den" - -#: builtin/checkout.c:1642 -#, c-format -msgid "git checkout: --detach does not take a path argument '%s'" -msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\"" - -#: builtin/checkout.c:1651 -msgid "--pathspec-from-file is incompatible with --detach" -msgstr "--pathspec-from-file är inkompatibelt med --detach" - -#: builtin/checkout.c:1654 builtin/reset.c:324 -msgid "--pathspec-from-file is incompatible with --patch" -msgstr "--pathspec-from-file är inkompatibelt med --patch" - -#: builtin/checkout.c:1665 -msgid "" -"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" -"checking out of the index." -msgstr "" -"git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" -"du checkar ut från indexet." - -#: builtin/checkout.c:1670 -msgid "you must specify path(s) to restore" -msgstr "du måste ange katalog(er) att återställa" - -#: builtin/checkout.c:1689 -#, c-format -msgid "" -"'%s' matched more than one remote tracking branch.\n" -"We found %d remotes with a reference that matched. So we fell back\n" -"on trying to resolve the argument as a path, but failed there too!\n" -"\n" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" "\n" @@ -11153,10 +11313,6 @@ msgid "" "one remote, e.g. the 'origin' remote, consider setting\n" "checkout.defaultRemote=origin in your config." msgstr "" -"\"%s\" motsvarar mer än en spårad fjärrgren.\n" -"Vi hittade %d fjärrar med en motsvarande referens. Så vi förösökte\n" -"istället tolka argumentet som en sökväg, men misslyckades också där!\n" -"\n" "Om du menade checka ut en spårad fjärrgren på t.ex \"origin\", kan du\n" "göra det genom att ange hela namnet med flaggan --track:\n" "\n" @@ -11166,65 +11322,298 @@ 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:1714 builtin/checkout.c:1716 builtin/checkout.c:1765 -#: builtin/checkout.c:1767 builtin/clone.c:121 builtin/remote.c:169 -#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 +#: builtin/checkout.c:1145 +#, c-format +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar" + +#: builtin/checkout.c:1211 +msgid "only one reference expected" +msgstr "endast en referens förväntades" + +#: builtin/checkout.c:1228 +#, c-format +msgid "only one reference expected, %d given." +msgstr "endast en referens förväntades, %d gavs." + +#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 +#, c-format +msgid "invalid reference: %s" +msgstr "felaktig referens: %s" + +#: builtin/checkout.c:1287 builtin/checkout.c:1649 +#, c-format +msgid "reference is not a tree: %s" +msgstr "referensen är inte ett träd: %s" + +#: builtin/checkout.c:1334 +#, c-format +msgid "a branch is expected, got tag '%s'" +msgstr "förväntade gren, fick taggen \"%s\"" + +#: builtin/checkout.c:1336 +#, c-format +msgid "a branch is expected, got remote branch '%s'" +msgstr "förväntade gren, fick fjärrgrenen \"%s\"" + +#: builtin/checkout.c:1337 builtin/checkout.c:1345 +#, c-format +msgid "a branch is expected, got '%s'" +msgstr "förväntade gren, fick \"%s\"" + +#: builtin/checkout.c:1340 +#, c-format +msgid "a branch is expected, got commit '%s'" +msgstr "förväntade gren, fick incheckningen \"%s\"" + +#: builtin/checkout.c:1356 +msgid "" +"cannot switch branch while merging\n" +"Consider \"git merge --quit\" or \"git worktree add\"." +msgstr "" +"kan inte växla gren vid sammanslagning\n" +"Överväg \"git merge --quit\" eller \"git worktree add\"." + +#: builtin/checkout.c:1360 +msgid "" +"cannot switch branch in the middle of an am session\n" +"Consider \"git am --quit\" or \"git worktree add\"." +msgstr "" +"kan inte växla gren mitt i en \"am\"-körning\n" +"Överväg \"git am --quit\" eller \"git worktree add\"." + +#: builtin/checkout.c:1364 +msgid "" +"cannot switch branch while rebasing\n" +"Consider \"git rebase --quit\" or \"git worktree add\"." +msgstr "" +"kan inte växla gren vid ombasering\n" +"Överväg \"git rebase --quit\" eller \"git worktree add\"." + +#: builtin/checkout.c:1368 +msgid "" +"cannot switch branch while cherry-picking\n" +"Consider \"git cherry-pick --quit\" or \"git worktree add\"." +msgstr "" +"kan inte växla gren i en \"cherry-pick\"\n" +"Överväg \"git cherry-pick --quit\" eller \"git worktree add\"." + +#: builtin/checkout.c:1372 +msgid "" +"cannot switch branch while reverting\n" +"Consider \"git revert --quit\" or \"git worktree add\"." +msgstr "" +"kan inte växla gren i en \"revert\"\n" +"Överväg \"git revert --quit\" eller \"git worktree add\"." + +#: builtin/checkout.c:1376 +msgid "you are switching branch while bisecting" +msgstr "då växlar grenar medan du gör en \"bisect\"" + +#: builtin/checkout.c:1383 +msgid "paths cannot be used with switching branches" +msgstr "sökvägar kan inte användas vid byte av gren" + +#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 +#, c-format +msgid "'%s' cannot be used with switching branches" +msgstr "\"%s\" kan inte användas vid byte av gren" + +#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 +#: builtin/checkout.c:1409 builtin/checkout.c:1414 +#, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "\"%s\" kan inte användas med \"%s\"" + +#: builtin/checkout.c:1411 +#, c-format +msgid "'%s' cannot take " +msgstr "\"%s\" kan inte ta " + +#: builtin/checkout.c:1419 +#, c-format +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" + +#: builtin/checkout.c:1426 +msgid "missing branch or commit argument" +msgstr "saknar gren- eller incheckingsargument" + +#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 +#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 +#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 +#: builtin/send-pack.c:174 +msgid "force progress reporting" +msgstr "tvinga förloppsrapportering" + +#: builtin/checkout.c:1469 +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:1470 builtin/log.c:1690 parse-options.h:322 +msgid "style" +msgstr "stil" + +#: builtin/checkout.c:1471 +msgid "conflict style (merge or diff3)" +msgstr "konfliktstil (merge eller diff3)" + +#: builtin/checkout.c:1483 builtin/worktree.c:496 +msgid "detach HEAD at named commit" +msgstr "koppla från HEAD vid namngiven incheckning" + +#: builtin/checkout.c:1484 +msgid "set upstream info for new branch" +msgstr "sätt uppströmsinformation för ny gren" + +#: builtin/checkout.c:1486 +msgid "force checkout (throw away local modifications)" +msgstr "tvinga utcheckning (kasta bort lokala ändringar)" + +#: builtin/checkout.c:1488 +msgid "new-branch" +msgstr "ny-gren" + +#: builtin/checkout.c:1488 +msgid "new unparented branch" +msgstr "ny gren utan förälder" + +#: builtin/checkout.c:1490 builtin/merge.c:289 +msgid "update ignored files (default)" +msgstr "uppdatera ignorerade filer (standard)" + +#: builtin/checkout.c:1493 +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:1506 +msgid "checkout our version for unmerged files" +msgstr "checka ut vår version för ej sammanslagna filer" + +#: builtin/checkout.c:1509 +msgid "checkout their version for unmerged files" +msgstr "checka ut deras version för ej sammanslagna filer" + +#: builtin/checkout.c:1513 +msgid "do not limit pathspecs to sparse entries only" +msgstr "begränsa inte sökvägar till endast glesa poster" + +#: builtin/checkout.c:1565 +msgid "-b, -B and --orphan are mutually exclusive" +msgstr "-b, -B och --orphan är ömsesidigt uteslutande" + +#: builtin/checkout.c:1568 +msgid "-p and --overlay are mutually exclusive" +msgstr "-p och --overlay är ömsesidigt uteslutande" + +#: builtin/checkout.c:1605 +msgid "--track needs a branch name" +msgstr "--track behöver ett namn på en gren" + +#: builtin/checkout.c:1610 +msgid "missing branch name; try -b" +msgstr "grennamn saknas; försök med -b" + +#: builtin/checkout.c:1642 +#, c-format +msgid "could not resolve %s" +msgstr "kunde inte upplösa %s" + +#: builtin/checkout.c:1658 +msgid "invalid path specification" +msgstr "felaktig sökvägsangivelse" + +#: builtin/checkout.c:1665 +#, 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:1669 +#, 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:1678 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "--pathspec-from-file är inkompatibelt med --detach" + +#: builtin/checkout.c:1681 builtin/reset.c:324 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "--pathspec-from-file är inkompatibelt med --patch" + +#: builtin/checkout.c:1692 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" +"git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" +"du checkar ut från indexet." + +#: builtin/checkout.c:1697 +msgid "you must specify path(s) to restore" +msgstr "du måste ange katalog(er) att återställa" + +#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 +#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1715 +#: builtin/checkout.c:1724 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1717 +#: builtin/checkout.c:1726 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1727 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1720 +#: builtin/checkout.c:1729 msgid "second guess 'git checkout ' (default)" msgstr "förutspå \"git checkout \" (förval)" -#: builtin/checkout.c:1721 +#: builtin/checkout.c:1730 msgid "use overlay mode (default)" msgstr "använd överläggsläge (standard)" -#: builtin/checkout.c:1766 +#: builtin/checkout.c:1775 msgid "create and switch to a new branch" msgstr "skapa och växla till en ny gren" -#: builtin/checkout.c:1768 +#: builtin/checkout.c:1777 msgid "create/reset and switch to a branch" msgstr "skapa/nollställ och växla till en gren" -#: builtin/checkout.c:1770 +#: builtin/checkout.c:1779 msgid "second guess 'git switch '" msgstr "förutspå \"git checkout \"" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1781 msgid "throw away local modifications" msgstr "kasta bort lokala ändringar" -#: builtin/checkout.c:1804 +#: builtin/checkout.c:1813 msgid "which tree-ish to checkout from" msgstr "vilken träd-igt att checka ut från" -#: builtin/checkout.c:1806 +#: builtin/checkout.c:1815 msgid "restore the index" msgstr "återställ indexet" -#: builtin/checkout.c:1808 +#: builtin/checkout.c:1817 msgid "restore the working tree (default)" msgstr "återställ arbetskatalogen (förval)" -#: builtin/checkout.c:1810 +#: builtin/checkout.c:1819 msgid "ignore unmerged entries" msgstr "ignorera ej sammanslagna poster" -#: builtin/checkout.c:1811 +#: builtin/checkout.c:1820 msgid "use overlay mode" msgstr "använd överläggsläge" @@ -11369,9 +11758,9 @@ msgstr "städa interaktivt" msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 -#: builtin/grep.c:901 builtin/log.c:177 builtin/log.c:179 -#: builtin/ls-files.c:557 builtin/name-rev.c:464 builtin/name-rev.c:466 +#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 +#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 +#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "mönster" @@ -11456,18 +11845,18 @@ msgstr "mallkatalog" msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1392 -#: builtin/submodule--helper.c:1885 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1912 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:118 builtin/submodule--helper.c:1394 -#: builtin/submodule--helper.c:1887 +#: builtin/clone.c:118 builtin/submodule--helper.c:1409 +#: builtin/submodule--helper.c:1914 msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3294 builtin/repack.c:327 +#: builtin/pack-objects.c:3441 builtin/repack.c:327 msgid "name" msgstr "namn" @@ -11483,8 +11872,8 @@ msgstr "checka ut istället för fjärrens HEAD" msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:840 -#: builtin/pull.c:227 +#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 +#: builtin/pull.c:207 msgid "depth" msgstr "djup" @@ -11492,7 +11881,7 @@ msgstr "djup" msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3283 +#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 msgid "time" msgstr "tid" @@ -11501,7 +11890,7 @@ msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon från en angiven tidpunkt" #: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 -#: builtin/rebase.c:1445 +#: builtin/rebase.c:1480 msgid "revision" msgstr "revision" @@ -11509,7 +11898,8 @@ msgstr "revision" msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" -#: builtin/clone.c:132 +#: builtin/clone.c:132 builtin/submodule--helper.c:1419 +#: builtin/submodule--helper.c:1928 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" @@ -11549,12 +11939,12 @@ msgstr "" "inget att checka in\n" "flagga att sända" -#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:240 +#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 #: builtin/push.c:574 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:243 +#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 #: builtin/push.c:576 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" @@ -11625,132 +12015,132 @@ msgstr "" msgid "Could not find remote branch %s to clone." msgstr "Kunde inte hitta fjärrgrenen %s för att klona." -#: builtin/clone.c:704 +#: builtin/clone.c:705 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:752 +#: builtin/clone.c:753 msgid "failed to initialize sparse-checkout" msgstr "misslyckades initiera sparse-checkout" -#: builtin/clone.c:775 +#: builtin/clone.c:776 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:806 +#: builtin/clone.c:807 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:856 +#: builtin/clone.c:862 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:919 +#: builtin/clone.c:925 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:921 +#: builtin/clone.c:927 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:959 builtin/receive-pack.c:1948 +#: builtin/clone.c:965 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:963 +#: builtin/clone.c:969 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:976 +#: builtin/clone.c:982 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:979 +#: builtin/clone.c:985 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:992 +#: builtin/clone.c:998 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:998 builtin/fetch.c:1787 +#: builtin/clone.c:1004 builtin/fetch.c:1796 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:1008 +#: builtin/clone.c:1014 #, 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:1018 +#: builtin/clone.c:1024 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:1033 builtin/clone.c:1054 builtin/difftool.c:271 -#: builtin/log.c:1866 builtin/worktree.c:302 builtin/worktree.c:334 +#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 +#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:1038 +#: builtin/clone.c:1044 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:1058 +#: builtin/clone.c:1064 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:1060 +#: builtin/clone.c:1066 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:1084 +#: builtin/clone.c:1090 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:1148 +#: builtin/clone.c:1154 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1150 +#: builtin/clone.c:1156 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:1152 +#: builtin/clone.c:1158 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:1154 +#: builtin/clone.c:1160 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1157 +#: builtin/clone.c:1163 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1162 +#: builtin/clone.c:1168 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1237 builtin/clone.c:1245 +#: builtin/clone.c:1243 builtin/clone.c:1251 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1248 +#: builtin/clone.c:1254 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -11827,13 +12217,13 @@ msgstr "förälder" msgid "id of a parent commit object" msgstr "id på ett förälderincheckningsobjekt" -#: builtin/commit-tree.c:114 builtin/commit.c:1496 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 +#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1472 #: builtin/tag.c:412 msgid "message" msgstr "meddelande" -#: builtin/commit-tree.c:115 builtin/commit.c:1496 +#: builtin/commit-tree.c:115 builtin/commit.c:1501 msgid "commit message" msgstr "incheckningsmeddelande" @@ -11841,8 +12231,8 @@ msgstr "incheckningsmeddelande" msgid "read commit log message from file" msgstr "läs incheckningsloggmeddelande från fil" -#: builtin/commit-tree.c:121 builtin/commit.c:1508 builtin/merge.c:287 -#: builtin/pull.c:195 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 +#: builtin/pull.c:175 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG-signera incheckning" @@ -11928,53 +12318,53 @@ msgstr "Du måste ange sökvägar tillsammans med --include/--only." msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:382 +#: builtin/commit.c:385 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:396 +#: builtin/commit.c:400 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporärt index" -#: builtin/commit.c:398 +#: builtin/commit.c:402 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cacheträdet" -#: builtin/commit.c:423 builtin/commit.c:446 builtin/commit.c:492 +#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:475 +#: builtin/commit.c:479 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:477 +#: builtin/commit.c:481 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:485 +#: builtin/commit.c:489 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:504 +#: builtin/commit.c:508 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:602 +#: builtin/commit.c:606 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar författarhuvud" -#: builtin/commit.c:604 +#: builtin/commit.c:608 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:623 +#: builtin/commit.c:627 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:676 +#: builtin/commit.c:680 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -11982,38 +12372,38 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:714 builtin/commit.c:747 builtin/commit.c:1092 +#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:726 builtin/shortlog.c:319 +#: builtin/commit.c:730 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:728 +#: builtin/commit.c:732 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:732 +#: builtin/commit.c:736 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:763 builtin/commit.c:779 +#: builtin/commit.c:767 builtin/commit.c:783 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:770 +#: builtin/commit.c:774 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:830 +#: builtin/commit.c:834 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:849 +#: builtin/commit.c:853 #, c-format msgid "" "\n" @@ -12028,7 +12418,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:854 +#: builtin/commit.c:858 #, c-format msgid "" "\n" @@ -12043,7 +12433,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:867 +#: builtin/commit.c:871 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12053,7 +12443,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:875 +#: builtin/commit.c:879 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12064,140 +12454,140 @@ msgstr "" "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:892 +#: builtin/commit.c:896 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:900 +#: builtin/commit.c:904 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:907 +#: builtin/commit.c:911 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:925 +#: builtin/commit.c:929 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:992 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:1006 builtin/tag.c:275 +#: builtin/commit.c:1011 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" -#: builtin/commit.c:1050 +#: builtin/commit.c:1055 #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "" "--author '%s' är inte 'Namn ' och matchar ingen befintlig författare" -#: builtin/commit.c:1064 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Ogiltigt ignorerat läge \"%s\"" -#: builtin/commit.c:1082 builtin/commit.c:1322 +#: builtin/commit.c:1087 builtin/commit.c:1327 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1122 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1166 +#: builtin/commit.c:1171 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:1175 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1178 +#: builtin/commit.c:1183 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:1180 +#: builtin/commit.c:1185 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:1183 +#: builtin/commit.c:1188 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1193 +#: builtin/commit.c:1198 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:1195 +#: builtin/commit.c:1200 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F." -#: builtin/commit.c:1203 +#: builtin/commit.c:1208 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:1220 +#: builtin/commit.c:1225 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:1226 +#: builtin/commit.c:1231 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "sökvägarna \"%s ...\" med -a ger ingen mening" -#: builtin/commit.c:1357 builtin/commit.c:1519 +#: builtin/commit.c:1362 builtin/commit.c:1524 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1359 builtin/commit.c:1521 +#: builtin/commit.c:1364 builtin/commit.c:1526 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1361 +#: builtin/commit.c:1366 msgid "show stash information" msgstr "visa information om stash" -#: builtin/commit.c:1363 builtin/commit.c:1523 +#: builtin/commit.c:1368 builtin/commit.c:1528 msgid "compute full ahead/behind values" msgstr "beräkna fullständiga före-/efter-värden" -#: builtin/commit.c:1365 +#: builtin/commit.c:1370 msgid "version" msgstr "version" -#: builtin/commit.c:1365 builtin/commit.c:1525 builtin/push.c:549 -#: builtin/worktree.c:650 +#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 +#: builtin/worktree.c:643 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1368 builtin/commit.c:1527 +#: builtin/commit.c:1373 builtin/commit.c:1532 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1371 builtin/commit.c:1530 +#: builtin/commit.c:1376 builtin/commit.c:1535 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1373 builtin/commit.c:1377 builtin/commit.c:1533 +#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 #: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1525 parse-options.h:336 +#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 msgid "mode" msgstr "läge" -#: builtin/commit.c:1374 builtin/commit.c:1533 +#: builtin/commit.c:1379 builtin/commit.c:1538 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:1378 +#: builtin/commit.c:1383 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -12205,11 +12595,11 @@ msgstr "" "visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: " "traditional)" -#: builtin/commit.c:1380 parse-options.h:192 +#: builtin/commit.c:1385 parse-options.h:192 msgid "when" msgstr "när" -#: builtin/commit.c:1381 +#: builtin/commit.c:1386 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -12217,172 +12607,172 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1383 +#: builtin/commit.c:1388 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1384 +#: builtin/commit.c:1389 msgid "do not detect renames" msgstr "detektera inte namnändringar" -#: builtin/commit.c:1386 +#: builtin/commit.c:1391 msgid "detect renames, optionally set similarity index" msgstr "detektera namnändringar, möjligen sätt likhetsindex" -#: builtin/commit.c:1406 +#: builtin/commit.c:1411 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:1489 +#: builtin/commit.c:1494 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1490 +#: builtin/commit.c:1495 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1492 +#: builtin/commit.c:1497 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1493 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1494 +#: builtin/commit.c:1499 msgid "author" msgstr "författare" -#: builtin/commit.c:1494 +#: builtin/commit.c:1499 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1495 builtin/gc.c:538 +#: builtin/commit.c:1500 builtin/gc.c:538 msgid "date" msgstr "datum" -#: builtin/commit.c:1495 +#: builtin/commit.c:1500 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1497 builtin/commit.c:1498 builtin/commit.c:1499 -#: builtin/commit.c:1500 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 +#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1497 +#: builtin/commit.c:1502 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1498 +#: builtin/commit.c:1503 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1499 +#: builtin/commit.c:1504 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1500 +#: builtin/commit.c:1505 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:1501 +#: builtin/commit.c:1506 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:1502 builtin/log.c:1634 builtin/merge.c:289 -#: builtin/pull.c:164 builtin/revert.c:110 +#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 +#: builtin/pull.c:144 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1503 +#: builtin/commit.c:1508 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1504 +#: builtin/commit.c:1509 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1506 +#: builtin/commit.c:1511 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1511 +#: builtin/commit.c:1516 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1512 +#: builtin/commit.c:1517 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1513 +#: builtin/commit.c:1518 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1514 +#: builtin/commit.c:1519 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1515 +#: builtin/commit.c:1520 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1516 +#: builtin/commit.c:1521 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1517 +#: builtin/commit.c:1522 msgid "bypass pre-commit and commit-msg hooks" msgstr "förbigå pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1518 +#: builtin/commit.c:1523 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1531 +#: builtin/commit.c:1536 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1532 +#: builtin/commit.c:1537 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1539 +#: builtin/commit.c:1544 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1541 +#: builtin/commit.c:1546 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1614 +#: builtin/commit.c:1619 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1621 +#: builtin/commit.c:1626 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1640 +#: builtin/commit.c:1645 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1647 +#: builtin/commit.c:1652 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1652 +#: builtin/commit.c:1657 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1686 +#: builtin/commit.c:1691 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -12407,55 +12797,60 @@ msgstr "" "git commit-graph write [--object-dir ] [--append|--split] [--" "reachable|--stdin-packs|--stdin-commits] [--[no-]progress] " -#: builtin/commit-graph.c:48 builtin/commit-graph.c:103 -#: builtin/commit-graph.c:187 builtin/fetch.c:179 builtin/log.c:1657 +#: builtin/commit-graph.c:52 +#, c-format +msgid "could not find object directory matching %s" +msgstr "kunde inte hitta objektkatalog för %s" + +#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 +#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 msgid "dir" msgstr "kat" -#: builtin/commit-graph.c:49 builtin/commit-graph.c:104 -#: builtin/commit-graph.c:188 +#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 +#: builtin/commit-graph.c:211 msgid "The object directory to store the graph" msgstr "Objektkatalogen där grafen skall lagras" -#: builtin/commit-graph.c:51 +#: builtin/commit-graph.c:71 msgid "if the commit-graph is split, only verify the tip file" msgstr "om inchecknignsgrafen är delad, kontrollera bara spetsfilen" -#: builtin/commit-graph.c:73 t/helper/test-read-graph.c:23 +#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 #, c-format msgid "Could not open commit-graph '%s'" msgstr "Kunde inte öppna incheckningsgrafen \"%s\"" -#: builtin/commit-graph.c:106 +#: builtin/commit-graph.c:128 msgid "start walk at all refs" msgstr "starta traversering vid alla referenser" -#: builtin/commit-graph.c:108 +#: builtin/commit-graph.c:130 msgid "scan pack-indexes listed by stdin for commits" msgstr "sök paketindex listade på standard in efter incheckningar" -#: builtin/commit-graph.c:110 +#: builtin/commit-graph.c:132 msgid "start walk at commits listed by stdin" msgstr "börja gå genom incheckningar listade på standard in" -#: builtin/commit-graph.c:112 +#: builtin/commit-graph.c:134 msgid "include all commits already in the commit-graph file" msgstr "ta med alla incheckningar redan i filen commit-graph" -#: builtin/commit-graph.c:115 +#: builtin/commit-graph.c:137 msgid "allow writing an incremental commit-graph file" msgstr "tillåt skriva en inkrementell incheckningsgraffil" -#: builtin/commit-graph.c:117 builtin/commit-graph.c:121 +#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" "maximalt antal incheckningar i en delad incheckingsgraf som inte är bad" -#: builtin/commit-graph.c:119 +#: builtin/commit-graph.c:141 msgid "maximum ratio between two levels of a split commit-graph" msgstr "maximalt förhållande mellan två nivåer av en delad incheckningsgraf" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:159 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "använd som mest en av --reachable, --stdin-commit och --stdin-packs" @@ -12463,205 +12858,211 @@ msgstr "använd som mest en av --reachable, --stdin-commit och --stdin-packs" msgid "git config []" msgstr "git config []" -#: builtin/config.c:103 builtin/env--helper.c:23 +#: builtin/config.c:104 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "okänt argument för --type, %s" -#: builtin/config.c:115 +#: builtin/config.c:116 msgid "only one type at a time" msgstr "endast en typ åt gången" -#: builtin/config.c:124 +#: builtin/config.c:125 msgid "Config file location" msgstr "Konfigurationsfilens plats" -#: builtin/config.c:125 +#: builtin/config.c:126 msgid "use global config file" msgstr "använd global konfigurationsfil" -#: builtin/config.c:126 +#: builtin/config.c:127 msgid "use system config file" msgstr "använd systemets konfigurationsfil" -#: builtin/config.c:127 +#: builtin/config.c:128 msgid "use repository config file" msgstr "använd arkivets konfigurationsfil" -#: builtin/config.c:128 +#: builtin/config.c:129 msgid "use per-worktree config file" msgstr "använd arbetskatalogens konfigurationsfil" -#: builtin/config.c:129 +#: builtin/config.c:130 msgid "use given config file" msgstr "använd angiven konfigurationsfil" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "read config from given blob object" msgstr "läs konfiguration från givet blob-objekt" -#: builtin/config.c:131 +#: builtin/config.c:132 msgid "Action" msgstr "Åtgärd" -#: builtin/config.c:132 +#: builtin/config.c:133 msgid "get value: name [value-regex]" msgstr "hämta värde: namn [värde-reguttr]" -#: builtin/config.c:133 +#: builtin/config.c:134 msgid "get all values: key [value-regex]" msgstr "hämta alla värden: nyckel [värde-reguttr]" -#: builtin/config.c:134 +#: builtin/config.c:135 msgid "get values for regexp: name-regex [value-regex]" msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]" -#: builtin/config.c:135 +#: builtin/config.c:136 msgid "get value specific for the URL: section[.var] URL" msgstr "hämta värde specifikt URL:en: sektion[.var] URL" -#: builtin/config.c:136 +#: builtin/config.c:137 msgid "replace all matching variables: name value [value_regex]" msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]" -#: builtin/config.c:137 +#: builtin/config.c:138 msgid "add a new variable: name value" msgstr "lägg till en ny variabel: namn värde" -#: builtin/config.c:138 +#: builtin/config.c:139 msgid "remove a variable: name [value-regex]" msgstr "ta bort en variabel: namn [värde-reguttr]" -#: builtin/config.c:139 +#: builtin/config.c:140 msgid "remove all matches: name [value-regex]" msgstr "ta bort alla träffar: namn [värde-reguttr]" -#: builtin/config.c:140 +#: builtin/config.c:141 msgid "rename section: old-name new-name" msgstr "byt namn på sektion: gammalt-namn nytt-namn" -#: builtin/config.c:141 +#: builtin/config.c:142 msgid "remove a section: name" msgstr "ta bort en sektion: namn" -#: builtin/config.c:142 +#: builtin/config.c:143 msgid "list all" msgstr "visa alla" -#: builtin/config.c:143 +#: builtin/config.c:144 msgid "open an editor" msgstr "öppna textredigeringsprogram" -#: builtin/config.c:144 +#: builtin/config.c:145 msgid "find the color configured: slot [default]" msgstr "hitta den inställda färgen: slot [default]" -#: builtin/config.c:145 +#: builtin/config.c:146 msgid "find the color setting: slot [stdout-is-tty]" msgstr "hitta färginställningen: slot [stdout-is-tty]" -#: builtin/config.c:146 +#: builtin/config.c:147 msgid "Type" msgstr "Typ" -#: builtin/config.c:147 builtin/env--helper.c:38 +#: builtin/config.c:148 builtin/env--helper.c:38 msgid "value is given this type" msgstr "värdet har givits denna typ" -#: builtin/config.c:148 +#: builtin/config.c:149 msgid "value is \"true\" or \"false\"" msgstr "värdet är \"true\" eller \"false\"" -#: builtin/config.c:149 +#: builtin/config.c:150 msgid "value is decimal number" msgstr "värdet är ett decimalt tal" -#: builtin/config.c:150 +#: builtin/config.c:151 msgid "value is --bool or --int" msgstr "värdet är --bool eller --int" -#: builtin/config.c:151 +#: builtin/config.c:152 msgid "value is a path (file or directory name)" msgstr "värdet är en sökväg (fil- eller katalognamn)" -#: builtin/config.c:152 +#: builtin/config.c:153 msgid "value is an expiry date" msgstr "värdet är ett utgångsdatum" -#: builtin/config.c:153 +#: builtin/config.c:154 msgid "Other" msgstr "Andra" -#: builtin/config.c:154 +#: builtin/config.c:155 msgid "terminate values with NUL byte" msgstr "terminera värden med NUL-byte" -#: builtin/config.c:155 +#: builtin/config.c:156 msgid "show variable names only" msgstr "visa endast variabelnamn" -#: builtin/config.c:156 +#: builtin/config.c:157 msgid "respect include directives on lookup" msgstr "respektera inkluderingsdirektiv vid uppslag" -#: builtin/config.c:157 +#: builtin/config.c:158 msgid "show origin of config (file, standard input, blob, command line)" msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)" -#: builtin/config.c:158 builtin/env--helper.c:40 +#: builtin/config.c:159 +msgid "show scope of config (worktree, local, global, system, command)" +msgstr "" +"visa omfång för konfiguration (arbetskatalog, lokalt, globalt, system, " +"kommando)" + +#: builtin/config.c:160 builtin/env--helper.c:40 msgid "value" msgstr "värde" -#: builtin/config.c:158 +#: builtin/config.c:160 msgid "with --get, use default value when missing entry" msgstr "med --get, använd standardvärde vid saknad post" -#: builtin/config.c:172 +#: builtin/config.c:174 #, c-format msgid "wrong number of arguments, should be %d" msgstr "fel antal argument, skulle vara %d" -#: builtin/config.c:174 +#: builtin/config.c:176 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "fel antal argument, skulle vara från %d till %d" -#: builtin/config.c:308 +#: builtin/config.c:324 #, c-format msgid "invalid key pattern: %s" msgstr "felaktigt nyckelmönster: %s" -#: builtin/config.c:344 +#: builtin/config.c:360 #, c-format msgid "failed to format default config value: %s" msgstr "misslyckades formatera standardkonfigurationsvärde: %s" -#: builtin/config.c:401 +#: builtin/config.c:417 #, c-format msgid "cannot parse color '%s'" msgstr "kan inte tolka färgen \"%s\"" -#: builtin/config.c:443 +#: builtin/config.c:459 msgid "unable to parse default color value" msgstr "kan inte tolka standardfärgvärde" -#: builtin/config.c:496 builtin/config.c:742 +#: builtin/config.c:512 builtin/config.c:768 msgid "not in a git directory" msgstr "inte i en git-katalog" -#: builtin/config.c:499 +#: builtin/config.c:515 msgid "writing to stdin is not supported" msgstr "skriva till standard in stöds inte" -#: builtin/config.c:502 +#: builtin/config.c:518 msgid "writing config blobs is not supported" msgstr "skriva konfigurations-blobbar stöds inte" -#: builtin/config.c:587 +#: builtin/config.c:603 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -12676,23 +13077,23 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:627 msgid "only one config file at a time" msgstr "endast en konfigurationsfil åt gången" -#: builtin/config.c:616 +#: builtin/config.c:632 msgid "--local can only be used inside a git repository" msgstr "--local kan bara användas inuti ett git-arkiv" -#: builtin/config.c:619 +#: builtin/config.c:635 msgid "--blob can only be used inside a git repository" msgstr "--blob kan bara användas inuti ett git-arkiv" -#: builtin/config.c:638 +#: builtin/config.c:655 msgid "$HOME not set" msgstr "$HOME inte satt" -#: builtin/config.c:658 +#: builtin/config.c:679 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -12702,52 +13103,52 @@ msgstr "" "konfigurationsutöknignen worktreeConfig har aktiverats. Läsa stycket\n" "\"KONFIGURATIONSFIL\" i \"git help worktree\" för detaljer" -#: builtin/config.c:688 +#: builtin/config.c:714 msgid "--get-color and variable type are incoherent" msgstr "--get-color och variabeltyp stämmer inte överens" -#: builtin/config.c:693 +#: builtin/config.c:719 msgid "only one action at a time" msgstr "endast en åtgärd åt gången" -#: builtin/config.c:706 +#: builtin/config.c:732 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only gäller bara för --list eller --get-regexp" -#: builtin/config.c:712 +#: builtin/config.c:738 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "" "--show-origin gäller bara för --get, --get-all, --get-regexp och --list" -#: builtin/config.c:718 +#: builtin/config.c:744 msgid "--default is only applicable to --get" msgstr "--default gäller bara för --get" -#: builtin/config.c:731 +#: builtin/config.c:757 #, c-format msgid "unable to read config file '%s'" msgstr "kan inte konfigurationsfil \"%s\"" -#: builtin/config.c:734 +#: builtin/config.c:760 msgid "error processing config file(s)" msgstr "fel vid hantering av konfigurationsfil(er)" -#: builtin/config.c:744 +#: builtin/config.c:770 msgid "editing stdin is not supported" msgstr "redigering av standard in stöds ej" -#: builtin/config.c:746 +#: builtin/config.c:772 msgid "editing blobs is not supported" msgstr "redigering av blobbar stöds ej" -#: builtin/config.c:760 +#: builtin/config.c:786 #, c-format msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%s\"" -#: builtin/config.c:773 +#: builtin/config.c:799 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -12756,7 +13157,7 @@ msgstr "" "kan inte skriva över flera värden med ett ensamt värde\n" " Använd en regexp, --add eller --replace-all för att ändra %s." -#: builtin/config.c:847 builtin/config.c:858 +#: builtin/config.c:873 builtin/config.c:884 #, c-format msgid "no such section: %s" msgstr "ingen sådan sektion: %s" @@ -12815,12 +13216,12 @@ msgid "No exact match on refs or tags, searching to describe\n" msgstr "" "Ingen exakt träff mot referenser eller taggar, söker för att beskriva\n" -#: builtin/describe.c:381 +#: builtin/describe.c:394 #, c-format msgid "finished search at %s\n" msgstr "avslutade sökning på %s\n" -#: builtin/describe.c:407 +#: builtin/describe.c:421 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12829,7 +13230,7 @@ msgstr "" "Inga annoterade taggar kan beskriva \"%s\".\n" "Det finns dock oannoterade taggar: testa --tags." -#: builtin/describe.c:411 +#: builtin/describe.c:425 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12838,12 +13239,12 @@ msgstr "" "Inga taggar kan beskriva \"%s\".\n" "Testa --always, eller skapa några taggar." -#: builtin/describe.c:441 +#: builtin/describe.c:455 #, c-format msgid "traversed %lu commits\n" msgstr "traverserade %lu incheckningar\n" -#: builtin/describe.c:444 +#: builtin/describe.c:458 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12852,90 +13253,90 @@ msgstr "" "mer än %i taggar hittades; listar de %i senaste\n" "gav upp sökningen vid %s\n" -#: builtin/describe.c:512 +#: builtin/describe.c:526 #, c-format msgid "describe %s\n" msgstr "beskriva %s\n" -#: builtin/describe.c:515 +#: builtin/describe.c:529 #, c-format msgid "Not a valid object name %s" msgstr "Objektnamnet är inte giltigt: %s" -#: builtin/describe.c:523 +#: builtin/describe.c:537 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s är varken incheckning eller blob" -#: builtin/describe.c:537 +#: builtin/describe.c:551 msgid "find the tag that comes after the commit" msgstr "hitta taggen som kommer efter incheckningen" -#: builtin/describe.c:538 +#: builtin/describe.c:552 msgid "debug search strategy on stderr" msgstr "felsök sökstrategin på standard fel" -#: builtin/describe.c:539 +#: builtin/describe.c:553 msgid "use any ref" msgstr "använd alla referenser" -#: builtin/describe.c:540 +#: builtin/describe.c:554 msgid "use any tag, even unannotated" msgstr "använd alla taggar, även oannoterade" -#: builtin/describe.c:541 +#: builtin/describe.c:555 msgid "always use long format" msgstr "använd alltid långt format" -#: builtin/describe.c:542 +#: builtin/describe.c:556 msgid "only follow first parent" msgstr "följ endast första föräldern" -#: builtin/describe.c:545 +#: builtin/describe.c:559 msgid "only output exact matches" msgstr "skriv endast ut exakta träffar" -#: builtin/describe.c:547 +#: builtin/describe.c:561 msgid "consider most recent tags (default: 10)" msgstr "överväg de nyaste taggarna (standard: 10)" -#: builtin/describe.c:549 +#: builtin/describe.c:563 msgid "only consider tags matching " msgstr "överväg endast taggar som motsvarar " -#: builtin/describe.c:551 +#: builtin/describe.c:565 msgid "do not consider tags matching " msgstr "överväg inte taggar som motsvarar " -#: builtin/describe.c:553 builtin/name-rev.c:473 +#: builtin/describe.c:567 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" -#: builtin/describe.c:554 builtin/describe.c:557 +#: builtin/describe.c:568 builtin/describe.c:571 msgid "mark" msgstr "märke" -#: builtin/describe.c:555 +#: builtin/describe.c:569 msgid "append on dirty working tree (default: \"-dirty\")" msgstr "lägg till på lortigt arbetsträd (standard: \"-dirty\")" -#: builtin/describe.c:558 +#: builtin/describe.c:572 msgid "append on broken working tree (default: \"-broken\")" msgstr "lägg till på trasigt arbetsträd (standard: \"-broken\")" -#: builtin/describe.c:576 +#: builtin/describe.c:590 msgid "--long is incompatible with --abbrev=0" msgstr "--long är inkompatibel med --abbrev=0" -#: builtin/describe.c:605 +#: builtin/describe.c:619 msgid "No names found, cannot describe anything." msgstr "Inga namn hittades, kan inte beskriva något." -#: builtin/describe.c:656 +#: builtin/describe.c:670 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden" -#: builtin/describe.c:658 +#: builtin/describe.c:672 msgid "--broken is incompatible with commit-ishes" msgstr "--broken är inkompatibelt med \"commit-ish\"-värden" @@ -13119,7 +13520,7 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-flaggor]" -#: builtin/fast-export.c:852 +#: builtin/fast-export.c:853 msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "Fel: Kan inte exportera nästlade taggar såvida inte --mark-tags anges." @@ -13215,19 +13616,19 @@ msgstr "git fetch --all []" msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel kan inte vara negativt" -#: builtin/fetch.c:139 builtin/pull.c:204 +#: builtin/fetch.c:139 builtin/pull.c:184 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:141 builtin/pull.c:248 +#: builtin/fetch.c:141 builtin/pull.c:228 msgid "set upstream for git pull/fetch" msgstr "ställ in uppström för git pull/fetch" -#: builtin/fetch.c:143 builtin/pull.c:207 +#: builtin/fetch.c:143 builtin/pull.c:187 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:145 builtin/pull.c:210 +#: builtin/fetch.c:145 builtin/pull.c:190 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" @@ -13239,7 +13640,7 @@ msgstr "tvinga överskrivning av lokal referens" msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:150 builtin/pull.c:214 +#: builtin/fetch.c:150 builtin/pull.c:194 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" @@ -13251,7 +13652,7 @@ msgstr "hämta inte alla taggar (--no-tags)" msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:156 builtin/pull.c:217 +#: builtin/fetch.c:156 builtin/pull.c:197 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" @@ -13260,7 +13661,7 @@ msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "rensa lokala taggar inte längre på fjärren och skriv över ändrade taggar" -#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:141 +#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 msgid "on-demand" msgstr "on-demand" @@ -13268,7 +13669,7 @@ msgstr "on-demand" msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:164 builtin/pull.c:225 +#: builtin/fetch.c:164 builtin/pull.c:205 msgid "keep downloaded pack" msgstr "behåll hämtade paket" @@ -13276,7 +13677,7 @@ msgstr "behåll hämtade paket" msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:228 +#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" @@ -13284,7 +13685,7 @@ msgstr "fördjupa historik för grund klon" msgid "deepen history of shallow repository based on time" msgstr "fördjupa historik för grund klon baserad på tid" -#: builtin/fetch.c:177 builtin/pull.c:231 +#: builtin/fetch.c:177 builtin/pull.c:211 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" @@ -13300,15 +13701,15 @@ msgstr "" "standard för rekursiv hämtning av undermoduler (lägre prioritet än " "konfigurationsfiler)" -#: builtin/fetch.c:187 builtin/pull.c:234 +#: builtin/fetch.c:187 builtin/pull.c:214 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:188 builtin/pull.c:236 +#: builtin/fetch.c:188 builtin/pull.c:216 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:189 builtin/pull.c:237 +#: builtin/fetch.c:189 builtin/pull.c:217 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" @@ -13320,7 +13721,7 @@ msgstr "rapportera att vi bara har objekt nåbara från detta objektet" msgid "run 'gc --auto' after fetching" msgstr "kör \"gc --auto\" efter hämtning" -#: builtin/fetch.c:201 builtin/pull.c:246 +#: builtin/fetch.c:201 builtin/pull.c:226 msgid "check for forced-updates on all updated branches" msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar" @@ -13411,22 +13812,22 @@ msgstr "" "showForcedUpdates\n" "false\" för att undvika testet.\n" -#: builtin/fetch.c:911 +#: builtin/fetch.c:920 #, 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:932 +#: builtin/fetch.c:941 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "avvisa %s då grunda rötter inte kan uppdateras" -#: builtin/fetch.c:1017 builtin/fetch.c:1155 +#: builtin/fetch.c:1026 builtin/fetch.c:1164 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:1028 +#: builtin/fetch.c:1037 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13435,56 +13836,56 @@ msgstr "" "vissa lokala referenser kunde inte uppdateras; testa att köra\n" " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt" -#: builtin/fetch.c:1125 +#: builtin/fetch.c:1134 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:1126 +#: builtin/fetch.c:1135 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1167 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:1159 builtin/remote.c:1035 +#: builtin/fetch.c:1168 builtin/remote.c:1112 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:1182 +#: builtin/fetch.c:1191 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv" -#: builtin/fetch.c:1201 +#: builtin/fetch.c:1210 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s" -#: builtin/fetch.c:1204 +#: builtin/fetch.c:1213 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1412 +#: builtin/fetch.c:1421 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream" -#: builtin/fetch.c:1427 +#: builtin/fetch.c:1436 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:1429 +#: builtin/fetch.c:1438 msgid "not setting upstream for a remote tag" msgstr "ställer inte in uppström för en fjärrtag" -#: builtin/fetch.c:1431 +#: builtin/fetch.c:1440 msgid "unknown branch type" msgstr "okänd grentyp" -#: builtin/fetch.c:1433 +#: builtin/fetch.c:1442 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -13492,22 +13893,22 @@ msgstr "" "hittade ingen källgren.\n" "du måste ange exakt en gren med flaggan --set-upstream." -#: builtin/fetch.c:1559 builtin/fetch.c:1622 +#: builtin/fetch.c:1568 builtin/fetch.c:1631 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1569 builtin/fetch.c:1624 builtin/remote.c:100 +#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1581 +#: builtin/fetch.c:1590 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "kunde inte hämta \"%s\" (felkod: %d)\n" -#: builtin/fetch.c:1684 +#: builtin/fetch.c:1693 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -13515,44 +13916,44 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar skall hämtas från." -#: builtin/fetch.c:1721 +#: builtin/fetch.c:1730 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1771 +#: builtin/fetch.c:1780 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1773 +#: builtin/fetch.c:1782 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1778 +#: builtin/fetch.c:1787 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1789 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1796 +#: builtin/fetch.c:1805 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1798 +#: builtin/fetch.c:1807 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1807 +#: builtin/fetch.c:1816 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1814 +#: builtin/fetch.c:1823 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:1832 +#: builtin/fetch.c:1841 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13566,23 +13967,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:671 msgid "populate log with at most entries from shortlog" msgstr "fyll i loggen med som mest poster från shortlog" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:674 msgid "alias for --log (deprecated)" msgstr "alias för --log (avråds)" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:677 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:681 +#: builtin/fmt-merge-msg.c:678 msgid "use as start of message" msgstr "inled meddelande med " -#: builtin/fmt-merge-msg.c:682 +#: builtin/fmt-merge-msg.c:679 msgid "file to read from" msgstr "fil att läsa från" @@ -13793,7 +14194,7 @@ msgstr "Kontrollerar objektkataloger" msgid "Checking %s link" msgstr "Kontrollerar %s-länk" -#: builtin/fsck.c:695 builtin/index-pack.c:842 +#: builtin/fsck.c:695 builtin/index-pack.c:843 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" @@ -13993,7 +14394,7 @@ msgstr "" "Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort " "dem." -#: builtin/grep.c:29 +#: builtin/grep.c:30 msgid "git grep [] [-e] [...] [[--] ...]" msgstr "git grep [] [-e] [...] [[--] ...]" @@ -14011,258 +14412,258 @@ msgstr "felaktigt antal trådar angivet (%d) för %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2708 +#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 +#: builtin/pack-objects.c:2854 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635 +#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:650 +#: builtin/grep.c:633 #, c-format msgid "unable to grep from object of type %s" msgstr "kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:716 +#: builtin/grep.c:704 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:815 +#: builtin/grep.c:803 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:817 +#: builtin/grep.c:805 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:819 +#: builtin/grep.c:807 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:821 +#: builtin/grep.c:809 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:823 +#: builtin/grep.c:811 msgid "recursively search in each submodule" msgstr "sök varje undermodul rekursivt" -#: builtin/grep.c:826 +#: builtin/grep.c:814 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:828 +#: builtin/grep.c:816 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:830 +#: builtin/grep.c:818 msgid "match patterns only at word boundaries" msgstr "matcha endast mönster vid ordgränser" -#: builtin/grep.c:832 +#: builtin/grep.c:820 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:834 +#: builtin/grep.c:822 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:837 +#: builtin/grep.c:825 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:839 +#: builtin/grep.c:827 msgid "search in subdirectories (default)" msgstr "sök i underkataloger (standard)" -#: builtin/grep.c:841 +#: builtin/grep.c:829 msgid "descend at most levels" msgstr "gå som mest ned nivåer" -#: builtin/grep.c:845 +#: builtin/grep.c:833 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:848 +#: builtin/grep.c:836 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:851 +#: builtin/grep.c:839 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:854 +#: builtin/grep.c:842 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:857 +#: builtin/grep.c:845 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:858 +#: builtin/grep.c:846 msgid "show column number of first match" msgstr "visa kolumnnummer för första träff" -#: builtin/grep.c:859 +#: builtin/grep.c:847 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:860 +#: builtin/grep.c:848 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:862 +#: builtin/grep.c:850 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:864 +#: builtin/grep.c:852 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:866 +#: builtin/grep.c:854 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:869 +#: builtin/grep.c:857 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:871 +#: builtin/grep.c:859 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:874 +#: builtin/grep.c:862 msgid "show only matching parts of a line" msgstr "visa endast träffade delar av rader" -#: builtin/grep.c:876 +#: builtin/grep.c:864 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:877 +#: builtin/grep.c:865 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:879 +#: builtin/grep.c:867 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:881 +#: builtin/grep.c:869 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:884 +#: builtin/grep.c:872 msgid "show context lines before and after matches" msgstr "visa rader sammanhang före och efter träffar" -#: builtin/grep.c:887 +#: builtin/grep.c:875 msgid "show context lines before matches" msgstr "visa rader sammanhang före träffar" -#: builtin/grep.c:889 +#: builtin/grep.c:877 msgid "show context lines after matches" msgstr "visa rader sammanhang efter träffar" -#: builtin/grep.c:891 +#: builtin/grep.c:879 msgid "use worker threads" msgstr "använd jobbtrådar" -#: builtin/grep.c:892 +#: builtin/grep.c:880 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:895 +#: builtin/grep.c:883 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:897 +#: builtin/grep.c:885 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:900 +#: builtin/grep.c:888 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:902 +#: builtin/grep.c:890 msgid "match " msgstr "träffa " -#: builtin/grep.c:904 +#: builtin/grep.c:892 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:916 +#: builtin/grep.c:904 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:918 +#: builtin/grep.c:906 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:920 +#: builtin/grep.c:908 msgid "show parse tree for grep expression" msgstr "visa analysträd för grep-uttryck" -#: builtin/grep.c:924 +#: builtin/grep.c:912 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:924 +#: builtin/grep.c:912 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:928 +#: builtin/grep.c:916 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:992 +#: builtin/grep.c:983 msgid "no pattern given" msgstr "inget mönster angavs" -#: builtin/grep.c:1028 +#: builtin/grep.c:1019 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index och --untracked kan inte användas med revisioner" -#: builtin/grep.c:1036 +#: builtin/grep.c:1027 #, c-format msgid "unable to resolve revision: %s" msgstr "kan inte slå upp revision: %s" -#: builtin/grep.c:1067 +#: builtin/grep.c:1057 +msgid "--untracked not supported with --recurse-submodules" +msgstr "--untracked stöds inte med --recurse-submodules" + +#: builtin/grep.c:1061 msgid "invalid option combination, ignoring --threads" msgstr "ogiltig kombination av flaggor, ignorerar --threads" -#: builtin/grep.c:1070 builtin/pack-objects.c:3400 +#: builtin/grep.c:1064 builtin/pack-objects.c:3547 msgid "no threads support, ignoring --threads" msgstr "trådstöd saknas, ignorerar --threads" -#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705 +#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:1096 +#: builtin/grep.c:1101 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1119 -msgid "option not supported with --recurse-submodules" -msgstr "flaggan stöds inte med --recurse-submodules" - -#: builtin/grep.c:1125 +#: builtin/grep.c:1127 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached och --untracked kan inte användas med --no-index" -#: builtin/grep.c:1131 +#: builtin/grep.c:1133 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:1139 +#: builtin/grep.c:1141 msgid "both --cached and trees are given" msgstr "både --cached och träd angavs" @@ -14447,7 +14848,7 @@ msgstr "indataläsfel" msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:288 builtin/pack-objects.c:604 +#: builtin/index-pack.c:288 builtin/pack-objects.c:606 msgid "pack too large for current definition of off_t" msgstr "paket för stort för nuvarande definition av off_t" @@ -14507,191 +14908,191 @@ msgstr[1] "för tidigt slut på paketfilen, % byte saknas" msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 -#: builtin/index-pack.c:803 builtin/index-pack.c:812 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 +#: builtin/index-pack.c:804 builtin/index-pack.c:813 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:157 -#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 +#: builtin/index-pack.c:738 builtin/pack-objects.c:158 +#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:802 #, c-format msgid "cannot read existing object info %s" msgstr "kan inte läsa information om befintligt objekt %s" -#: builtin/index-pack.c:809 +#: builtin/index-pack.c:810 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:824 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:826 builtin/index-pack.c:845 +#: builtin/index-pack.c:827 builtin/index-pack.c:846 msgid "fsck error in packed object" msgstr "fsck-fel i packat objekt" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:848 #, 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:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:920 builtin/index-pack.c:951 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1198 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481 +#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1249 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1255 #, 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:1264 +#: builtin/index-pack.c:1267 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1271 #, 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:1292 +#: builtin/index-pack.c:1295 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1392 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1406 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1431 #, c-format msgid "cannot write %s file '%s'" msgstr "kan inte ta skriva %s-fil \"%s\"" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1439 #, c-format msgid "cannot close written %s file '%s'" msgstr "kan inte stänga skriven %s-fil \"%s\"" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1463 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1477 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1485 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716 +#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 #, c-format msgid "bad pack.indexversion=%" msgstr "felaktig pack.indexversion=%" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1597 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1595 +#: builtin/index-pack.c:1599 #, 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:1643 +#: builtin/index-pack.c:1647 #, 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:1650 +#: builtin/index-pack.c:1654 #, 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:1689 +#: builtin/index-pack.c:1693 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 +#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1781 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1779 +#: builtin/index-pack.c:1783 msgid "--stdin requires a git repository" msgstr "--stdin kräver ett git-arkiv" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1789 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:581 +#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "fsck-fel i packat objekt" @@ -15395,7 +15796,7 @@ msgstr "" msgid "do not print remote URL" msgstr "visa inte fjärr-URL" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1518 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 msgid "exec" msgstr "exec" @@ -15480,180 +15881,180 @@ msgstr "git merge --abort" msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:118 +#: builtin/merge.c:119 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, c-format msgid "option `%s' requires a value" msgstr "flaggan \"%s\" behöver ett värde" -#: builtin/merge.c:187 +#: builtin/merge.c:188 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:188 +#: builtin/merge.c:189 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:193 +#: builtin/merge.c:194 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:244 builtin/pull.c:152 +#: builtin/merge.c:245 builtin/pull.c:132 msgid "do not show a diffstat at the end of the merge" msgstr "visa inte en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:247 builtin/pull.c:155 +#: builtin/merge.c:248 builtin/pull.c:135 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:248 builtin/pull.c:158 +#: builtin/merge.c:249 builtin/pull.c:138 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:250 builtin/pull.c:161 +#: builtin/merge.c:251 builtin/pull.c:141 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" "lägg till (som mest ) poster från shortlog till incheckningsmeddelandet" -#: builtin/merge.c:253 builtin/pull.c:167 +#: builtin/merge.c:254 builtin/pull.c:147 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:255 builtin/pull.c:170 +#: builtin/merge.c:256 builtin/pull.c:150 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:257 builtin/pull.c:173 +#: builtin/merge.c:258 builtin/pull.c:153 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:259 +#: builtin/merge.c:260 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:261 builtin/pull.c:180 +#: builtin/merge.c:262 builtin/pull.c:160 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:265 builtin/pull.c:183 +#: builtin/merge.c:266 builtin/pull.c:163 msgid "verify that the named commit has a valid GPG signature" msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur" -#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187 -#: builtin/rebase.c:512 builtin/rebase.c:1531 builtin/revert.c:114 +#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 +#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:267 builtin/pull.c:188 +#: builtin/merge.c:268 builtin/pull.c:168 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:268 builtin/pull.c:191 +#: builtin/merge.c:269 builtin/pull.c:171 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:269 builtin/pull.c:192 +#: builtin/merge.c:270 builtin/pull.c:172 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:271 +#: builtin/merge.c:272 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:278 +#: builtin/merge.c:279 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:280 +#: builtin/merge.c:281 msgid "--abort but leave index and working tree alone" msgstr "--abort men lämna index och arbetskatalog ensamma" -#: builtin/merge.c:282 +#: builtin/merge.c:283 msgid "continue the current in-progress merge" msgstr "fortsätt den pågående sammanslagningen" -#: builtin/merge.c:284 builtin/pull.c:199 +#: builtin/merge.c:285 builtin/pull.c:179 msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" -#: builtin/merge.c:290 +#: builtin/merge.c:291 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "förbigå pre-merge-commit- och commit-msg-krokar" -#: builtin/merge.c:307 +#: builtin/merge.c:308 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:312 +#: builtin/merge.c:313 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:317 +#: builtin/merge.c:318 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:339 builtin/merge.c:356 +#: builtin/merge.c:340 builtin/merge.c:357 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:386 +#: builtin/merge.c:387 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:397 +#: builtin/merge.c:398 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:447 +#: builtin/merge.c:448 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:498 +#: builtin/merge.c:499 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:585 +#: builtin/merge.c:586 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:705 +#: builtin/merge.c:708 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:719 +#: builtin/merge.c:722 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:734 +#: builtin/merge.c:737 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:786 +#: builtin/merge.c:789 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:795 +#: builtin/merge.c:798 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra " "den.\n" -#: builtin/merge.c:801 +#: builtin/merge.c:804 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -15664,11 +16065,11 @@ msgstr "" "temagren.\n" "\n" -#: builtin/merge.c:806 +#: builtin/merge.c:809 msgid "An empty message aborts the commit.\n" msgstr "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/merge.c:809 +#: builtin/merge.c:812 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -15677,73 +16078,73 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:862 +#: builtin/merge.c:865 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:877 +#: builtin/merge.c:880 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:938 +#: builtin/merge.c:941 #, 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:977 +#: builtin/merge.c:980 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:979 +#: builtin/merge.c:982 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:981 +#: builtin/merge.c:984 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:986 +#: builtin/merge.c:989 #, 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:1043 +#: builtin/merge.c:1046 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1146 +#: builtin/merge.c:1149 #, 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:1180 +#: builtin/merge.c:1183 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1283 +#: builtin/merge.c:1286 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1287 +#: builtin/merge.c:1290 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1296 +#: builtin/merge.c:1299 msgid "--quit expects no arguments" msgstr "--quit tar inga argument" -#: builtin/merge.c:1309 +#: builtin/merge.c:1312 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1313 +#: builtin/merge.c:1316 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1329 +#: builtin/merge.c:1332 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15751,7 +16152,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1336 +#: builtin/merge.c:1339 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15759,96 +16160,96 @@ msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1339 +#: builtin/merge.c:1342 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:1353 +#: builtin/merge.c:1356 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1355 +#: builtin/merge.c:1358 msgid "You cannot combine --squash with --commit." msgstr "Du kan inte kombinera --squash med --commit." -#: builtin/merge.c:1371 +#: builtin/merge.c:1374 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1388 +#: builtin/merge.c:1391 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1390 +#: builtin/merge.c:1393 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:1395 +#: builtin/merge.c:1398 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1397 +#: builtin/merge.c:1400 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:1476 +#: builtin/merge.c:1481 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1485 +#: builtin/merge.c:1490 msgid "Already up to date." msgstr "Redan à jour." -#: builtin/merge.c:1495 +#: builtin/merge.c:1500 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1537 +#: builtin/merge.c:1542 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1544 +#: builtin/merge.c:1549 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1569 +#: builtin/merge.c:1574 msgid "Already up to date. Yeeah!" msgstr "Redan à jour. Toppen!" -#: builtin/merge.c:1575 +#: builtin/merge.c:1580 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1598 builtin/merge.c:1663 +#: builtin/merge.c:1603 builtin/merge.c:1668 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1602 +#: builtin/merge.c:1607 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1654 +#: builtin/merge.c:1659 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1656 +#: builtin/merge.c:1661 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1665 +#: builtin/merge.c:1670 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Använder %s för att förbereda lösning för hand.\n" -#: builtin/merge.c:1677 +#: builtin/merge.c:1682 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -16102,52 +16503,52 @@ msgstr "%s, källa=%s, mål=%s" msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:277 builtin/remote.c:716 builtin/repack.c:518 +#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" -#: builtin/name-rev.c:403 +#: builtin/name-rev.c:465 msgid "git name-rev [] ..." msgstr "git name-rev [] ..." -#: builtin/name-rev.c:404 +#: builtin/name-rev.c:466 msgid "git name-rev [] --all" msgstr "git name-rev [] --all" -#: builtin/name-rev.c:405 +#: builtin/name-rev.c:467 msgid "git name-rev [] --stdin" msgstr "git name-rev [] --stdin" -#: builtin/name-rev.c:462 +#: builtin/name-rev.c:524 msgid "print only names (no SHA-1)" msgstr "skriv endast namn (ingen SHA-1)" -#: builtin/name-rev.c:463 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "använd endast taggar för att namnge incheckningar" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:527 msgid "only use refs matching " msgstr "använd endast referenser som motsvarar " -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:529 msgid "ignore refs matching " msgstr "ignorera referenser som motsvarar " -#: builtin/name-rev.c:469 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "lista alla incheckningar som kan nås alla referenser" -#: builtin/name-rev.c:470 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "läs från standard in" -#: builtin/name-rev.c:471 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "tillåt att skriva \"odefinierade\" namn (standard)" -#: builtin/name-rev.c:477 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" @@ -16562,7 +16963,7 @@ msgstr "anteckningar-ref" msgid "use notes from " msgstr "använd anteckningar från " -#: builtin/notes.c:1034 builtin/stash.c:1607 +#: builtin/notes.c:1034 builtin/stash.c:1610 #, c-format msgid "unknown subcommand: %s" msgstr "okänt underkommando: %s" @@ -16579,125 +16980,102 @@ msgid "" msgstr "" "git pack-objects [...] [< | < ]" -#: builtin/pack-objects.c:428 +#: builtin/pack-objects.c:430 #, c-format msgid "bad packed object CRC for %s" msgstr "felaktig CRC för packat objekt %s" -#: builtin/pack-objects.c:439 +#: builtin/pack-objects.c:441 #, c-format msgid "corrupt packed object for %s" msgstr "trasigt packat objekt för %s" -#: builtin/pack-objects.c:570 +#: builtin/pack-objects.c:572 #, c-format msgid "recursive delta detected for object %s" msgstr "rekursivt delta upptäcktes för objektet %s" -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:783 #, c-format msgid "ordered %u objects, expected %" msgstr "ordnade %u objekt, förväntade %" -#: builtin/pack-objects.c:794 -#, c-format -msgid "packfile is invalid: %s" -msgstr "packfil är ogiltig: %s" - -#: builtin/pack-objects.c:798 -#, c-format -msgid "unable to open packfile for reuse: %s" -msgstr "kan inte öppna packfil för återanvändning: %s" - -#: builtin/pack-objects.c:802 -msgid "unable to seek in reused packfile" -msgstr "kan inte söka i återanvänd packfil" - -#: builtin/pack-objects.c:813 -msgid "unable to read from reused packfile" -msgstr "kan inte läsa från återanvänd packfil" - -#: builtin/pack-objects.c:841 +#: builtin/pack-objects.c:972 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:854 +#: builtin/pack-objects.c:985 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:917 builtin/update-index.c:90 +#: builtin/pack-objects.c:1046 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "misslyckades ta status på %s" -#: builtin/pack-objects.c:970 +#: builtin/pack-objects.c:1099 #, c-format msgid "wrote % objects while expecting %" msgstr "skrev % objekt medan % förväntades" -#: builtin/pack-objects.c:1164 +#: builtin/pack-objects.c:1297 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:1592 +#: builtin/pack-objects.c:1724 #, 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:1601 +#: builtin/pack-objects.c:1733 #, 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:1870 +#: builtin/pack-objects.c:2004 msgid "Counting objects" msgstr "Räknar objekt" -#: builtin/pack-objects.c:2000 -#, c-format -msgid "unable to get size of %s" -msgstr "kan inte hämta storlek på %s" - -#: builtin/pack-objects.c:2015 +#: builtin/pack-objects.c:2149 #, c-format msgid "unable to parse object header of %s" msgstr "kunde inte tolka objekthuvud för %s" -#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101 -#: builtin/pack-objects.c:2111 +#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 +#: builtin/pack-objects.c:2245 #, c-format msgid "object %s cannot be read" msgstr "objektet %s kunde inte läsas" -#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115 +#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 #, c-format msgid "object %s inconsistent object length (% vs %)" msgstr "objektet %s har inkonsistent objektlängd (% mot %)" -#: builtin/pack-objects.c:2125 +#: builtin/pack-objects.c:2259 msgid "suboptimal pack - out of memory" msgstr "icke-optimalt pack - minnet slut" -#: builtin/pack-objects.c:2440 +#: builtin/pack-objects.c:2574 #, c-format msgid "Delta compression using up to %d threads" msgstr "Deltakomprimering använder upp till %d trådar" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2713 #, 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:2659 +#: builtin/pack-objects.c:2801 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2807 msgid "inconsistency with delta count" msgstr "deltaräknaren är inkonsekvent" -#: builtin/pack-objects.c:2742 +#: builtin/pack-objects.c:2888 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -16706,7 +17084,7 @@ msgstr "" "förväntade kant-objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:2748 +#: builtin/pack-objects.c:2894 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -16715,231 +17093,234 @@ msgstr "" "förväntade objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:2846 +#: builtin/pack-objects.c:2992 msgid "invalid value for --missing" msgstr "ogiltigt värde för --missing" -#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013 +#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 msgid "cannot open pack index" msgstr "kan inte öppna paketfilen" -#: builtin/pack-objects.c:2936 +#: builtin/pack-objects.c:3082 #, 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:3021 +#: builtin/pack-objects.c:3167 msgid "unable to force loose object" msgstr "kan inte tvinga lösa objekt" -#: builtin/pack-objects.c:3113 +#: builtin/pack-objects.c:3260 #, c-format msgid "not a rev '%s'" msgstr "inte en referens \"%s\"" -#: builtin/pack-objects.c:3116 +#: builtin/pack-objects.c:3263 #, c-format msgid "bad revision '%s'" msgstr "felaktig revision \"%s\"" -#: builtin/pack-objects.c:3141 +#: builtin/pack-objects.c:3288 msgid "unable to add recent objects" msgstr "kan inte lägga till nya objekt" -#: builtin/pack-objects.c:3194 +#: builtin/pack-objects.c:3341 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:3198 +#: builtin/pack-objects.c:3345 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:3236 +#: builtin/pack-objects.c:3383 msgid "[,]" msgstr "[,]" -#: builtin/pack-objects.c:3237 +#: builtin/pack-objects.c:3384 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:3240 +#: builtin/pack-objects.c:3387 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:3242 +#: builtin/pack-objects.c:3389 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från supplerande objektlager" -#: builtin/pack-objects.c:3244 +#: builtin/pack-objects.c:3391 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:3246 +#: builtin/pack-objects.c:3393 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:3248 +#: builtin/pack-objects.c:3395 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:3250 +#: builtin/pack-objects.c:3397 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:3252 +#: builtin/pack-objects.c:3399 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:3254 +#: builtin/pack-objects.c:3401 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3403 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:3258 +#: builtin/pack-objects.c:3405 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:3260 +#: builtin/pack-objects.c:3407 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3409 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3411 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:3267 +#: builtin/pack-objects.c:3414 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3417 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:3273 +#: builtin/pack-objects.c:3420 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3423 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3425 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:3280 +#: builtin/pack-objects.c:3427 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3429 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3431 msgid "unpack unreachable objects newer than