diff options
Diffstat (limited to 'po/sv.po')
| -rw-r--r-- | po/sv.po | 12413 |
1 files changed, 6648 insertions, 5765 deletions
@@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010-2021 Peter Krefting <peter@softwolves.pp.se> +# Copyright (C) 2010-2022 Peter Krefting <peter@softwolves.pp.se> # This file is distributed under the same license as the Git package. -# Peter Krefting <peter@softwolves.pp.se>, 2010-2021. +# Peter Krefting <peter@softwolves.pp.se>, 2010-2022. # msgid "" msgstr "" -"Project-Id-Version: git 2.32.0\n" +"Project-Id-Version: git 2.34.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-05-17 16:02+0800\n" -"PO-Revision-Date: 2021-05-20 13:31+0100\n" +"POT-Creation-Date: 2022-01-17 08:34+0800\n" +"PO-Revision-Date: 2022-01-11 16:34+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -16,234 +16,235 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 3.30.1\n" +"X-Generator: Gtranslator 3.38.0\n" -#: add-interactive.c:376 +#: add-interactive.c:380 #, c-format msgid "Huh (%s)?" msgstr "Vadå (%s)?" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 -#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528 -#: builtin/rebase.c:1953 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509 +#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233 +#: builtin/rebase.c:1642 msgid "could not read index" msgstr "kunde inte läsa indexet" -#: add-interactive.c:584 git-add--interactive.perl:269 +#: add-interactive.c:588 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "binär" -#: add-interactive.c:642 git-add--interactive.perl:278 +#: add-interactive.c:646 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "ingenting" -#: add-interactive.c:643 git-add--interactive.perl:314 +#: add-interactive.c:647 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "oändrad" -#: add-interactive.c:680 git-add--interactive.perl:641 +#: add-interactive.c:684 git-add--interactive.perl:641 msgid "Update" msgstr "Uppdatera" -#: add-interactive.c:697 add-interactive.c:885 +#: add-interactive.c:701 add-interactive.c:889 #, c-format msgid "could not stage '%s'" msgstr "kunde inte köa \"%s\"" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713 msgid "could not write index" msgstr "kunde inte skriva indexet" -#: add-interactive.c:706 git-add--interactive.perl:626 +#: add-interactive.c:710 git-add--interactive.perl:626 #, c-format, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "uppdaterade %d sökväg\n" msgstr[1] "uppdaterade %d sökvägar\n" -#: add-interactive.c:724 git-add--interactive.perl:676 +#: add-interactive.c:728 git-add--interactive.perl:676 #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "observera: %s spåras inte längre.\n" -#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298 -#: builtin/reset.c:145 +#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306 +#: builtin/reset.c:167 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: add-interactive.c:759 git-add--interactive.perl:653 +#: add-interactive.c:763 git-add--interactive.perl:653 msgid "Revert" msgstr "Återställ" -#: add-interactive.c:775 +#: add-interactive.c:779 msgid "Could not parse HEAD^{tree}" msgstr "kunde inte tolka HEAD^{tree}" -#: add-interactive.c:813 git-add--interactive.perl:629 +#: add-interactive.c:817 git-add--interactive.perl:629 #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "återställde %d sökväg\n" msgstr[1] "återställde %d sökvägar\n" -#: add-interactive.c:864 git-add--interactive.perl:693 +#: add-interactive.c:868 git-add--interactive.perl:693 #, c-format msgid "No untracked files.\n" msgstr "Inga ospårade filer.\n" -#: add-interactive.c:868 git-add--interactive.perl:687 +#: add-interactive.c:872 git-add--interactive.perl:687 msgid "Add untracked" msgstr "Lägg till ospårad" -#: add-interactive.c:895 git-add--interactive.perl:623 +#: add-interactive.c:899 git-add--interactive.perl:623 #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "lade till %d sökväg\n" msgstr[1] "lade till %d sökvägar\n" -#: add-interactive.c:925 +#: add-interactive.c:929 #, c-format msgid "ignoring unmerged: %s" msgstr "ignorerar ej sammanslagen: %s" -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 +#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371 #, c-format msgid "Only binary files changed.\n" msgstr "Endast binära filer ändrade.\n" -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 +#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373 #, c-format msgid "No changes.\n" msgstr "Inga ändringar.\n" -#: add-interactive.c:943 git-add--interactive.perl:1379 +#: add-interactive.c:947 git-add--interactive.perl:1381 msgid "Patch update" msgstr "Uppdatera patch" -#: add-interactive.c:982 git-add--interactive.perl:1792 +#: add-interactive.c:986 git-add--interactive.perl:1794 msgid "Review diff" msgstr "Granska diff" -#: add-interactive.c:1010 +#: add-interactive.c:1014 msgid "show paths with changes" msgstr "visa sökvägar med ändringar" -#: add-interactive.c:1012 +#: add-interactive.c:1016 msgid "add working tree state to the staged set of changes" msgstr "lägg arbetskatalogens tillstånd till köade ändringar" -#: add-interactive.c:1014 +#: add-interactive.c:1018 msgid "revert staged set of changes back to the HEAD version" msgstr "återställ köade ändringar tillbaka till HEAD-versionen" -#: add-interactive.c:1016 +#: add-interactive.c:1020 msgid "pick hunks and update selectively" msgstr "välj stycken och uppdatera selektivt" -#: add-interactive.c:1018 +#: add-interactive.c:1022 msgid "view diff between HEAD and index" msgstr "visa skillnad mellan HEAD och index" -#: add-interactive.c:1020 +#: add-interactive.c:1024 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:1028 add-interactive.c:1077 +#: add-interactive.c:1032 add-interactive.c:1081 msgid "Prompt help:" msgstr "Kommandoradshjälp:" -#: add-interactive.c:1030 +#: add-interactive.c:1034 msgid "select a single item" msgstr "markera en post" -#: add-interactive.c:1032 +#: add-interactive.c:1036 msgid "select a range of items" msgstr "markera intervall av poster" -#: add-interactive.c:1034 +#: add-interactive.c:1038 msgid "select multiple ranges" msgstr "markera flera intervall" -#: add-interactive.c:1036 add-interactive.c:1081 +#: add-interactive.c:1040 add-interactive.c:1085 msgid "select item based on unique prefix" msgstr "markera post baserad på unikt prefix" -#: add-interactive.c:1038 +#: add-interactive.c:1042 msgid "unselect specified items" msgstr "avmarkera angivna poster" -#: add-interactive.c:1040 +#: add-interactive.c:1044 msgid "choose all items" msgstr "välj alla poster" -#: add-interactive.c:1042 +#: add-interactive.c:1046 msgid "(empty) finish selecting" msgstr "(tomt) avsluta markering" -#: add-interactive.c:1079 +#: add-interactive.c:1083 msgid "select a numbered item" msgstr "markera en numrerad post" -#: add-interactive.c:1083 +#: add-interactive.c:1087 msgid "(empty) select nothing" msgstr "(tomt) markera ingenting" -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 +#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 +#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895 msgid "What now" msgstr "Vad nu" -#: add-interactive.c:1144 git-add--interactive.perl:213 +#: add-interactive.c:1148 git-add--interactive.perl:213 msgid "staged" msgstr "köad" -#: add-interactive.c:1144 git-add--interactive.perl:213 +#: add-interactive.c:1148 git-add--interactive.perl:213 msgid "unstaged" msgstr "ej köad" -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308 -#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128 -#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 -#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327 -#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573 +#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367 +#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128 +#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504 +#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812 #: git-add--interactive.perl:213 msgid "path" msgstr "sökväg" -#: add-interactive.c:1151 +#: add-interactive.c:1155 msgid "could not refresh index" msgstr "kunde inte uppdatera indexet" -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 +#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805 #, c-format msgid "Bye.\n" msgstr "Hej då.\n" -#: add-patch.c:34 git-add--interactive.perl:1431 +#: add-patch.c:34 git-add--interactive.perl:1433 #, 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:35 git-add--interactive.perl:1432 +#: add-patch.c:35 git-add--interactive.perl:1434 #, 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:36 git-add--interactive.perl:1433 +#: add-patch.c:36 git-add--interactive.perl:1435 #, c-format, perl-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "Köa tillägg [y,n,q,a,d%s,?]? " -#: add-patch.c:37 git-add--interactive.perl:1434 +#: add-patch.c:37 git-add--interactive.perl:1436 #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Köa stycket [y,n,q,a,d%s,?]? " @@ -270,22 +271,22 @@ msgstr "" "a - köa stycket och alla följande i filen\n" "d - köa inte stycket eller något av de följande i filen\n" -#: add-patch.c:56 git-add--interactive.perl:1437 +#: add-patch.c:56 git-add--interactive.perl:1439 #, 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:57 git-add--interactive.perl:1438 +#: add-patch.c:57 git-add--interactive.perl:1440 #, 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:58 git-add--interactive.perl:1439 +#: add-patch.c:58 git-add--interactive.perl:1441 #, c-format, perl-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "Stash:a tillägg [y,n,q,a,d%s,?]? " -#: add-patch.c:59 git-add--interactive.perl:1440 +#: add-patch.c:59 git-add--interactive.perl:1442 #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Stash:a stycket [y,n,q,a,d%s,?]? " @@ -312,22 +313,22 @@ msgstr "" "a - \"stash\":a stycket och alla följande i filen\n" "d - \"stash\":a inte stycket eller något av de följande i filen\n" -#: add-patch.c:80 git-add--interactive.perl:1443 +#: add-patch.c:80 git-add--interactive.perl:1445 #, 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:81 git-add--interactive.perl:1444 +#: add-patch.c:81 git-add--interactive.perl:1446 #, 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:82 git-add--interactive.perl:1445 +#: add-patch.c:82 git-add--interactive.perl:1447 #, c-format, perl-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "Ta bort tillägg från kön [y,n,q,a,d%s,?]? " -#: add-patch.c:83 git-add--interactive.perl:1446 +#: add-patch.c:83 git-add--interactive.perl:1448 #, 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,?]? " @@ -354,22 +355,22 @@ msgstr "" "a - ta bort stycket och alla följande i filen från kön\n" "d - ta inte bort stycket eller något av de följande i filen från kön\n" -#: add-patch.c:103 git-add--interactive.perl:1449 +#: add-patch.c:103 git-add--interactive.perl:1451 #, 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:104 git-add--interactive.perl:1450 +#: add-patch.c:104 git-add--interactive.perl:1452 #, 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:105 git-add--interactive.perl:1451 +#: add-patch.c:105 git-add--interactive.perl:1453 #, c-format, perl-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "Applicera tillägg på indexet [y,n,q,a,d%s,?]? " -#: add-patch.c:106 git-add--interactive.perl:1452 +#: add-patch.c:106 git-add--interactive.perl:1454 #, 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,?]? " @@ -396,26 +397,26 @@ msgstr "" "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:126 git-add--interactive.perl:1455 -#: git-add--interactive.perl:1473 +#: add-patch.c:126 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 #, 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:127 git-add--interactive.perl:1456 -#: git-add--interactive.perl:1474 +#: add-patch.c:127 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 #, 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:128 git-add--interactive.perl:1457 -#: git-add--interactive.perl:1475 +#: add-patch.c:128 git-add--interactive.perl:1459 +#: git-add--interactive.perl:1477 #, c-format, perl-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "Kasta tillägg från arbetskatalogen [y,n,q,a,d%s,?]? " -#: add-patch.c:129 git-add--interactive.perl:1458 -#: git-add--interactive.perl:1476 +#: add-patch.c:129 git-add--interactive.perl:1460 +#: git-add--interactive.perl:1478 #, 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,?]? " @@ -442,22 +443,22 @@ msgstr "" "a - förkasta stycket och alla följande i filen\n" "d - förkasta inte stycket eller något av de följande i filen\n" -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463 #, 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:150 add-patch.c:195 git-add--interactive.perl:1462 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464 #, 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:151 add-patch.c:196 git-add--interactive.perl:1463 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465 #, c-format, perl-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "Kasta tillägg från indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 #, 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,?]? " @@ -476,22 +477,22 @@ msgstr "" "a - förkasta stycket och alla följande i filen\n" "d - förkasta inte stycket eller något av de följande i filen\n" -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469 #, 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:172 add-patch.c:217 git-add--interactive.perl:1468 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470 #, 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:173 add-patch.c:218 git-add--interactive.perl:1469 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471 #, c-format, perl-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "Applicera tillägg på indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 #, 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,?]? " @@ -524,34 +525,34 @@ msgstr "" "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:342 +#: add-patch.c:343 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "kunde inte tolka styckehuvudet \"%.*s\"" -#: add-patch.c:361 add-patch.c:365 +#: add-patch.c:362 add-patch.c:366 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "kunde inte tolka färgat styckehuvud \"%.*s\"" -#: add-patch.c:419 +#: add-patch.c:420 msgid "could not parse diff" msgstr "kunde inte tolka diff" -#: add-patch.c:438 +#: add-patch.c:439 msgid "could not parse colored diff" msgstr "kunde inte tolka färgad diff" -#: add-patch.c:452 +#: add-patch.c:453 #, c-format msgid "failed to run '%s'" msgstr "misslyckades att köra \"%s\"" -#: add-patch.c:611 +#: add-patch.c:612 msgid "mismatched output from interactive.diffFilter" msgstr "omaka utdata från interactive.diffFilter" -#: add-patch.c:612 +#: add-patch.c:613 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -559,7 +560,7 @@ msgstr "" "Alla rader i indata måste ha en motsvarande rad i utdata från\n" "ditt filter." -#: add-patch.c:790 +#: add-patch.c:791 #, c-format msgid "" "expected context line #%d in\n" @@ -568,7 +569,7 @@ msgstr "" "förväntade sammanhangsrad %d i\n" "%.*s" -#: add-patch.c:805 +#: add-patch.c:806 #, c-format msgid "" "hunks do not overlap:\n" @@ -581,11 +582,11 @@ msgstr "" "\tavslutas inte med:\n" "%.*s" -#: add-patch.c:1081 git-add--interactive.perl:1115 +#: add-patch.c:1082 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n" -#: add-patch.c:1085 +#: add-patch.c:1086 #, c-format msgid "" "---\n" @@ -599,7 +600,7 @@ msgstr "" "Rader som börjar med %c kommer att tas bort.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1099 git-add--interactive.perl:1129 +#: add-patch.c:1100 git-add--interactive.perl:1129 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -609,11 +610,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:1132 +#: add-patch.c:1133 msgid "could not parse hunk header" msgstr "kunde inte tolka styckehuvud" -#: add-patch.c:1177 +#: add-patch.c:1178 msgid "'git apply --cached' failed" msgstr "\"git apply --cached\" misslyckades" @@ -629,26 +630,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:1246 git-add--interactive.perl:1242 +#: add-patch.c:1247 git-add--interactive.perl:1244 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) " "[y/n]? " -#: add-patch.c:1289 +#: add-patch.c:1290 msgid "The selected hunks do not apply to the index!" msgstr "Markerade stycken kan inte appliceras på indexet!" -#: add-patch.c:1290 git-add--interactive.perl:1346 +#: add-patch.c:1291 git-add--interactive.perl:1348 msgid "Apply them to the worktree anyway? " msgstr "Applicera dem på arbetskatalogen trots det? " -#: add-patch.c:1297 git-add--interactive.perl:1349 +#: add-patch.c:1298 git-add--interactive.perl:1351 msgid "Nothing was applied.\n" msgstr "Ingenting applicerades.\n" -#: add-patch.c:1354 +#: add-patch.c:1355 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -670,73 +671,73 @@ msgstr "" "e - redigera aktuellt stycke manuellt\n" "? - visa hjälp\n" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1517 add-patch.c:1527 msgid "No previous hunk" msgstr "Inget föregående stycke" -#: add-patch.c:1521 add-patch.c:1531 +#: add-patch.c:1522 add-patch.c:1532 msgid "No next hunk" msgstr "Inget följande stycke" -#: add-patch.c:1537 +#: add-patch.c:1538 msgid "No other hunks to goto" msgstr "Inga andra stycken att gå till" -#: add-patch.c:1548 git-add--interactive.perl:1606 +#: add-patch.c:1549 git-add--interactive.perl:1608 msgid "go to which hunk (<ret> to see more)? " msgstr "gå till vilket stycke (<ret> för att se fler)? " -#: add-patch.c:1549 git-add--interactive.perl:1608 +#: add-patch.c:1550 git-add--interactive.perl:1610 msgid "go to which hunk? " msgstr "gå till vilket stycke? " -#: add-patch.c:1560 +#: add-patch.c:1561 #, c-format msgid "Invalid number: '%s'" msgstr "Ogiltigt siffervärde: \"%s\"" -#: add-patch.c:1565 +#: add-patch.c:1566 #, 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:1574 +#: add-patch.c:1575 msgid "No other hunks to search" msgstr "Inga andra stycken att söka efter" -#: add-patch.c:1580 git-add--interactive.perl:1661 +#: add-patch.c:1581 git-add--interactive.perl:1663 msgid "search for regex? " msgstr "sök efter reguljärt uttryck? " -#: add-patch.c:1595 +#: add-patch.c:1596 #, c-format msgid "Malformed search regexp %s: %s" msgstr "Felaktigt format på reguljärt sökuttryck %s: %s" -#: add-patch.c:1612 +#: add-patch.c:1613 msgid "No hunk matches the given pattern" msgstr "Inga stycken motsvarar givet mönster" -#: add-patch.c:1619 +#: add-patch.c:1620 msgid "Sorry, cannot split this hunk" msgstr "Beklagar, kan inte dela stycket" -#: add-patch.c:1623 +#: add-patch.c:1624 #, c-format msgid "Split into %d hunks." msgstr "Dela i %d stycken." -#: add-patch.c:1627 +#: add-patch.c:1628 msgid "Sorry, cannot edit this hunk" msgstr "Beklagar, kan inte redigera stycket" -#: add-patch.c:1679 +#: add-patch.c:1680 msgid "'git apply' failed" msgstr "\"git apply\" misslyckades" -#: advice.c:145 +#: advice.c:78 #, c-format msgid "" "\n" @@ -745,47 +746,47 @@ msgstr "" "\n" "Slå av meddelandet med \"git config advice.%s false\"" -#: advice.c:161 +#: advice.c:94 #, c-format msgid "%shint: %.*s%s\n" msgstr "%stips: %.*s%s\n" -#: advice.c:252 +#: advice.c:178 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:254 +#: advice.c:180 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:256 +#: advice.c:182 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:258 +#: advice.c:184 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:260 +#: advice.c:186 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:262 +#: advice.c:188 #, 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:270 +#: advice.c:196 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -793,41 +794,48 @@ msgstr "" "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n" "som lämpligt för att ange lösning och checka in." -#: advice.c:278 +#: advice.c:204 msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:283 builtin/merge.c:1374 +#: advice.c:209 builtin/merge.c:1382 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: advice.c:285 +#: advice.c:211 msgid "Please, commit your changes before merging." msgstr "Checka in dina ändringar innan du utför sammanslagningen." -#: advice.c:286 +#: advice.c:212 msgid "Exiting because of unfinished merge." msgstr "Avslutar på grund av ofullbordad sammanslagning." -#: advice.c:296 +#: advice.c:217 +msgid "Not possible to fast-forward, aborting." +msgstr "Kan inte snabbspola, avbryter." + +#: advice.c:227 #, c-format msgid "" -"The following pathspecs didn't match any eligible path, but they do match " -"index\n" -"entries outside the current sparse checkout:\n" +"The following paths and/or pathspecs matched paths that exist\n" +"outside of your sparse-checkout definition, so will not be\n" +"updated in the index:\n" msgstr "" -"Följande sökvägsangivelser motsvarar inte någon kvalificerad sökväg, men " -"motsvarar\n" -"indexposter utanför den nuvarande glesa utcheckningen:\n" +"Följande sökvägar och/eller ökvägsangivelser motsvarar sökvägar\n" +"utanför din \"sparse-checkout\"-definition, så de kommer inte\n" +"uppdateras i indexet:\n" -#: advice.c:303 +#: advice.c:234 msgid "" -"Disable or modify the sparsity rules if you intend to update such entries." +"If you intend to update such entries, try one of the following:\n" +"* Use the --sparse option.\n" +"* Disable or modify the sparsity rules." msgstr "" -"Du måste ta bort eller ändra glesningsreglerna för att uppdatera sådana " -"poster." +"Om du har tänkt uppdatera sådana poster, försök något av följande:\n" +"* Använd flaggan --sparse.\n" +"* Inaktivera eller ändra reglerna för gles utcheckning." -#: advice.c:310 +#: advice.c:242 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -888,21 +896,33 @@ msgstr "okänt alternativ för whitespace: \"%s\"" msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: apply.c:136 -msgid "--reject and --3way cannot be used together." -msgstr "--reject och --3way kan inte användas samtidigt." - -#: apply.c:139 -msgid "--3way outside a repository" -msgstr "--3way utanför arkiv" - -#: apply.c:150 -msgid "--index outside a repository" -msgstr "--index utanför arkiv" - -#: apply.c:153 -msgid "--cached outside a repository" -msgstr "--cached utanför arkiv" +#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307 +#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870 +#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885 +#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541 +#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470 +#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757 +#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361 +#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155 +#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038 +#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560 +#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778 +#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073 +#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641 +#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199 +#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426 +#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710 +#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316 +#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572 +#: builtin/worktree.c:702 +#, c-format +msgid "options '%s' and '%s' cannot be used together" +msgstr "flaggorna \"%s\" och \"%s\" kan inte användas samtidigt" + +#: apply.c:139 apply.c:150 apply.c:153 +#, c-format +msgid "'%s' outside a repository" +msgstr "\"%s\" utanför arkiv" #: apply.c:800 #, c-format @@ -1008,49 +1028,49 @@ msgstr "borttagna filen %s har fortfarande innehåll" msgid "** warning: file %s becomes empty but is not deleted" msgstr "** varning: filen %s blir tom men har inte tagits bort" -#: apply.c:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: apply.c:2935 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: apply.c:3056 +#: apply.c:3057 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Stycke %d lyckades på %d (offset %d rad)." msgstr[1] "Stycke %d lyckades på %d (offset %d rader)." -#: apply.c:3068 +#: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d" -#: apply.c:3074 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -1059,25 +1079,25 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: apply.c:3096 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: apply.c:3104 +#: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s" "\"" -#: apply.c:3151 +#: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden" -#: apply.c:3162 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -1085,422 +1105,421 @@ 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:3208 +#: 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:3229 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: apply.c:3352 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214 -#: setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214 +#: setup.c:309 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" -#: apply.c:3412 +#: 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:3441 apply.c:3687 +#: apply.c:3442 apply.c:3711 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: apply.c:3527 apply.c:3702 +#: apply.c:3549 apply.c:3726 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: apply.c:3536 apply.c:3710 apply.c:3954 +#: apply.c:3558 apply.c:3734 apply.c:3978 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: apply.c:3571 +#: apply.c:3595 msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "arkivet saknar objekt som behövs för att utföra 3-vägssammanslagning." -#: apply.c:3574 +#: apply.c:3598 #, c-format msgid "Performing three-way merge...\n" msgstr "Utför trevägssammanslagning...\n" -#: apply.c:3590 apply.c:3594 +#: apply.c:3614 apply.c:3618 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kunde inte läsa aktuellt innehåll i \"%s\"" -#: apply.c:3606 +#: apply.c:3630 #, c-format msgid "Failed to perform three-way merge...\n" msgstr "Misslyckades utföra trevägssammanslagning...\n" -#: apply.c:3620 +#: apply.c:3644 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Applicerade patchen på \"%s\" med konflikter.\n" -#: apply.c:3625 +#: apply.c:3649 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Tillämpade patchen på \"%s\" rent.\n" -#: apply.c:3642 +#: apply.c:3666 #, c-format msgid "Falling back to direct application...\n" msgstr "Faller tillbaka på direkt tillämpning...\n" -#: apply.c:3654 +#: apply.c:3678 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: apply.c:3727 +#: apply.c:3751 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: apply.c:3729 +#: apply.c:3753 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890 -#: read-cache.c:1351 +#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918 +#: read-cache.c:1381 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg \"%s\"" -#: apply.c:3952 +#: apply.c:3976 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: apply.c:3956 +#: apply.c:3980 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: apply.c:3976 +#: apply.c:4000 #, 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:3981 +#: apply.c:4005 #, 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:4001 +#: apply.c:4025 #, 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:4005 +#: apply.c:4029 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: apply.c:4020 +#: apply.c:4044 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: apply.c:4112 +#: apply.c:4136 #, 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:4119 +#: apply.c:4143 #, 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:4122 +#: apply.c:4146 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller är oanvändbar (%s)." -#: apply.c:4131 +#: apply.c:4155 #, c-format msgid "could not add %s to temporary index" msgstr "kunde inte lägga till %s till temporärt index" -#: apply.c:4141 +#: apply.c:4165 #, c-format msgid "could not write temporary index to %s" msgstr "kunde inte skriva temporärt index till %s" -#: apply.c:4279 +#: apply.c:4303 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: apply.c:4313 +#: apply.c:4337 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: apply.c:4319 +#: apply.c:4343 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: apply.c:4327 +#: apply.c:4351 #, 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:4333 apply.c:4478 +#: apply.c:4357 apply.c:4502 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: apply.c:4376 builtin/bisect--helper.c:523 +#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258 +#: builtin/gc.c:2293 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" -#: apply.c:4380 +#: apply.c:4404 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: apply.c:4450 +#: apply.c:4474 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: apply.c:4548 +#: apply.c:4572 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: apply.c:4556 +#: apply.c:4580 msgid "internal error" msgstr "internt fel" -#: apply.c:4559 +#: apply.c:4583 #, 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:4570 +#: apply.c:4594 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394 +#: apply.c:4602 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" -#: apply.c:4592 +#: apply.c:4616 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: apply.c:4596 +#: apply.c:4620 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4725 +#: apply.c:4749 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4733 -msgid "unrecognized input" -msgstr "indata känns inte igen" +#: apply.c:4758 +msgid "No valid patches in input (allow with \"--allow-empty\")" +msgstr "Inga giltiga patchar i indata (tillåt med \"--allow-empty\")" -#: apply.c:4753 +#: apply.c:4779 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4910 +#: apply.c:4936 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4937 +#: apply.c:4963 #, 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:4943 apply.c:4958 +#: apply.c:4969 apply.c:4984 #, 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:4951 +#: apply.c:4977 #, 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:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423 +#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: apply.c:4995 +#: apply.c:5021 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:4998 +#: apply.c:5024 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:5000 builtin/am.c:2317 +#: apply.c:5026 builtin/am.c:2376 msgid "num" msgstr "antal" -#: apply.c:5001 +#: apply.c:5027 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:5004 +#: apply.c:5030 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:5006 +#: apply.c:5032 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:5010 +#: apply.c:5036 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:5012 +#: apply.c:5038 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:5014 +#: apply.c:5040 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:5016 +#: apply.c:5042 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:5018 +#: apply.c:5044 msgid "mark new files with `git add --intent-to-add`" msgstr "markera nya filer med \"git add --intent-to-add\"" -#: apply.c:5020 +#: apply.c:5046 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:5022 +#: apply.c:5048 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:5025 +#: apply.c:5051 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:5027 +#: apply.c:5053 msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "" "försök en trevägssammanslagning, fall tillbaka på normal patch om det " "misslyckas" -#: apply.c:5029 +#: apply.c:5055 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617 +#: apply.c:5058 builtin/checkout-index.c:196 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: apply.c:5034 +#: apply.c:5060 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296 +#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831 -#: builtin/rebase.c:1347 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960 +#: builtin/rebase.c:1051 msgid "action" msgstr "åtgärd" -#: apply.c:5036 +#: apply.c:5062 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:5039 apply.c:5042 +#: apply.c:5065 apply.c:5068 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:5045 +#: apply.c:5071 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:5047 +#: apply.c:5073 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:5049 +#: apply.c:5075 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:5051 +#: apply.c:5077 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 -#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755 -#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128 -msgid "be verbose" -msgstr "var pratsam" - -#: apply.c:5054 +#: apply.c:5080 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:5057 +#: apply.c:5083 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:5059 builtin/am.c:2305 +#: apply.c:5085 builtin/am.c:2364 msgid "root" msgstr "rot" -#: apply.c:5060 +#: apply.c:5086 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" +#: apply.c:5089 +msgid "don't return error for empty patches" +msgstr "ge inte någon felkod för tomma patchar" + #: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" @@ -1511,16 +1530,16 @@ msgstr "kan inte strömma blob:en %s" msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "filens läge stöds ej: 0%o (SHA1: %s)" -#: archive-tar.c:450 +#: archive-tar.c:447 #, c-format msgid "unable to start '%s' filter" msgstr "kunde inte starta filtret \"%s\"" -#: archive-tar.c:453 +#: archive-tar.c:450 msgid "unable to redirect descriptor" msgstr "kan inte omdirigera handtag" -#: archive-tar.c:460 +#: archive-tar.c:457 #, c-format msgid "'%s' filter reported error" msgstr "filtret \"%s\" rapporterade fel" @@ -1535,7 +1554,7 @@ msgstr "sökvägen är inte giltig UTF-8: %s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s" -#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" @@ -1564,156 +1583,152 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:188 -#, c-format -msgid "cannot read %s" -msgstr "kan inte läsa %s" - -#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 -#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833 -#: builtin/merge.c:1143 +#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238 +#: builtin/tag.c:578 #, c-format -msgid "could not read '%s'" +msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328 +#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" -#: archive.c:451 +#: archive.c:450 #, c-format msgid "no such ref: %.*s" msgstr "ingen sådan referens: %.*s" -#: archive.c:457 +#: archive.c:456 #, c-format msgid "not a valid object name: %s" msgstr "objektnamnet är inte giltigt: %s" -#: archive.c:470 +#: archive.c:469 #, c-format msgid "not a tree object: %s" msgstr "inte ett trädobjekt: %s" -#: archive.c:482 +#: archive.c:481 msgid "current working directory is untracked" msgstr "aktuell arbetskatalog är inte spårad" -#: archive.c:523 +#: archive.c:522 #, c-format msgid "File not found: %s" msgstr "Hittar inte filen: %s" -#: archive.c:525 +#: archive.c:524 #, c-format msgid "Not a regular file: %s" msgstr "Inte en vanlig fil: %s" -#: archive.c:552 +#: archive.c:551 msgid "fmt" msgstr "fmt" -#: archive.c:552 +#: archive.c:551 msgid "archive format" msgstr "arkivformat" -#: archive.c:553 builtin/log.c:1772 +#: archive.c:552 builtin/log.c:1790 msgid "prefix" msgstr "prefix" -#: archive.c:554 +#: archive.c:553 msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 -#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 -#: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105 -#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 +#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884 +#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135 +#: builtin/fast-export.c:1181 builtin/fast-export.c:1183 +#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103 +#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410 +#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190 msgid "file" msgstr "fil" -#: archive.c:556 +#: archive.c:555 msgid "add untracked file to archive" msgstr "ta med ospårade filer i arkivet" -#: archive.c:559 builtin/archive.c:90 +#: archive.c:558 builtin/archive.c:88 msgid "write the archive to this file" msgstr "skriv arkivet till filen" -#: archive.c:561 +#: archive.c:560 msgid "read .gitattributes in working directory" msgstr "läs .gitattributes i arbetskatalogen" -#: archive.c:562 +#: archive.c:561 msgid "report archived files on stderr" msgstr "rapportera arkiverade filer på standard fel" -#: archive.c:564 +#: archive.c:563 msgid "set compression level" msgstr "välj komprimeringsgrad" -#: archive.c:567 +#: archive.c:566 msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336 +#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121 +#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513 msgid "repo" msgstr "arkiv" -#: archive.c:570 builtin/archive.c:92 +#: archive.c:569 builtin/archive.c:90 msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718 -#: builtin/notes.c:498 +#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708 +#: builtin/notes.c:496 msgid "command" msgstr "kommando" -#: archive.c:572 builtin/archive.c:94 +#: archive.c:571 builtin/archive.c:92 msgid "path to the remote git-upload-archive command" msgstr "sökväg till kommandot git-upload-archive på fjärren" -#: archive.c:579 +#: archive.c:578 msgid "Unexpected option --remote" msgstr "Oväntad flagga --remote" -#: archive.c:581 -msgid "Option --exec can only be used together with --remote" -msgstr "Flaggan --exec kan endast användas tillsammans med --remote" +#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544 +#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370 +#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115 +#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281 +#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144 +#: http-fetch.c:153 +#, c-format +msgid "the option '%s' requires '%s'" +msgstr "flaggan \"%s\" kräver \"%s\"" -#: archive.c:583 +#: archive.c:582 msgid "Unexpected option --output" msgstr "Oväntad flagga --output" -#: archive.c:585 -msgid "Options --add-file and --remote cannot be used together" -msgstr "Flaggorna --add-file och --remote kan inte användas samtidigt" - -#: archive.c:607 +#: archive.c:606 #, c-format msgid "Unknown archive format '%s'" msgstr "Okänt arkivformat \"%s\"" -#: archive.c:616 +#: archive.c:615 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumentet stöd inte för formatet \"%s\": -%d" -#: attr.c:202 +#: attr.c:203 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%-*s är inte ett giltigt namn på attribut" -#: attr.c:363 +#: attr.c:364 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s inte tillåtet: %s:%d" -#: attr.c:403 +#: attr.c:404 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1721,22 +1736,22 @@ msgstr "" "Negativa mönster ignoreras i git-attribut\n" "Använd '\\!' för att inleda med ett utropstecken." -#: bisect.c:489 +#: bisect.c:488 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Felaktigt citerat innehåll i filen \"%s\": %s" -#: bisect.c:699 +#: bisect.c:698 #, c-format msgid "We cannot bisect more!\n" msgstr "Det finns inte mer att göra \"bisect\" på!\n" -#: bisect.c:766 +#: bisect.c:764 #, c-format msgid "Not a valid commit name %s" msgstr "Namnet på incheckningen är inte giltigt: %s" -#: bisect.c:791 +#: bisect.c:789 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1745,7 +1760,7 @@ msgstr "" "Sammanslagningsbasen %s är trasig.\n" "Det betyder att felet har rättats mellan %s och [%s].\n" -#: bisect.c:796 +#: bisect.c:794 #, c-format msgid "" "The merge base %s is new.\n" @@ -1754,7 +1769,7 @@ msgstr "" "Sammanslagningsbasen %s är ny.\n" "Egenskapen har ändrats mellan %s och [%s].\n" -#: bisect.c:801 +#: bisect.c:799 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1763,7 +1778,7 @@ msgstr "" "Sammanslagningsbasen %s är %s.\n" "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n" -#: bisect.c:809 +#: bisect.c:807 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1774,7 +1789,7 @@ msgstr "" "git bisect kan inte fungera korrekt i detta fall.\n" "Kanske du skrev fel %s- och %s-revisioner?\n" -#: bisect.c:822 +#: bisect.c:820 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1786,36 +1801,36 @@ msgstr "" "%s.\n" "Vi fortsätter ändå." -#: bisect.c:861 +#: bisect.c:859 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisect: en sammanslagningsbas måste testas\n" -#: bisect.c:911 +#: bisect.c:909 #, c-format msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298 +#: bisect.c:939 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: bisect.c:987 builtin/merge.c:153 +#: bisect.c:985 builtin/merge.c:155 #, c-format msgid "could not read file '%s'" msgstr "kunde inte läsa filen \"%s\"" -#: bisect.c:1027 +#: bisect.c:1025 msgid "reading bisect refs failed" msgstr "misslyckades läsa bisect-referenser" -#: bisect.c:1057 +#: bisect.c:1055 #, c-format msgid "%s was both %s and %s\n" msgstr "%s var både %s och %s\n" -#: bisect.c:1066 +#: bisect.c:1064 #, c-format msgid "" "No testable commit found.\n" @@ -1824,7 +1839,7 @@ msgstr "" "Ingen testbar incheckning hittades.\n" "Kanske du startade med felaktiga sökvägsargument?\n" -#: bisect.c:1095 +#: bisect.c:1093 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1834,7 +1849,7 @@ msgstr[1] "(ungefär %d steg)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1101 +#: bisect.c:1099 #, 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" @@ -1855,11 +1870,12 @@ msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 -#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411 -#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344 -#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646 -#: builtin/pack-objects.c:3661 builtin/shortlog.c:255 +#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158 +#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114 +#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071 +#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373 +#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790 +#: builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -1880,105 +1896,93 @@ msgstr "sökvägen %s i %s finns inte" msgid "cannot read blob %s for path %s" msgstr "kan inte läsa objektet %s för sökvägen %s" -#: branch.c:53 -#, c-format +#: branch.c:77 msgid "" -"\n" -"After fixing the error cause you may try to fix up\n" -"the remote tracking information by invoking\n" -"\"git branch --set-upstream-to=%s%s%s\"." +"cannot inherit upstream tracking configuration of multiple refs when " +"rebasing is requested" msgstr "" -"\n" -"När du har rättat felorsaken kan du försöka rätta\n" -"fjärrspårningsinformationen genom att utföra\n" -"\"git branch --set-upstream-to=%s%s%s\"." +"kan inte ärva uppströmsspårningsinformation från flera referenser när " +"ombasering är vald" -#: branch.c:67 +#: branch.c:88 #, c-format -msgid "Not setting branch %s as its own upstream." -msgstr "Ställer inte in grenen %s som sin egen uppströmsgren." +msgid "not setting branch '%s' as its own upstream" +msgstr "ställer inte in grenen %s som sin egen uppströmsgren" -#: branch.c:93 +#: branch.c:144 #, c-format -msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." -msgstr "" -"Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\" genom " -"ombasering." +msgid "branch '%s' set up to track '%s' by rebasing." +msgstr "grenen \"%s\" inställd på att spåra \"%s\" genom ombasering." -#: branch.c:94 +#: branch.c:145 #, c-format -msgid "Branch '%s' set up to track remote branch '%s' from '%s'." -msgstr "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\"." +msgid "branch '%s' set up to track '%s'." +msgstr "grenen \"%s\" inställd på att spåra \"%s\"." -#: branch.c:98 +#: branch.c:148 #, c-format -msgid "Branch '%s' set up to track local branch '%s' by rebasing." -msgstr "" -"Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\" genom " -"ombasering." +msgid "branch '%s' set up to track:" +msgstr "grenen \"%s\" inställd på att spåra:" -#: branch.c:99 -#, c-format -msgid "Branch '%s' set up to track local branch '%s'." -msgstr "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"." +#: branch.c:160 +msgid "unable to write upstream branch configuration" +msgstr "kan inte skriva inställningar för uppströmsgren" -#: branch.c:104 -#, c-format -msgid "Branch '%s' set up to track remote ref '%s' by rebasing." +#: branch.c:162 +msgid "" +"\n" +"After fixing the error cause you may try to fix up\n" +"the remote tracking information by invoking:" msgstr "" -"Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\" genom ombasering." +"\n" +"När du har rättat felorsaken kan du försöka rätta\n" +"fjärrspårningsinformationen genom att utföra:" -#: branch.c:105 +#: branch.c:203 #, c-format -msgid "Branch '%s' set up to track remote ref '%s'." -msgstr "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\"." +msgid "asked to inherit tracking from '%s', but no remote is set" +msgstr "bad om att ärva spårning från \"%s\", men ingen fjärr är vald" -#: branch.c:109 +#: branch.c:209 #, c-format -msgid "Branch '%s' set up to track local ref '%s' by rebasing." +msgid "asked to inherit tracking from '%s', but no merge configuration is set" msgstr "" -"Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\" genom " -"ombasering." +"bad om att ärva spårning från \"%s\", men ingen sammanslagningsinställning " +"är vald" -#: branch.c:110 +#: branch.c:252 #, c-format -msgid "Branch '%s' set up to track local ref '%s'." -msgstr "Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\"." - -#: branch.c:119 -msgid "Unable to write upstream branch configuration" -msgstr "Kan inte skriva inställningar för uppströmsgren" +msgid "not tracking: ambiguous information for ref %s" +msgstr "spårar inte: tvetydig information för referensen %s" -#: branch.c:156 +#: branch.c:287 #, c-format -msgid "Not tracking: ambiguous information for ref %s" -msgstr "Spårar inte: tvetydig information för referensen %s" +msgid "'%s' is not a valid branch name" +msgstr "\"%s\" är inte ett giltigt grennamn" -#: branch.c:189 +#: branch.c:307 #, c-format -msgid "'%s' is not a valid branch name." -msgstr "\"%s\" är inte ett giltigt grennamn." +msgid "a branch named '%s' already exists" +msgstr "det finns redan en gren som heter \"%s\"" -#: branch.c:208 +#: branch.c:313 #, c-format -msgid "A branch named '%s' already exists." -msgstr "Det finns redan en gren som heter \"%s\"." - -#: branch.c:213 -msgid "Cannot force update the current branch." -msgstr "Kan inte tvinga uppdatering av aktuell gren." +msgid "cannot force update the branch '%s' checked out at '%s'" +msgstr "" +"kan inte tvinga uppdatering av grenen \"%s\" som är utcheckad på \"%s\"" -#: branch.c:233 +#: branch.c:336 #, c-format -msgid "Cannot setup tracking information; starting point '%s' is not a branch." -msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren." +msgid "cannot set up tracking information; starting point '%s' is not a branch" +msgstr "" +"kan inte ställa in spårningsinformation; startpunkten \"%s\" är inte en gren" -#: branch.c:235 +#: branch.c:338 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte" -#: branch.c:237 +#: branch.c:340 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1998,153 +2002,154 @@ msgstr "" "spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n" "för att ställa in uppströmskonfigurationen när du sänder in." -#: branch.c:281 +#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377 +#: builtin/replace.c:423 builtin/replace.c:453 #, c-format -msgid "Not a valid object name: '%s'." -msgstr "Objektnamnet är inte giltigt: \"%s\"." +msgid "not a valid object name: '%s'" +msgstr "objektnamnet är inte giltigt: \"%s\"" -#: branch.c:301 +#: branch.c:404 #, c-format -msgid "Ambiguous object name: '%s'." -msgstr "Objektnamnet är tvetydigt: \"%s\"." +msgid "ambiguous object name: '%s'" +msgstr "objektnamnet är tvetydigt: \"%s\"" -#: branch.c:306 +#: branch.c:409 #, c-format -msgid "Not a valid branch point: '%s'." -msgstr "Avgreningspunkten är inte giltig: \"%s\"." +msgid "not a valid branch point: '%s'" +msgstr "avgreningspunkten är inte giltig: \"%s\"" -#: branch.c:366 +#: branch.c:469 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "\"%s\" är redan utcheckad på \"%s\"" -#: branch.c:389 +#: branch.c:494 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD i arbetskatalogen %s har inte uppdaterats" -#: bundle.c:41 +#: bundle.c:44 #, c-format msgid "unrecognized bundle hash algorithm: %s" -msgstr "okänd hashningsalgoritm för paket (bundle): \"%s\"" +msgstr "okänd hashningsalgoritm för bunt: \"%s\"" -#: bundle.c:45 +#: bundle.c:48 #, c-format msgid "unknown capability '%s'" msgstr "okänd kapabilitet \"%s\"" -#: bundle.c:71 +#: bundle.c:74 #, c-format msgid "'%s' does not look like a v2 or v3 bundle file" -msgstr "'%s' ser inte ut som en v2- eller v3-paket-fil (bundle)" +msgstr "'%s' ser inte ut som en v2- eller v3-bunt-fil" -#: bundle.c:110 +#: bundle.c:113 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 -#: builtin/commit.c:861 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406 +#: builtin/commit.c:862 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" -#: bundle.c:189 +#: bundle.c:198 msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:192 +#: bundle.c:201 msgid "need a repository to verify a bundle" -msgstr "behöver ett arkiv för att verifiera ett paket (bundle)." +msgstr "behöver ett arkiv för att bekräfta en bunt." -#: bundle.c:243 +#: bundle.c:257 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" -msgstr[0] "Paketet (bundlen) innehåller denna referens:" -msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:" +msgstr[0] "Bunten innehåller denna referens:" +msgstr[1] "Bunten innehåller dessa %d referenser:" -#: bundle.c:250 +#: bundle.c:264 msgid "The bundle records a complete history." -msgstr "Paketet (bundlen) beskriver en komplett historik." +msgstr "Bunten beskriver en komplett historik." -#: bundle.c:252 +#: bundle.c:266 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" -msgstr[0] "Paketet (bundlen) kräver denna referens:" -msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:" +msgstr[0] "Bunten kräver denna referens:" +msgstr[1] "Bunten kräver dessa %d referenser:" -#: bundle.c:319 +#: bundle.c:333 msgid "unable to dup bundle descriptor" -msgstr "kan inte duplicera pakethandtag" +msgstr "kan inte duplicera bunthandtag" -#: bundle.c:326 +#: bundle.c:340 msgid "Could not spawn pack-objects" msgstr "Kunde inte starta pack-objects" -#: bundle.c:337 +#: bundle.c:351 msgid "pack-objects died" msgstr "pack-objects misslyckades" -#: bundle.c:386 +#: bundle.c:400 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:490 +#: bundle.c:504 #, c-format msgid "unsupported bundle version %d" -msgstr "version %d för paket (bundle) stöds ej" +msgstr "version %d för bunt stöds ej" -#: bundle.c:492 +#: bundle.c:506 #, c-format msgid "cannot write bundle version %d with algorithm %s" -msgstr "kan inte skriva paket (bundle) med version %d med algoritmen %s" +msgstr "kan inte skriva bunt med version %d med algoritmen %s" -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" -#: bundle.c:539 +#: bundle.c:553 msgid "Refusing to create empty bundle." -msgstr "Vägrar skapa ett tomt paket (bundle)." +msgstr "Vägrar skapa en tom bunt." -#: bundle.c:549 +#: bundle.c:563 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:574 +#: bundle.c:588 msgid "index-pack died" msgstr "index-pack dog" -#: chunk-format.c:113 +#: chunk-format.c:117 msgid "terminating chunk id appears earlier than expected" msgstr "avslutande stycke-id förekommer tidigare än förväntat" -#: chunk-format.c:122 +#: chunk-format.c:126 #, c-format msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" msgstr "felaktigt stycke-offset %<PRIx64> och %<PRIx64>" -#: chunk-format.c:129 +#: chunk-format.c:133 #, c-format msgid "duplicate chunk ID %<PRIx32> found" msgstr "dubblerat stycke-ID %<PRIx32> upptäckt" -#: chunk-format.c:143 +#: chunk-format.c:147 #, c-format msgid "final chunk has non-zero id %<PRIx32>" msgstr "avslutande stycke har id %<PRIx32> som inte är noll" -#: color.c:329 +#: color.c:354 #, c-format msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit-graph.c:204 midx.c:47 +#: commit-graph.c:204 midx.c:51 msgid "invalid hash version" msgstr "felaktig hashnings-version" @@ -2189,189 +2194,190 @@ msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde" msgid "unable to find all commit-graph files" msgstr "kan inte hitta alla incheckingsgraffiler" -#: commit-graph.c:745 commit-graph.c:782 +#: commit-graph.c:749 commit-graph.c:786 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig" -#: commit-graph.c:766 +#: commit-graph.c:770 #, c-format msgid "could not find commit %s" msgstr "kunde inte hitta incheckningen %s" -#: commit-graph.c:799 +#: commit-graph.c:803 msgid "commit-graph requires overflow generation data but has none" msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen" -#: commit-graph.c:1075 builtin/am.c:1340 +#: commit-graph.c:1108 builtin/am.c:1369 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: commit-graph.c:1337 builtin/pack-objects.c:2897 +#: commit-graph.c:1370 builtin/pack-objects.c:3070 #, c-format msgid "unable to get type of object %s" msgstr "kunde inte hämta typ för objektet %s" -#: commit-graph.c:1368 +#: commit-graph.c:1401 msgid "Loading known commits in commit graph" msgstr "Läser in kända incheckningar i incheckningsgraf" -#: commit-graph.c:1385 +#: commit-graph.c:1418 msgid "Expanding reachable commits in commit graph" msgstr "Expanderar nåbara incheckningar i incheckningsgraf" -#: commit-graph.c:1405 +#: commit-graph.c:1438 msgid "Clearing commit marks in commit graph" msgstr "Rensar incheckningsmärken i incheckningsgraf" -#: commit-graph.c:1424 +#: commit-graph.c:1457 msgid "Computing commit graph topological levels" msgstr "Beräknar topografiska nivåer för incheckningsgraf" -#: commit-graph.c:1477 +#: commit-graph.c:1510 msgid "Computing commit graph generation numbers" msgstr "Beräknar generationsvärden för incheckningsgraf" -#: commit-graph.c:1558 +#: commit-graph.c:1591 msgid "Computing commit changed paths Bloom filters" msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen" -#: commit-graph.c:1635 +#: commit-graph.c:1668 msgid "Collecting referenced commits" msgstr "Samlar refererade incheckningar" -#: commit-graph.c:1660 +#: commit-graph.c:1693 #, 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:1673 +#: commit-graph.c:1706 #, c-format msgid "error adding pack %s" msgstr "fel vid tillägg av paketet %s" -#: commit-graph.c:1677 +#: commit-graph.c:1710 #, c-format msgid "error opening index for %s" msgstr "fel vid öppning av indexet för %s" -#: commit-graph.c:1714 +#: commit-graph.c:1747 msgid "Finding commits for commit graph among packed objects" msgstr "Söker incheckningar för incheckingsgraf i packade objekt" -#: commit-graph.c:1732 +#: commit-graph.c:1765 msgid "Finding extra edges in commit graph" msgstr "Söker ytterligare kanter i incheckingsgraf" -#: commit-graph.c:1781 +#: commit-graph.c:1814 msgid "failed to write correct number of base graph ids" msgstr "kunde inte skriva korrekt antal bas-graf-id:n" -#: commit-graph.c:1812 midx.c:906 +#: commit-graph.c:1845 midx.c:1149 #, c-format msgid "unable to create leading directories of %s" msgstr "kunde inte skapa inledande kataloger för %s" -#: commit-graph.c:1825 +#: commit-graph.c:1858 msgid "unable to create temporary graph layer" msgstr "kan inte skapa temporärt graflager" -#: commit-graph.c:1830 +#: commit-graph.c:1863 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "kan inte justera delade behörigheter för \"%s\"" -#: commit-graph.c:1887 +#: commit-graph.c:1920 #, 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:1923 +#: commit-graph.c:1956 msgid "unable to open commit-graph chain file" msgstr "Kunde inte öppna incheckningsgrafkedjefilen" -#: commit-graph.c:1939 +#: commit-graph.c:1972 msgid "failed to rename base commit-graph file" msgstr "kunde inte byta namn på bas-incheckingsgraffilen" -#: commit-graph.c:1959 +#: commit-graph.c:1992 msgid "failed to rename temporary commit-graph file" msgstr "kunde inte byta namn på temporär incheckningsgraffil" -#: commit-graph.c:2092 +#: commit-graph.c:2125 msgid "Scanning merged commits" msgstr "Söker sammanslagna incheckningar" -#: commit-graph.c:2136 +#: commit-graph.c:2169 msgid "Merging commit-graph" msgstr "Slår ihop incheckningsgraf" -#: commit-graph.c:2244 +#: commit-graph.c:2277 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" "försöker skriva en incheckningsgraf, men \"core.commitGraph\" är inaktiverad" -#: commit-graph.c:2351 +#: commit-graph.c:2384 msgid "too many commits to write graph" msgstr "för många incheckningar för att skriva graf" -#: commit-graph.c:2450 +#: commit-graph.c:2482 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -"filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig" +"filen med incheckningsgraf har felaktig kontrollsumma och är troligtvis " +"trasig" -#: commit-graph.c:2460 +#: commit-graph.c:2492 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s" -#: commit-graph.c:2470 commit-graph.c:2485 +#: commit-graph.c:2502 commit-graph.c:2517 #, 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:2477 +#: commit-graph.c:2509 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "kunde inte tolka incheckning %s från incheckningsgraf" -#: commit-graph.c:2495 +#: commit-graph.c:2527 msgid "Verifying commits in commit graph" msgstr "Bekräftar incheckningar i incheckningsgrafen" -#: commit-graph.c:2510 +#: commit-graph.c:2542 #, 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:2517 +#: commit-graph.c:2549 #, 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:2527 +#: commit-graph.c:2559 #, 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:2536 +#: commit-graph.c:2568 #, 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:2550 +#: commit-graph.c:2582 #, 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:2555 +#: commit-graph.c:2587 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2379,7 +2385,7 @@ msgstr "" "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-" "noll på annan plats" -#: commit-graph.c:2559 +#: commit-graph.c:2591 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2387,32 +2393,32 @@ msgstr "" "incheckningsgrafen har generationsnummer skilt från noll för incheckningen " "%s, men noll på annan plats" -#: commit-graph.c:2576 +#: commit-graph.c:2608 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "" "incheckningsgrafens generation för incheckningen %s är %<PRIuMAX> < " "%<PRIuMAX>" -#: commit-graph.c:2582 +#: commit-graph.c:2614 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "incheckningsdatumet för incheckningen %s i incheckningsgrafen är %<PRIuMAX> !" "= %<PRIuMAX>" -#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416 -#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457 +#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444 +#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" -#: commit.c:54 +#: commit.c:55 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s är inte en incheckning!" -#: commit.c:194 +#: commit.c:196 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -2432,29 +2438,29 @@ msgstr "" "Slå av detta meddelande genom att skriva\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1237 +#: commit.c:1241 #, 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:1241 +#: commit.c:1245 #, 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:1244 +#: commit.c:1248 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: commit.c:1247 +#: commit.c:1251 #, 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:1501 +#: commit.c:1505 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" @@ -2468,7 +2474,7 @@ msgstr "" msgid "memory exhausted" msgstr "minnet slut" -#: config.c:126 +#: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -2483,35 +2489,35 @@ msgstr "" "\t%s\n" "Det kan bero på cirkulära inkluderingar." -#: config.c:142 +#: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "kunde inte expandera inkluderingssökväg \"%s\"" -#: config.c:153 +#: config.c:152 msgid "relative config includes must come from files" msgstr "relativa konfigureringsinkluderingar måste komma från filer" -#: config.c:199 +#: config.c:201 msgid "relative config include conditionals must come from files" msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer" -#: config.c:396 +#: config.c:398 #, c-format msgid "invalid config format: %s" msgstr "felaktigt konfigurationsformat: %s" -#: config.c:400 +#: config.c:402 #, c-format msgid "missing environment variable name for configuration '%.*s'" msgstr "miljövariabelnamn saknas för konfigurationen \"%.*s\"" -#: config.c:405 +#: config.c:407 #, c-format msgid "missing environment variable '%s' for configuration '%.*s'" msgstr "miljövariabeln \"%s\" saknas för konfigurationen \"%.*s\"" -#: config.c:442 +#: config.c:443 #, c-format msgid "key does not contain a section: %s" msgstr "nyckeln innehåller inte ett stycke: %s" @@ -2521,302 +2527,303 @@ 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:472 sequencer.c:2785 +#: config.c:470 sequencer.c:2806 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" -#: config.c:478 +#: config.c:475 #, c-format msgid "invalid key (newline): %s" msgstr "ogiltig nyckel (nyradstecken): %s" -#: config.c:511 +#: config.c:495 msgid "empty config key" msgstr "tom konfigurationsnyckel" -#: config.c:529 config.c:541 +#: config.c:513 config.c:525 #, c-format msgid "bogus config parameter: %s" msgstr "falsk konfigureringsparameter: %s" -#: config.c:555 config.c:572 config.c:579 config.c:588 +#: config.c:539 config.c:556 config.c:563 config.c:572 #, c-format msgid "bogus format in %s" msgstr "felaktigt format i %s" -#: config.c:622 +#: config.c:606 #, c-format msgid "bogus count in %s" msgstr "felaktigt antal i %s" -#: config.c:626 +#: config.c:610 #, c-format msgid "too many entries in %s" msgstr "för många poster i %s" -#: config.c:636 +#: config.c:620 #, c-format msgid "missing config key %s" msgstr "konfigurationsnyckel saknas för %s" -#: config.c:644 +#: config.c:628 #, c-format msgid "missing config value %s" msgstr "konfigurationsvärde saknas för %s" -#: config.c:995 +#: config.c:979 #, c-format msgid "bad config line %d in blob %s" msgstr "felaktig konfigurationsfil rad %d i blob:en %s" -#: config.c:999 +#: config.c:983 #, c-format msgid "bad config line %d in file %s" msgstr "felaktig konfigurationsfil rad %d i filen %s" -#: config.c:1003 +#: config.c:987 #, c-format msgid "bad config line %d in standard input" msgstr "felaktig konfigurationsfil rad %d i standard in" -#: config.c:1007 +#: config.c:991 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s" -#: config.c:1011 +#: config.c:995 #, c-format msgid "bad config line %d in command line %s" msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s" -#: config.c:1015 +#: config.c:999 #, c-format msgid "bad config line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:1152 +#: config.c:1136 msgid "out of range" msgstr "utanför intervallet" -#: config.c:1152 +#: config.c:1136 msgid "invalid unit" msgstr "ogiltig enhet" -#: config.c:1153 +#: config.c:1137 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:1163 +#: config.c:1147 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s" -#: config.c:1166 +#: config.c:1150 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s" -#: config.c:1169 +#: config.c:1153 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s" -#: config.c:1172 +#: config.c:1156 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:" "en %s: %s" -#: config.c:1175 +#: config.c:1159 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden " "%s: %s" -#: config.c:1178 +#: config.c:1162 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s" -#: config.c:1257 +#: config.c:1241 #, c-format msgid "bad boolean config value '%s' for '%s'" msgstr "felaktigt booleskt konfigurationsvärde \"%s\" för \"%s\"" -#: config.c:1275 +#: config.c:1259 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:1284 +#: config.c:1268 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" -#: config.c:1377 +#: config.c:1361 #, c-format msgid "abbrev length out of range: %d" msgstr "förkortningslängd utanför intervallet: %d" -#: config.c:1391 config.c:1402 +#: config.c:1375 config.c:1386 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:1494 +#: config.c:1476 msgid "core.commentChar should only be one character" msgstr "core.commentChar kan bara vara ett tecken" -#: config.c:1527 +#: config.c:1509 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1599 +#: config.c:1584 #, c-format msgid "malformed value for %s" msgstr "felformat värde för %s" -#: config.c:1625 +#: config.c:1610 #, c-format msgid "malformed value for %s: %s" msgstr "felformat värde för %s: %s" -#: config.c:1626 +#: config.c:1611 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:1687 builtin/pack-objects.c:3924 +#: config.c:1672 builtin/pack-objects.c:4053 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1809 +#: config.c:1795 #, c-format msgid "unable to load config blob object '%s'" msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\"" -#: config.c:1812 +#: config.c:1798 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referensen \"%s\" pekar inte på en blob" -#: config.c:1829 +#: config.c:1816 #, c-format msgid "unable to resolve config blob '%s'" msgstr "kan inte slå upp konfigurerings-bloben \"%s\"" -#: config.c:1873 +#: config.c:1861 #, c-format msgid "failed to parse %s" msgstr "kunde inte tolka %s" -#: config.c:1929 +#: config.c:1917 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:2293 +#: config.c:2285 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2467 +#: config.c:2459 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:2512 +#: config.c:2504 #, 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" +msgstr "" +"värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100" -#: config.c:2558 +#: config.c:2550 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2560 +#: config.c:2552 #, 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:2644 +#: config.c:2637 #, c-format msgid "invalid section name '%s'" msgstr "felaktigt sektionsnamn \"%s\"" -#: config.c:2676 +#: config.c:2669 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2705 +#: config.c:2698 #, c-format msgid "failed to write new configuration file %s" msgstr "kan inte skriva nya konfigurationsfilen \"%s\"" -#: config.c:2957 config.c:3283 +#: config.c:2950 config.c:3277 #, c-format msgid "could not lock config file %s" msgstr "kunde inte låsa konfigurationsfilen %s" -#: config.c:2968 +#: config.c:2961 #, c-format msgid "opening %s" msgstr "öppnar %s" -#: config.c:3005 builtin/config.c:361 +#: config.c:2998 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "ogiltigt mönster: %s" -#: config.c:3030 +#: config.c:3023 #, c-format msgid "invalid config file %s" msgstr "ogiltig konfigurationsfil: \"%s\"" -#: config.c:3043 config.c:3296 +#: config.c:3036 config.c:3290 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:3054 +#: config.c:3047 #, c-format -msgid "unable to mmap '%s'" -msgstr "kunde inte utföra mmap på \"%s\"" +msgid "unable to mmap '%s'%s" +msgstr "kunde inte utföra mmap på \"%s\"%s" -#: config.c:3063 config.c:3301 +#: config.c:3057 config.c:3295 #, c-format msgid "chmod on %s failed" msgstr "chmod misslyckades på %s" -#: config.c:3148 config.c:3398 +#: config.c:3142 config.c:3392 #, c-format msgid "could not write config file %s" msgstr "kunde inte skriva konfigurationsfilen %s" -#: config.c:3182 +#: config.c:3176 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" -#: config.c:3274 +#: config.c:3268 #, c-format msgid "invalid section name: %s" msgstr "felaktigt namn på stycke: %s" -#: config.c:3441 +#: config.c:3435 #, c-format msgid "missing value for '%s'" msgstr "värde saknas för \"%s\"" @@ -2851,72 +2858,72 @@ msgstr "servern stöder inte funktionen \"%s\"" msgid "expected flush after capabilities" msgstr "förväntade \"flush\" efter förmågor" -#: connect.c:263 +#: connect.c:265 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "ignorerar förmågor efter första raden \"%s\"" -#: connect.c:284 +#: connect.c:286 msgid "protocol error: unexpected capabilities^{}" msgstr "protokollfel: förväntade inte capabilities^{}" -#: connect.c:306 +#: connect.c:308 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "protokollfel: förväntade \"shallow sha-1\" fick \"%s\"" -#: connect.c:308 +#: connect.c:310 msgid "repository on the other end cannot be shallow" msgstr "arkivet på andra sidan kan inte vara grunt" -#: connect.c:347 +#: connect.c:349 msgid "invalid packet" msgstr "ogiltigt paket" -#: connect.c:367 +#: connect.c:369 #, c-format msgid "protocol error: unexpected '%s'" msgstr "protokollfel: förväntade inte \"%s\"" -#: connect.c:497 +#: connect.c:499 #, c-format msgid "unknown object format '%s' specified by server" msgstr "okänt objektformat \"%s\" angavs av servern" -#: connect.c:526 +#: connect.c:528 #, c-format msgid "invalid ls-refs response: %s" msgstr "ogiltigt svar på ls-refs: %s" -#: connect.c:530 +#: connect.c:532 msgid "expected flush after ref listing" msgstr "förväntade \"flush\" efter ref-listan" -#: connect.c:533 +#: connect.c:535 msgid "expected response end packet after ref listing" msgstr "förväntade svarsavslutningspaket efter ref-listan" -#: connect.c:666 +#: connect.c:670 #, c-format msgid "protocol '%s' is not supported" msgstr "protokollet \"%s\" stöds inte" -#: connect.c:717 +#: connect.c:721 msgid "unable to set SO_KEEPALIVE on socket" msgstr "kunde inte sätta SO_KEEPALIVE på uttaget" -#: connect.c:757 connect.c:820 +#: connect.c:761 connect.c:824 #, c-format msgid "Looking up %s ... " msgstr "Slår upp %s..." -#: connect.c:761 +#: connect.c:765 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "kan inte slå upp %s (port %s) (%s)" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:765 connect.c:836 +#: connect.c:769 connect.c:840 #, c-format msgid "" "done.\n" @@ -2925,7 +2932,7 @@ msgstr "" "klart.\n" "Ansluter till %s (port %s)..." -#: connect.c:787 connect.c:864 +#: connect.c:791 connect.c:868 #, c-format msgid "" "unable to connect to %s:\n" @@ -2935,79 +2942,79 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:793 connect.c:870 +#: connect.c:797 connect.c:874 msgid "done." msgstr "klart." -#: connect.c:824 +#: connect.c:828 #, c-format msgid "unable to look up %s (%s)" msgstr "kunde inte slå upp %s (%s)" -#: connect.c:830 +#: connect.c:834 #, c-format msgid "unknown port %s" msgstr "okänd port %s" -#: connect.c:967 connect.c:1299 +#: connect.c:971 connect.c:1303 #, c-format msgid "strange hostname '%s' blocked" msgstr "konstigt värdnamn \"%s\" blockerat" -#: connect.c:969 +#: connect.c:973 #, c-format msgid "strange port '%s' blocked" msgstr "konstig port \"%s\" blockerad" -#: connect.c:979 +#: connect.c:983 #, c-format msgid "cannot start proxy %s" msgstr "kan inte starta mellanserver (proxy) %s" -#: connect.c:1050 +#: connect.c:1054 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "ingen sökväg angavs; se \"git help pull\" för giltig URL-syntax" -#: connect.c:1190 +#: connect.c:1194 msgid "newline is forbidden in git:// hosts and repo paths" msgstr "radbrytningar är förbjudna i git://-värdnamn och arkivsökvägar" -#: connect.c:1247 +#: connect.c:1251 msgid "ssh variant 'simple' does not support -4" msgstr "ssh-varianten \"simple\" stöder inte -4" -#: connect.c:1259 +#: connect.c:1263 msgid "ssh variant 'simple' does not support -6" msgstr "ssh-varianten \"simple\" stöder inte -6" -#: connect.c:1276 +#: connect.c:1280 msgid "ssh variant 'simple' does not support setting port" msgstr "ssh-varianten \"simple\" stöder inte val av port" -#: connect.c:1388 +#: connect.c:1392 #, c-format msgid "strange pathname '%s' blocked" msgstr "konstigt sökvägsnamn \"%s\" blockerat" -#: connect.c:1436 +#: connect.c:1440 msgid "unable to fork" msgstr "kunde inte grena (fork)" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45 +#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" -#: connected.c:120 +#: connected.c:122 msgid "Could not run 'git rev-list'" msgstr "Kunde inte köra \"git rev-list\"" -#: connected.c:144 +#: connected.c:146 msgid "failed write to rev-list" msgstr "kunde inte skriva till rev-list" -#: connected.c:149 +#: connected.c:151 msgid "failed to close rev-list's stdin" msgstr "kunde inte stänga rev-list:s standard in" @@ -3116,7 +3123,7 @@ msgstr "oväntad filtertyp" msgid "path name too long for external filter" msgstr "sökvägen för lång för externt filter" -#: convert.c:934 +#: convert.c:935 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -3125,16 +3132,16 @@ msgstr "" "externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar " "inte har filtrerats" -#: convert.c:1234 +#: convert.c:1236 msgid "true/false are no valid working-tree-encodings" msgstr "true/false är inte giltig teckenkodning för arbetskatalogen" -#: convert.c:1414 convert.c:1447 +#: convert.c:1416 convert.c:1449 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: \"clean\"-filtret \"%s\" misslyckades" -#: convert.c:1490 +#: convert.c:1492 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades" @@ -3152,17 +3159,17 @@ msgstr "vägrar arbeta med inloggningsuppgifter utan värdfält" msgid "refusing to work with credential missing protocol field" msgstr "vägrar arbeta med inloggningsuppgifter utan protokollfält" -#: credential.c:394 +#: credential.c:395 #, c-format msgid "url contains a newline in its %s component: %s" msgstr "url innehåller radbrytning i komponenten %s: %s" -#: credential.c:438 +#: credential.c:439 #, c-format msgid "url has no scheme: %s" msgstr "url saknar protokoll: %s" -#: credential.c:511 +#: credential.c:512 #, c-format msgid "credential url cannot be parsed: %s" msgstr "kan inte tolka url för inloggingsuppgifter: %s" @@ -3259,36 +3266,36 @@ msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)" msgid "Marked %d islands, done.\n" msgstr "Markerade %d öar, klar.\n" -#: diff-merges.c:80 +#: diff-merges.c:70 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "okänt värde för --diff-merges: %s" -#: diff-lib.c:538 +#: diff-lib.c:561 msgid "--merge-base does not work with ranges" msgstr "--merge-base fungerar inte med intervall" -#: diff-lib.c:540 +#: diff-lib.c:563 msgid "--merge-base only works with commits" msgstr "--merge-base fungerar bara med incheckningar" -#: diff-lib.c:557 +#: diff-lib.c:580 msgid "unable to get HEAD" msgstr "kan inte hämta HEAD" -#: diff-lib.c:564 +#: diff-lib.c:587 msgid "no merge base found" msgstr "ingen sammanslagningsbas hittades" -#: diff-lib.c:566 +#: diff-lib.c:589 msgid "multiple merge bases found" msgstr "flera sammanslagningsbaser hittades" -#: diff-no-index.c:238 +#: diff-no-index.c:237 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<flaggor>] <sökväg> <sökväg>" -#: diff-no-index.c:263 +#: diff-no-index.c:262 msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" @@ -3296,25 +3303,25 @@ msgstr "" "Inte ett git-arkiv. Använd --no-index för att jämföra två sökvägar utanför " "en arbetskatalog." -#: diff.c:156 +#: diff.c:158 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n" -#: diff.c:161 +#: diff.c:163 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Okänd dirstat-parameter \"%s\"\n" -#: diff.c:297 +#: diff.c:299 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" msgstr "" "färginställningen för flyttade block måste vara en av \"no\", \"default\", " -"\"blocks\", \"zebra\", \"dimmed_zebra\", \"plain\"" +"\"blocks\", \"zebra\", \"dimmed-zebra\", \"plain\"" -#: diff.c:325 +#: diff.c:327 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " @@ -3324,7 +3331,7 @@ msgstr "" "\", \"ignore-space-at-eol\", \"ignore-all-space\", \"allow-indentation-change" "\"" -#: diff.c:333 +#: diff.c:335 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" @@ -3332,12 +3339,12 @@ msgstr "" "color-moved-ws: allow-indentation-change kan inte kombineras med andra " "blankstegslägen" -#: diff.c:410 +#: diff.c:412 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:470 +#: diff.c:472 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -3346,35 +3353,53 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:4278 +#: diff.c:4237 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:4630 -msgid "--name-only, --name-status, --check and -s are mutually exclusive" -msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" +#: diff.c:4589 +#, c-format +msgid "options '%s', '%s', '%s', and '%s' cannot be used together" +msgstr "" +"flaggorna \"%s\", \"%s\", \"%s\" och \"%s\" kan inte användas samtidigt" -#: diff.c:4633 -msgid "-G, -S and --find-object are mutually exclusive" -msgstr "-G, -S och --find-object är ömsesidigt uteslutande" +#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506 +#, c-format +msgid "options '%s', '%s', and '%s' cannot be used together" +msgstr "flaggorna \"%s\", \"%s\" och \"%s\" kan inte användas samtidigt" -#: diff.c:4712 +#: diff.c:4597 +#, c-format +msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'" +msgstr "" +"flaggorna \"%s\" och \"%s\" kan inte användas samtidigt, använd \"%s\" med " +"\"%s\"" + +#: diff.c:4601 +#, c-format +msgid "" +"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'" +msgstr "" +"flaggorna \"%s\" och \"%s\" kan inte användas samtidigt, använd \"%s\" med " +"\"%s\" och \"%s\"" + +#: diff.c:4681 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:4760 +#: diff.c:4729 #, c-format msgid "invalid --stat value: %s" msgstr "ogiltigt värde för --stat: %s" -#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308 -#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 +#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277 +#: parse-options.c:217 parse-options.c:221 #, c-format msgid "%s expects a numerical value" msgstr "%s förväntar ett numeriskt värde" -#: diff.c:4797 +#: diff.c:4766 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3383,42 +3408,42 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:4882 +#: diff.c:4851 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s" -#: diff.c:4906 +#: diff.c:4875 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "okänt värde efter ws-error-highlight=%.*s" -#: diff.c:4920 +#: diff.c:4889 #, c-format msgid "unable to resolve '%s'" msgstr "kunde inte slå upp \"%s\"" -#: diff.c:4970 diff.c:4976 +#: diff.c:4939 diff.c:4945 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s förväntar formen <n>/<m>" -#: diff.c:4988 +#: diff.c:4957 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s förväntar ett tecken, fick \"%s\"" -#: diff.c:5009 +#: diff.c:4978 #, c-format msgid "bad --color-moved argument: %s" msgstr "felaktigt argument till --color-moved: %s" -#: diff.c:5028 +#: diff.c:4997 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "ogiltigt läge %s\" i --color-moved-ws" -#: diff.c:5068 +#: diff.c:5037 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3426,154 +3451,154 @@ msgstr "" "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och " "\"histogram\"" -#: diff.c:5104 diff.c:5124 +#: diff.c:5073 diff.c:5093 #, c-format msgid "invalid argument to %s" msgstr "ogiltigt argument för %s" -#: diff.c:5228 +#: diff.c:5197 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\"" -#: diff.c:5277 +#: diff.c:5246 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:5333 +#: diff.c:5302 #, c-format msgid "bad --word-diff argument: %s" msgstr "felaktigt argument --word-diff: %s" -#: diff.c:5369 +#: diff.c:5338 msgid "Diff output format options" msgstr "Formatflaggor för diff-utdata" -#: diff.c:5371 diff.c:5377 +#: diff.c:5340 diff.c:5346 msgid "generate patch" msgstr "skapar patch" -#: diff.c:5374 builtin/log.c:179 +#: diff.c:5343 builtin/log.c:179 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: diff.c:5379 diff.c:5493 diff.c:5500 +#: diff.c:5348 diff.c:5462 diff.c:5469 msgid "<n>" msgstr "<n>" -#: diff.c:5380 diff.c:5383 +#: diff.c:5349 diff.c:5352 msgid "generate diffs with <n> lines context" msgstr "skapa diffar med <n> rader sammanhang" -#: diff.c:5385 +#: diff.c:5354 msgid "generate the diff in raw format" msgstr "generera diff i råformat" -#: diff.c:5388 +#: diff.c:5357 msgid "synonym for '-p --raw'" msgstr "synonym till \"-p --raw\"" -#: diff.c:5392 +#: diff.c:5361 msgid "synonym for '-p --stat'" msgstr "synonym till \"-p --stat\"" -#: diff.c:5396 +#: diff.c:5365 msgid "machine friendly --stat" msgstr "maskinläsbar --stat" -#: diff.c:5399 +#: diff.c:5368 msgid "output only the last line of --stat" msgstr "skriv bara ut den sista raden för --stat" -#: diff.c:5401 diff.c:5409 +#: diff.c:5370 diff.c:5378 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5402 +#: diff.c:5371 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "skriv ut distributionen av relativa mängder ändringar för varje underkatalog" -#: diff.c:5406 +#: diff.c:5375 msgid "synonym for --dirstat=cumulative" msgstr "synonym för --dirstat=cumulative" -#: diff.c:5410 +#: diff.c:5379 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonym för --dirstat=filer,param1,param2..." -#: diff.c:5414 +#: diff.c:5383 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel" -#: diff.c:5417 +#: diff.c:5386 msgid "condensed summary such as creations, renames and mode changes" msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen" -#: diff.c:5420 +#: diff.c:5389 msgid "show only names of changed files" msgstr "visa endast namnen på ändrade filer" -#: diff.c:5423 +#: diff.c:5392 msgid "show only names and status of changed files" msgstr "visa endast namn och status för ändrade filer" -#: diff.c:5425 +#: diff.c:5394 msgid "<width>[,<name-width>[,<count>]]" msgstr "<bredd>[,<namn-bredd>[,<antal>]]" -#: diff.c:5426 +#: diff.c:5395 msgid "generate diffstat" msgstr "skapa diffstat" -#: diff.c:5428 diff.c:5431 diff.c:5434 +#: diff.c:5397 diff.c:5400 diff.c:5403 msgid "<width>" msgstr "<bredd>" -#: diff.c:5429 +#: diff.c:5398 msgid "generate diffstat with a given width" msgstr "generera en diffstat med given bredd" -#: diff.c:5432 +#: diff.c:5401 msgid "generate diffstat with a given name width" msgstr "generera en diffstat med given namnbredd" -#: diff.c:5435 +#: diff.c:5404 msgid "generate diffstat with a given graph width" msgstr "generera en diffstat med given grafbredd" -#: diff.c:5437 +#: diff.c:5406 msgid "<count>" msgstr "<antal>" -#: diff.c:5438 +#: diff.c:5407 msgid "generate diffstat with limited lines" msgstr "generera diffstat med begränsade rader" -#: diff.c:5441 +#: diff.c:5410 msgid "generate compact summary in diffstat" msgstr "skapa kompakt översikt i diffstat" -#: diff.c:5444 +#: diff.c:5413 msgid "output a binary diff that can be applied" msgstr "skapa en binärdiff som kan appliceras" -#: diff.c:5447 +#: diff.c:5416 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "visa fullständiga objektnamn i \"index\"-rader för läget både före och efter" -#: diff.c:5449 +#: diff.c:5418 msgid "show colored diff" msgstr "visa färgad diff" -#: diff.c:5450 +#: diff.c:5419 msgid "<kind>" msgstr "<typ>" -#: diff.c:5451 +#: diff.c:5420 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3581,7 +3606,7 @@ msgstr "" "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller " "\"new\" (nya) rader i diffen" -#: diff.c:5454 +#: diff.c:5423 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3589,87 +3614,87 @@ msgstr "" "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw " "eller --numstat" -#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572 +#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541 msgid "<prefix>" msgstr "<prefix>" -#: diff.c:5458 +#: diff.c:5427 msgid "show the given source prefix instead of \"a/\"" msgstr "visa givet källprefix istället för \"a/\"" -#: diff.c:5461 +#: diff.c:5430 msgid "show the given destination prefix instead of \"b/\"" msgstr "visa givet målprefix istället för \"b/\"" -#: diff.c:5464 +#: diff.c:5433 msgid "prepend an additional prefix to every line of output" msgstr "lägg till ytterligare prefix på alla rader i utdata" -#: diff.c:5467 +#: diff.c:5436 msgid "do not show any source or destination prefix" msgstr "visa inte käll- eller målprefix" -#: diff.c:5470 +#: diff.c:5439 msgid "show context between diff hunks up to the specified number of lines" msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader" -#: diff.c:5474 diff.c:5479 diff.c:5484 +#: diff.c:5443 diff.c:5448 diff.c:5453 msgid "<char>" msgstr "<tecken>" -#: diff.c:5475 +#: diff.c:5444 msgid "specify the character to indicate a new line instead of '+'" msgstr "ange tecken för att ange ny rad istället för \"+\"" -#: diff.c:5480 +#: diff.c:5449 msgid "specify the character to indicate an old line instead of '-'" msgstr "ange tecken för att ange gammal rad istället för \"-\"" -#: diff.c:5485 +#: diff.c:5454 msgid "specify the character to indicate a context instead of ' '" msgstr "ange tecken för att ange sammanhang istället för \" \"" -#: diff.c:5488 +#: diff.c:5457 msgid "Diff rename options" msgstr "Diff-namnbytesflaggor" -#: diff.c:5489 +#: diff.c:5458 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5490 +#: diff.c:5459 msgid "break complete rewrite changes into pairs of delete and create" msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par" -#: diff.c:5494 +#: diff.c:5463 msgid "detect renames" msgstr "detektera namnändringar" -#: diff.c:5498 +#: diff.c:5467 msgid "omit the preimage for deletes" msgstr "ta bort för-version för borttagningar" -#: diff.c:5501 +#: diff.c:5470 msgid "detect copies" msgstr "detektera kopior" -#: diff.c:5505 +#: diff.c:5474 msgid "use unmodified files as source to find copies" msgstr "använd oförändrade som källa för att hitta kopior" -#: diff.c:5507 +#: diff.c:5476 msgid "disable rename detection" msgstr "inaktivera detektering av namnbyten" -#: diff.c:5510 +#: diff.c:5479 msgid "use empty blobs as rename source" msgstr "använd tomma blob:ar som namnändringskälla" -#: diff.c:5512 +#: diff.c:5481 msgid "continue listing the history of a file beyond renames" msgstr "fortsätt lista historiken för en fil bortom namnändringar" -#: diff.c:5515 +#: diff.c:5484 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3677,163 +3702,163 @@ msgstr "" "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver " "given gräns" -#: diff.c:5517 +#: diff.c:5486 msgid "Diff algorithm options" msgstr "Alternativ för diff-algoritm" -#: diff.c:5519 +#: diff.c:5488 msgid "produce the smallest possible diff" msgstr "skapa minsta möjliga diff" -#: diff.c:5522 +#: diff.c:5491 msgid "ignore whitespace when comparing lines" msgstr "ignorera blanktecken vid radjämförelse" -#: diff.c:5525 +#: diff.c:5494 msgid "ignore changes in amount of whitespace" msgstr "ignorera ändringar i antal blanktecken vid radjämförelse" -#: diff.c:5528 +#: diff.c:5497 msgid "ignore changes in whitespace at EOL" msgstr "ignorera blanktecken vid radslut" -#: diff.c:5531 +#: diff.c:5500 msgid "ignore carrier-return at the end of line" msgstr "ignorera CR-tecken vid radslut" -#: diff.c:5534 +#: diff.c:5503 msgid "ignore changes whose lines are all blank" msgstr "ignorera ändringar i rader som är helt blanka" -#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606 +#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575 msgid "<regex>" msgstr "<reguttr>" -#: diff.c:5537 +#: diff.c:5506 msgid "ignore changes whose all lines match <regex>" msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>" -#: diff.c:5540 +#: diff.c:5509 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "heuristik för att flytta diff-gränser för lättare läsning" -#: diff.c:5543 +#: diff.c:5512 msgid "generate diff using the \"patience diff\" algorithm" msgstr "skapa diffar med algoritmen \"patience diff\"" -#: diff.c:5547 +#: diff.c:5516 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "skapa diffar med algoritmen \"histogram diff\"" -#: diff.c:5549 +#: diff.c:5518 msgid "<algorithm>" msgstr "<algoritm>" -#: diff.c:5550 +#: diff.c:5519 msgid "choose a diff algorithm" msgstr "välj en diff-algoritm" -#: diff.c:5552 +#: diff.c:5521 msgid "<text>" msgstr "<text>" -#: diff.c:5553 +#: diff.c:5522 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "skapa diffar med algoritmen \"anchored diff\"" -#: diff.c:5555 diff.c:5564 diff.c:5567 +#: diff.c:5524 diff.c:5533 diff.c:5536 msgid "<mode>" msgstr "<läge>" -#: diff.c:5556 +#: diff.c:5525 msgid "show word diff, using <mode> to delimit changed words" msgstr "visa orddiff, där <läge> avgränsar ändrade ord" -#: diff.c:5559 +#: diff.c:5528 msgid "use <regex> to decide what a word is" msgstr "använd <reguttr> för att bestämma vad som är ett ord" -#: diff.c:5562 +#: diff.c:5531 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>" -#: diff.c:5565 +#: diff.c:5534 msgid "moved lines of code are colored differently" msgstr "flyttade kodrader färgas på annat sätt" -#: diff.c:5568 +#: diff.c:5537 msgid "how white spaces are ignored in --color-moved" msgstr "hur blanktecken ignoreras i --color-moved" -#: diff.c:5571 +#: diff.c:5540 msgid "Other diff options" msgstr "Andra diff-flaggor" -#: diff.c:5573 +#: diff.c:5542 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "vid start från underkatalog, uteslut ändringar utanför och visa relativa " "sökvägar" -#: diff.c:5577 +#: diff.c:5546 msgid "treat all files as text" msgstr "hantera alla filer som text" -#: diff.c:5579 +#: diff.c:5548 msgid "swap two inputs, reverse the diff" msgstr "växla två indatafiler, vänd diffen" -#: diff.c:5581 +#: diff.c:5550 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "avsluta med 1 vid ändringar, annars 0" -#: diff.c:5583 +#: diff.c:5552 msgid "disable all output of the program" msgstr "slå av alla utdata från programmet" -#: diff.c:5585 +#: diff.c:5554 msgid "allow an external diff helper to be executed" msgstr "tillåt köra en extern diff-hjälpare" -#: diff.c:5587 +#: diff.c:5556 msgid "run external text conversion filters when comparing binary files" msgstr "kör externt textkonverteringsfiler när binärfiler jämförs" -#: diff.c:5589 +#: diff.c:5558 msgid "<when>" msgstr "<när>" -#: diff.c:5590 +#: diff.c:5559 msgid "ignore changes to submodules in the diff generation" msgstr "ignorera ändringar i undermoduler när diffen skapas" -#: diff.c:5593 +#: diff.c:5562 msgid "<format>" msgstr "<format>" -#: diff.c:5594 +#: diff.c:5563 msgid "specify how differences in submodules are shown" msgstr "ange hur ändringar i undermoduler visas" -#: diff.c:5598 +#: diff.c:5567 msgid "hide 'git add -N' entries from the index" msgstr "dölj \"git add -N\"-poster från indexet" -#: diff.c:5601 +#: diff.c:5570 msgid "treat 'git add -N' entries as real in the index" msgstr "tolka \"git add -N\"-poster som äkta i indexet" -#: diff.c:5603 +#: diff.c:5572 msgid "<string>" msgstr "<sträng>" -#: diff.c:5604 +#: diff.c:5573 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng" -#: diff.c:5607 +#: diff.c:5576 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3841,66 +3866,66 @@ msgstr "" "se efter ändringar som ändrar antalet förekomster av angivet reguljärt " "uttryck" -#: diff.c:5610 +#: diff.c:5579 msgid "show all changes in the changeset with -S or -G" msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G" -#: diff.c:5613 +#: diff.c:5582 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck" -#: diff.c:5616 +#: diff.c:5585 msgid "control the order in which files appear in the output" msgstr "styr ordningen i vilken filer visas i utdata" -#: diff.c:5617 diff.c:5620 +#: diff.c:5586 diff.c:5589 msgid "<path>" msgstr "<sökväg>" -#: diff.c:5618 +#: diff.c:5587 msgid "show the change in the specified path first" msgstr "visa ändringen i angiven sökväg först" -#: diff.c:5621 +#: diff.c:5590 msgid "skip the output to the specified path" msgstr "hoppa över utdata fram till angiven sökväg" -#: diff.c:5623 +#: diff.c:5592 msgid "<object-id>" msgstr "<objekt-id>" -#: diff.c:5624 +#: diff.c:5593 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt" -#: diff.c:5626 +#: diff.c:5595 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5627 +#: diff.c:5596 msgid "select files by diff type" msgstr "välj filter efter diff-typ" -#: diff.c:5629 +#: diff.c:5598 msgid "<file>" msgstr "<fil>" -#: diff.c:5630 +#: diff.c:5599 msgid "Output to a specific file" msgstr "Skriv utdata till en specifik fil" -#: diff.c:6287 -msgid "inexact rename detection was skipped due to too many files." +#: diff.c:6257 +msgid "exhaustive rename detection was skipped due to too many files." msgstr "" -"onöjaktig namnbytesdetektering utfördes inte på grund av för många filer." +"uttömmande namnbytesdetektering hoppades över på grund av för många filer." -#: diff.c:6290 +#: diff.c:6260 msgid "only found copies from modified paths due to too many files." msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer." -#: diff.c:6293 +#: diff.c:6263 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3912,7 +3937,7 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "kunde inte läsa orderfilen \"%s\"" -#: diffcore-rename.c:1418 +#: diffcore-rename.c:1564 msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" @@ -3921,61 +3946,69 @@ msgstr "Utför onöjaktig namnbytesdetektering" msgid "No such path '%s' in the diff" msgstr "Sökvägen \"%s\" finns inte i diffen" -#: dir.c:578 +#: dir.c:593 #, 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:718 dir.c:747 dir.c:760 +#: dir.c:733 dir.c:762 dir.c:775 #, c-format msgid "unrecognized pattern: '%s'" msgstr "okänt mönster: %s" -#: dir.c:777 dir.c:791 +#: dir.c:790 dir.c:804 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "okänt negativt mönster: %s" -#: dir.c:809 +#: dir.c:820 #, 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:819 +#: dir.c:828 msgid "disabling cone pattern matching" msgstr "inaktiverar konmönstermatchning" -#: dir.c:1206 +#: dir.c:1212 #, c-format msgid "cannot use %s as an exclude file" msgstr "kan inte använda %s som exkluderingsfil" -#: dir.c:2314 +#: dir.c:2418 #, c-format msgid "could not open directory '%s'" msgstr "kunde inte öppna katalogen \"%s\"" -#: dir.c:2614 +#: dir.c:2720 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:2738 +#: dir.c:2844 msgid "untracked cache is disabled on this system or location" msgstr "ospårad cache är inaktiverad på systemet eller platsen" -#: dir.c:3543 +#: dir.c:3112 +msgid "" +"No directory name could be guessed.\n" +"Please specify a directory on the command line" +msgstr "" +"Kunde inte gissa katalognamn.\n" +"Ange en katalog på kommandoraden" + +#: dir.c:3800 #, c-format msgid "index file corrupt in repo %s" msgstr "indexfilen trasig i arkivet %s" -#: dir.c:3590 dir.c:3595 +#: dir.c:3847 dir.c:3852 #, c-format msgid "could not create directories for %s" msgstr "kunde inte skapa kataloger för %s" -#: dir.c:3624 +#: dir.c:3881 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" @@ -3994,294 +4027,360 @@ msgstr "Filtrerar innehåll" msgid "could not stat file '%s'" msgstr "kunde inte ta status på filen \"%s\"" -#: environment.c:152 +#: environment.c:145 #, c-format msgid "bad git namespace path \"%s\"" msgstr "felaktig git-namnrymdssökväg \"%s\"" -#: environment.c:335 -#, c-format -msgid "could not set GIT_DIR to '%s'" -msgstr "kunde inte ställa in GIT_DIR till \"%s\"" - #: exec-cmd.c:363 #, c-format msgid "too many args to run %s" msgstr "för många flaggor för att köra %s" -#: fetch-pack.c:182 +#: fetch-pack.c:194 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: förväntade grund lista" -#: fetch-pack.c:185 +#: fetch-pack.c:197 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista" -#: fetch-pack.c:196 +#: fetch-pack.c:208 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket" -#: fetch-pack.c:216 +#: fetch-pack.c:228 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\"" -#: fetch-pack.c:227 +#: fetch-pack.c:239 msgid "unable to write to remote" msgstr "kunde inte skriva till fjärren" -#: fetch-pack.c:288 -msgid "--stateless-rpc requires multi_ack_detailed" -msgstr "--stateless-rpc kräver \"multi_ack_detailed\"" - -#: fetch-pack.c:383 fetch-pack.c:1423 +#: fetch-pack.c:395 fetch-pack.c:1439 #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" -#: fetch-pack.c:389 fetch-pack.c:1429 +#: fetch-pack.c:401 fetch-pack.c:1445 #, c-format msgid "invalid unshallow line: %s" msgstr "ogiltig \"unshallow\"-rad: %s" -#: fetch-pack.c:391 fetch-pack.c:1431 +#: fetch-pack.c:403 fetch-pack.c:1447 #, c-format msgid "object not found: %s" msgstr "objektet hittades inte: %s" -#: fetch-pack.c:394 fetch-pack.c:1434 +#: fetch-pack.c:406 fetch-pack.c:1450 #, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" -#: fetch-pack.c:396 fetch-pack.c:1436 +#: fetch-pack.c:408 fetch-pack.c:1452 #, c-format msgid "no shallow found: %s" msgstr "ingen \"shallow\" hittades: %s" -#: fetch-pack.c:399 fetch-pack.c:1440 +#: fetch-pack.c:411 fetch-pack.c:1456 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "förväntade shallow/unshallow, fick %s" -#: fetch-pack.c:439 +#: fetch-pack.c:451 #, c-format msgid "got %s %d %s" msgstr "fick %s %d %s" -#: fetch-pack.c:456 +#: fetch-pack.c:468 #, c-format msgid "invalid commit %s" msgstr "ogiltig incheckning %s" -#: fetch-pack.c:487 +#: fetch-pack.c:499 msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:500 progress.c:339 +#: fetch-pack.c:512 progress.c:339 msgid "done" msgstr "klart" -#: fetch-pack.c:512 +#: fetch-pack.c:524 #, c-format msgid "got %s (%d) %s" msgstr "fick %s (%d) %s" -#: fetch-pack.c:548 +#: fetch-pack.c:560 #, c-format msgid "Marking %s as complete" msgstr "Markerar %s som komplett" -#: fetch-pack.c:763 +#: fetch-pack.c:775 #, c-format msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:849 +#: fetch-pack.c:861 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:857 +#: fetch-pack.c:869 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:951 +#: fetch-pack.c:965 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-patch: kunde inte grena av %s" -#: fetch-pack.c:957 +#: fetch-pack.c:971 msgid "fetch-pack: invalid index-pack output" msgstr "fetch-patch: ogiltig utdata från index-pack" -#: fetch-pack.c:974 +#: fetch-pack.c:988 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:976 +#: fetch-pack.c:990 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:1019 +#: fetch-pack.c:1035 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042 -#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058 #: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 -#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096 +#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090 +#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112 #, c-format msgid "Server supports %s" msgstr "Servern stöder %s" -#: fetch-pack.c:1029 +#: fetch-pack.c:1045 msgid "Server does not support shallow clients" msgstr "Servern stöder inte klienter med grunda arkiv" -#: fetch-pack.c:1089 +#: fetch-pack.c:1105 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:1094 +#: fetch-pack.c:1110 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:1098 +#: fetch-pack.c:1114 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:1100 +#: fetch-pack.c:1116 msgid "Server does not support this repository's object format" msgstr "Servern stöder inte det här arkivets objektformat" -#: fetch-pack.c:1113 +#: fetch-pack.c:1129 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238 +#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130 msgid "source repository is shallow, reject to clone." msgstr "källarkivet är grunt, tillåter inte kloning." -#: fetch-pack.c:1128 fetch-pack.c:1651 +#: fetch-pack.c:1144 fetch-pack.c:1681 msgid "git fetch-pack: fetch failed." -msgstr "git fetch-patch: hämtning misslyckades." +msgstr "git fetch-pack: hämtning misslyckades." -#: fetch-pack.c:1242 +#: fetch-pack.c:1258 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "omaka algoritmer: klient %s; server %s" -#: fetch-pack.c:1246 +#: fetch-pack.c:1262 #, c-format msgid "the server does not support algorithm '%s'" msgstr "servern stöder inte algoritmen \"%s\"" -#: fetch-pack.c:1279 +#: fetch-pack.c:1295 msgid "Server does not support shallow requests" msgstr "Servern stöder inte grunda förfrågningar" -#: fetch-pack.c:1286 +#: fetch-pack.c:1302 msgid "Server supports filter" msgstr "Servern stöder filter" -#: fetch-pack.c:1329 fetch-pack.c:2034 +#: fetch-pack.c:1345 fetch-pack.c:2063 msgid "unable to write request to remote" msgstr "kunde inte skriva anrop till fjärren" -#: fetch-pack.c:1347 +#: fetch-pack.c:1363 #, c-format msgid "error reading section header '%s'" msgstr "fel vid läsning av styckehuvudet \"%s\"" -#: fetch-pack.c:1353 +#: fetch-pack.c:1369 #, c-format msgid "expected '%s', received '%s'" msgstr "förväntade \"%s\", tog emot \"%s\"" -#: fetch-pack.c:1387 +#: fetch-pack.c:1403 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "oväntad bekräftelserad: \"%s\"" -#: fetch-pack.c:1392 +#: fetch-pack.c:1408 #, c-format msgid "error processing acks: %d" msgstr "fel vid hantering av bekräftelser: %d" -#: fetch-pack.c:1402 +#: fetch-pack.c:1418 msgid "expected packfile to be sent after 'ready'" msgstr "väntade att paketfil skulle sändas efter \"ready\"" -#: fetch-pack.c:1404 +#: fetch-pack.c:1420 msgid "expected no other sections to be sent after no 'ready'" msgstr "" "väntade inte att några ytterligare sektioner skulle sändas efter \"ready\"" -#: fetch-pack.c:1445 +#: fetch-pack.c:1461 #, c-format msgid "error processing shallow info: %d" msgstr "fel vid hantering av grund (\"shallow\") info: %d" -#: fetch-pack.c:1494 +#: fetch-pack.c:1510 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "förväntade wanted-ref, fick %s" -#: fetch-pack.c:1499 +#: fetch-pack.c:1515 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "oväntad wanted-ref: \"%s\"" -#: fetch-pack.c:1504 +#: fetch-pack.c:1520 #, c-format msgid "error processing wanted refs: %d" msgstr "fel vid hantering av önskade referenser: %d" -#: fetch-pack.c:1534 +#: fetch-pack.c:1550 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: förväntade svarsavslutningspaket" -#: fetch-pack.c:1930 +#: fetch-pack.c:1959 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1953 builtin/clone.c:697 +#: fetch-pack.c:1982 builtin/clone.c:581 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: fetch-pack.c:2056 +#: fetch-pack.c:2085 msgid "unexpected 'ready' from remote" msgstr "oväntat \"ready\" från fjärr" -#: fetch-pack.c:2079 +#: fetch-pack.c:2108 #, c-format msgid "no such remote ref %s" msgstr "ingen sådan fjärreferens: %s" -#: fetch-pack.c:2082 +#: fetch-pack.c:2111 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s" -#: gpg-interface.c:273 +#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974 +#: gpg-interface.c:990 msgid "could not create temporary file" msgstr "kunde inte skapa temporära fil" -#: gpg-interface.c:276 +#: gpg-interface.c:332 gpg-interface.c:460 #, c-format msgid "failed writing detached signature to '%s'" msgstr "misslyckades skriva fristående signatur till \"%s\"" -#: gpg-interface.c:470 +#: gpg-interface.c:451 +msgid "" +"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh " +"signature verification" +msgstr "" +"gpg.ssh.allowedSignersFile måste ställas in och finnas för att bekräfta ssh-" +"signaturer" + +#: gpg-interface.c:480 +msgid "" +"ssh-keygen -Y find-principals/verify is needed for ssh signature " +"verification (available in openssh version 8.2p1+)" +msgstr "" +"\"ssh-keygen -Y find-principals/verify\" behövs för att bekräfta ssh-" +"signaturer (tillgängligt i openssh version 8.2p1+)" + +#: gpg-interface.c:536 +#, c-format +msgid "ssh signing revocation file configured but not found: %s" +msgstr "återkallningsfilen för ssh-signering inställd men saknas: %s" + +#: gpg-interface.c:624 +#, c-format +msgid "bad/incompatible signature '%s'" +msgstr "felaktig/inkompatibel signatur \"%s\"" + +#: gpg-interface.c:801 gpg-interface.c:806 +#, c-format +msgid "failed to get the ssh fingerprint for key '%s'" +msgstr "misslyckades hämta ssh-fingeravtrycket för nyckeln \"%s\"" + +#: gpg-interface.c:829 +msgid "" +"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" +msgstr "" +"måste konfigurera antingen user.signingkey eller gpg.ssh.defaultKeyCommand" + +#: gpg-interface.c:851 +#, c-format +msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" +msgstr "gpg.ssh.defaultKeyCommand lyckades men gav inga nycklar: %s %s" + +#: gpg-interface.c:857 +#, c-format +msgid "gpg.ssh.defaultKeyCommand failed: %s %s" +msgstr "gpg.ssh.defaultKeyCommand misslyckades: %s %s" + +#: gpg-interface.c:945 msgid "gpg failed to sign the data" msgstr "gpg misslyckades signera data" +#: gpg-interface.c:967 +msgid "user.signingkey needs to be set for ssh signing" +msgstr "user.signingkey måste anges för ssh-signering" + +#: gpg-interface.c:978 +#, c-format +msgid "failed writing ssh signing key to '%s'" +msgstr "misslyckades skriva ssh-signeringsnyckel till \"%s\"" + +#: gpg-interface.c:996 +#, c-format +msgid "failed writing ssh signing key buffer to '%s'" +msgstr "misslyckades skriva ssh-signeringsnyckelbuffert till \"%s\"" + +#: gpg-interface.c:1014 +msgid "" +"ssh-keygen -Y sign is needed for ssh signing (available in openssh version " +"8.2p1+)" +msgstr "" +"\"ssh-keygen -Y sign\" behövs för ssh-signering (tillgängligt i openssh " +"version 8.2p1+)" + +#: gpg-interface.c:1026 +#, c-format +msgid "failed reading ssh signing data buffer from '%s'" +msgstr "misslyckades läsa ssh-signeringsdatabuffert från \"%s\"" + #: graph.c:98 #, c-format -msgid "ignore invalid color '%.*s' in log.graphColors" -msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors" +msgid "ignored invalid color '%.*s' in log.graphColors" +msgstr "ignorerade felaktig färg \"%.*s\" i log.graphColors" #: grep.c:531 msgid "" @@ -4291,109 +4390,109 @@ msgstr "" "angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -" "P under PCRE v2" -#: grep.c:1893 +#: grep.c:1942 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90 #: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:1921 +#: grep.c:1970 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" -#: help.c:23 +#: help.c:24 msgid "start a working area (see also: git help tutorial)" msgstr "starta arbetskatalog (se också: git help tutorial)" -#: help.c:24 +#: help.c:25 msgid "work on the current change (see also: git help everyday)" msgstr "jobba med aktuell förändring (se också: git help everyday)" -#: help.c:25 +#: help.c:26 msgid "examine the history and state (see also: git help revisions)" msgstr "utforska historiken och tillståndet (se också: git help revisions)" -#: help.c:26 +#: help.c:27 msgid "grow, mark and tweak your common history" msgstr "utöka, markera och justera din gemensamma historik" -#: help.c:27 +#: help.c:28 msgid "collaborate (see also: git help workflows)" msgstr "samarbeta (se också: git help workflows)" -#: help.c:31 +#: help.c:32 msgid "Main Porcelain Commands" msgstr "Huvudsakliga porslinskommandon" -#: help.c:32 +#: help.c:33 msgid "Ancillary Commands / Manipulators" msgstr "Tilläggskommandon / manipulerare" -#: help.c:33 +#: help.c:34 msgid "Ancillary Commands / Interrogators" msgstr "Tilläggskommandon / frågare" -#: help.c:34 +#: help.c:35 msgid "Interacting with Others" msgstr "Interaktion med andra" -#: help.c:35 +#: help.c:36 msgid "Low-level Commands / Manipulators" msgstr "Lågnivåkommandon / maniupulerare" -#: help.c:36 +#: help.c:37 msgid "Low-level Commands / Interrogators" msgstr "Lågnivåkommandon / frågare" -#: help.c:37 +#: help.c:38 msgid "Low-level Commands / Syncing Repositories" msgstr "Lågnivåkommandon / synka arkiv" -#: help.c:38 +#: help.c:39 msgid "Low-level Commands / Internal Helpers" msgstr "Lågnivåkommandon / interna hjälpare" -#: help.c:300 +#: help.c:313 #, c-format msgid "available git commands in '%s'" msgstr "git-kommandon tillgängliga i \"%s\"" -#: help.c:307 +#: help.c:320 msgid "git commands available from elsewhere on your $PATH" msgstr "git-kommandon från andra platser i din $PATH" -#: help.c:316 +#: help.c:329 msgid "These are common Git commands used in various situations:" msgstr "Dessa vanliga Git-kommandon används i olika situationer:" -#: help.c:365 git.c:100 +#: help.c:378 git.c:100 #, c-format msgid "unsupported command listing type '%s'" msgstr "okänd kommandolisttyp \"%s\"" -#: help.c:405 +#: help.c:418 msgid "The Git concept guides are:" msgstr "Vägledningar för Git-koncept:" -#: help.c:429 +#: help.c:442 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "Se \"git help <kommando>\" för att läsa om ett specifikt underkommando" -#: help.c:434 +#: help.c:447 msgid "External commands" msgstr "Externa kommandon" -#: help.c:449 +#: help.c:462 msgid "Command aliases" msgstr "Kommadoalias" -#: help.c:527 +#: help.c:543 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -4402,32 +4501,37 @@ msgstr "" "\"%s\" verkar vara ett git-kommando, men vi kan inte\n" "köra det. Kanske git-%s är trasigt?" -#: help.c:543 help.c:631 +#: help.c:565 help.c:662 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"." -#: help.c:591 +#: help.c:613 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls." -#: help.c:613 +#: help.c:635 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns." -#: help.c:618 +#: help.c:640 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Fortsätter under förutsättningen att du menade \"%s\"." -#: help.c:623 +#: help.c:646 +#, c-format +msgid "Run '%s' instead [y/N]? " +msgstr "Köra \"%s\" istället (j/N)?" + +#: help.c:654 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" "Fortsätter om %0.1f sekunder, under förutsättningen att du menade \"%s\"." -#: help.c:635 +#: help.c:666 msgid "" "\n" "The most similar command is" @@ -4441,16 +4545,16 @@ msgstr[1] "" "\n" "Mest lika kommandon är" -#: help.c:675 +#: help.c:706 msgid "git version [<options>]" msgstr "git version [<flaggor>]" -#: help.c:730 +#: help.c:761 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:734 +#: help.c:765 msgid "" "\n" "Did you mean this?" @@ -4464,6 +4568,15 @@ msgstr[1] "" "\n" "Menade du ett av dessa?" +#: hook.c:27 +#, c-format +msgid "" +"The '%s' hook was ignored because it's not set as executable.\n" +"You can disable this warning with `git config advice.ignoredHook false`." +msgstr "" +"Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n" +"Du kan inaktivera varningen med \"git config advice.ignoredHook false\"." + #: ident.c:353 msgid "Author identity unknown\n" msgstr "Författar-identitet okänd\n" @@ -4526,7 +4639,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:454 builtin/commit.c:647 +#: ident.c:454 builtin/commit.c:648 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" @@ -4541,7 +4654,7 @@ msgstr "sparse:sökväg-filter stöds inte längre" #: list-objects-filter-options.c:105 #, c-format -msgid "'%s' for 'object:type=<type>' isnot a valid object type" +msgid "'%s' for 'object:type=<type>' is not a valid object type" msgstr "\"%s\" för \"object:type=<typ>\" är inte en giltig objekttyp" #: list-objects-filter-options.c:124 @@ -4586,7 +4699,7 @@ msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd" msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "posten \"%s\" i trädet %s har blob-läge, men är inte en blob" -#: list-objects.c:395 +#: list-objects.c:398 #, c-format msgid "unable to load root tree for commit %s" msgstr "kunde inte läsa in rot-trädet för incheckningen %s" @@ -4621,7 +4734,12 @@ msgstr "Kunde inte skapa \"%s.lock\": %s" msgid "invalid value '%s' for lsrefs.unborn" msgstr "ogiltigt värde \"%s\" för lsrefs.unborn" -#: ls-refs.c:167 +#: ls-refs.c:174 +#, c-format +msgid "unexpected line: '%s'" +msgstr "oväntad rad: \"%s\"" + +#: ls-refs.c:178 msgid "expected flush after ls-refs arguments" msgstr "förväntade \"flush\" efter ls-refs-argument" @@ -4629,39 +4747,39 @@ msgstr "förväntade \"flush\" efter ls-refs-argument" msgid "quoted CRLF detected" msgstr "citerad CRLF upptäcktes" -#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46 +#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46 #, c-format msgid "bad action '%s' for '%s'" msgstr "felaktig funktion \"%s\" för \"%s\"" -#: merge-ort.c:1116 merge-recursive.c:1205 +#: merge-ort.c:1584 merge-recursive.c:1211 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)" -#: merge-ort.c:1125 merge-recursive.c:1212 +#: merge-ort.c:1593 merge-recursive.c:1218 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)" -#: merge-ort.c:1134 merge-recursive.c:1219 +#: merge-ort.c:1602 merge-recursive.c:1225 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Misslyckades slå ihop undermodulen %s (incheckningar följer inte " "sammanslagningsbasen)" -#: merge-ort.c:1144 merge-ort.c:1151 +#: merge-ort.c:1612 merge-ort.c:1620 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "Obs: Snabbspolar undermodulen %s till %s" -#: merge-ort.c:1172 +#: merge-ort.c:1642 #, c-format msgid "Failed to merge submodule %s" msgstr "Misslyckades slå ihop undermodulen %s" -#: merge-ort.c:1179 +#: merge-ort.c:1649 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4670,7 +4788,7 @@ msgstr "" "Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns:\n" "%s\n" -#: merge-ort.c:1183 merge-recursive.c:1273 +#: merge-ort.c:1653 merge-recursive.c:1281 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4687,7 +4805,7 @@ msgstr "" "\n" "vilket godtar lösningen.\n" -#: merge-ort.c:1196 +#: merge-ort.c:1666 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4697,21 +4815,21 @@ msgstr "" "finns:\n" "%s" -#: merge-ort.c:1415 merge-recursive.c:1362 +#: merge-ort.c:1887 merge-recursive.c:1372 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-ort.c:1420 merge-recursive.c:1367 +#: merge-ort.c:1892 merge-recursive.c:1377 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-ort.c:1427 merge-recursive.c:1400 +#: merge-ort.c:1899 merge-recursive.c:1410 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-ort.c:1566 merge-recursive.c:2122 +#: merge-ort.c:2038 merge-recursive.c:2132 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4720,7 +4838,7 @@ msgstr "" "KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för " "implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s." -#: merge-ort.c:1576 merge-recursive.c:2132 +#: merge-ort.c:2048 merge-recursive.c:2142 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4729,7 +4847,7 @@ msgstr "" "KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till " "%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s" -#: merge-ort.c:1634 +#: merge-ort.c:2106 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4740,7 +4858,7 @@ msgstr "" "den har namnbytts till flera andra kataloger, utan att någon destination " "fick en majoritet av filerna." -#: merge-ort.c:1788 merge-recursive.c:2468 +#: merge-ort.c:2260 merge-recursive.c:2478 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4749,7 +4867,7 @@ msgstr "" "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har " "bytt namn." -#: merge-ort.c:1932 merge-recursive.c:3244 +#: merge-ort.c:2400 merge-recursive.c:3261 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4758,7 +4876,7 @@ msgstr "" "Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; " "flyttar den till %s." -#: merge-ort.c:1939 merge-recursive.c:3251 +#: merge-ort.c:2407 merge-recursive.c:3268 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4767,7 +4885,7 @@ msgstr "" "Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte " "namn i %s; flyttar den till %s." -#: merge-ort.c:1952 merge-recursive.c:3247 +#: merge-ort.c:2420 merge-recursive.c:3264 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4776,7 +4894,7 @@ msgstr "" "KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i " "%s, föreslår att den bör flyttas till%s." -#: merge-ort.c:1960 merge-recursive.c:3254 +#: merge-ort.c:2428 merge-recursive.c:3271 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4785,13 +4903,13 @@ msgstr "" "KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som " "bytte namn i %s; flyttar den till %s." -#: merge-ort.c:2103 +#: merge-ort.c:2584 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" "KONFLIKT (namnbyte/namnbyte): %s namnbytt till %s i %s och till %s i %s." -#: merge-ort.c:2198 +#: merge-ort.c:2679 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4802,23 +4920,23 @@ msgstr "" "innehållskonflikter OCH krockar med en annan sökväg; detta kan leda till " "nästlade konfliktmarkörer." -#: merge-ort.c:2217 merge-ort.c:2241 +#: merge-ort.c:2698 merge-ort.c:2722 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" "KONFLIKT (namnbyte/radera): %s namnbytt till %s i %s, men borttagen i %s." -#: merge-ort.c:2550 merge-recursive.c:3002 +#: merge-ort.c:3212 merge-recursive.c:3022 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-ort.c:2553 merge-recursive.c:3005 +#: merge-ort.c:3215 merge-recursive.c:3025 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-ort.c:2981 +#: merge-ort.c:3644 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " @@ -4827,7 +4945,7 @@ msgstr "" "KONFLIKT (fil/katalog): katalogen är i vägen för %s från %s; flyttar den " "till %s istället." -#: merge-ort.c:3055 +#: merge-ort.c:3721 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed both " @@ -4836,7 +4954,7 @@ msgstr "" "KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte bägge " "så att de kan protokollföras någonstans." -#: merge-ort.c:3062 +#: merge-ort.c:3728 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed one " @@ -4845,24 +4963,24 @@ msgstr "" "KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte den ena " "så att de kan protokollföras någonstans." -#: merge-ort.c:3162 merge-recursive.c:3081 +#: merge-ort.c:3819 merge-recursive.c:3101 msgid "content" msgstr "innehåll" -#: merge-ort.c:3164 merge-recursive.c:3085 +#: merge-ort.c:3821 merge-recursive.c:3105 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-ort.c:3166 merge-recursive.c:3130 +#: merge-ort.c:3823 merge-recursive.c:3150 msgid "submodule" msgstr "undermodul" -#: merge-ort.c:3168 merge-recursive.c:3131 +#: merge-ort.c:3825 merge-recursive.c:3151 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-ort.c:3198 +#: merge-ort.c:3869 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -4871,7 +4989,7 @@ msgstr "" "KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s " "lämnad i trädet." -#: merge-ort.c:3433 +#: merge-ort.c:4165 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -4883,12 +5001,12 @@ msgstr "" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:3730 +#: merge-ort.c:4534 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "samling av sammanslagningsinfo misslyckades för träden %s, %s, %s" -#: merge-ort-wrappers.c:13 merge-recursive.c:3699 +#: merge-ort-wrappers.c:13 merge-recursive.c:3716 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4898,109 +5016,109 @@ msgstr "" "sammanslagning:\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402 +#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405 msgid "Already up to date." msgstr "Redan à jour." -#: merge-recursive.c:356 +#: merge-recursive.c:353 msgid "(bad commit)\n" msgstr "(felaktig incheckning)\n" -#: merge-recursive.c:379 +#: merge-recursive.c:381 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" -"add_cahceinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen." +"add_cacheinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen." -#: merge-recursive.c:388 +#: merge-recursive.c:390 #, 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:876 +#: merge-recursive.c:881 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:887 +#: merge-recursive.c:892 #, 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:901 merge-recursive.c:920 +#: merge-recursive.c:906 merge-recursive.c:925 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:910 +#: merge-recursive.c:915 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:951 builtin/cat-file.c:41 +#: merge-recursive.c:956 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:956 +#: merge-recursive.c:961 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:981 +#: merge-recursive.c:986 #, c-format msgid "failed to open '%s': %s" msgstr "misslyckades öppna \"%s\": %s" -#: merge-recursive.c:992 +#: merge-recursive.c:997 #, c-format msgid "failed to symlink '%s': %s" msgstr "misslyckades skapa symboliska länken \"%s\": %s" -#: merge-recursive.c:997 +#: merge-recursive.c:1002 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "vet inte hur %06o %s \"%s\" ska hanteras" -#: merge-recursive.c:1227 merge-recursive.c:1239 +#: merge-recursive.c:1233 merge-recursive.c:1246 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Snabbspolar undermodulen %s till följande incheckning:" -#: merge-recursive.c:1230 merge-recursive.c:1242 +#: merge-recursive.c:1236 merge-recursive.c:1249 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Snabbspolar undermodulen %s" -#: merge-recursive.c:1265 +#: merge-recursive.c:1273 #, 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:1269 +#: merge-recursive.c:1277 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)" -#: merge-recursive.c:1270 +#: merge-recursive.c:1278 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:1282 +#: merge-recursive.c:1290 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)" -#: merge-recursive.c:1424 +#: merge-recursive.c:1434 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället." -#: merge-recursive.c:1496 +#: merge-recursive.c:1506 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5009,7 +5127,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:1501 +#: merge-recursive.c:1511 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5018,7 +5136,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:1508 +#: merge-recursive.c:1518 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5027,7 +5145,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:1513 +#: merge-recursive.c:1523 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5036,40 +5154,40 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av " "%s lämnad i trädet vid %s." -#: merge-recursive.c:1548 +#: merge-recursive.c:1558 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1548 +#: merge-recursive.c:1558 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158 +#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Vägrar förlora lortig fil vid \"%s\"" -#: merge-recursive.c:1609 +#: merge-recursive.c:1619 #, 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:1667 +#: merge-recursive.c:1677 #, 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:1698 +#: merge-recursive.c:1708 #, 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:1703 +#: merge-recursive.c:1713 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället" -#: merge-recursive.c:1730 +#: merge-recursive.c:1740 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5078,17 +5196,17 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1735 +#: merge-recursive.c:1745 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1827 +#: merge-recursive.c:1837 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s" -#: merge-recursive.c:2090 +#: merge-recursive.c:2100 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5099,7 +5217,7 @@ msgstr "" "katalogen %s bytte namn till flera andra kataloger, utan att någon " "destination fick en majoritet av filerna." -#: merge-recursive.c:2224 +#: merge-recursive.c:2234 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5108,80 +5226,80 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog " "%s->%s i %s" -#: merge-recursive.c:3069 +#: merge-recursive.c:3089 msgid "modify" msgstr "ändra" -#: merge-recursive.c:3069 +#: merge-recursive.c:3089 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:3108 +#: merge-recursive.c:3128 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:3161 +#: merge-recursive.c:3181 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:3368 +#: merge-recursive.c:3385 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:3391 +#: merge-recursive.c:3408 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:3396 +#: merge-recursive.c:3413 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:3403 +#: merge-recursive.c:3420 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s" -#: merge-recursive.c:3412 +#: merge-recursive.c:3429 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:3421 +#: merge-recursive.c:3438 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3474 +#: merge-recursive.c:3491 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:3568 +#: merge-recursive.c:3585 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:3581 +#: merge-recursive.c:3598 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "hittade %u gemensam förfader:" msgstr[1] "hittade %u gemensamma förfäder:" -#: merge-recursive.c:3631 +#: merge-recursive.c:3648 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:3796 +#: merge-recursive.c:3816 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900 -#: builtin/stash.c:473 +#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906 +#: builtin/stash.c:489 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -5189,182 +5307,222 @@ msgstr "Kunde inte skriva indexet." msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965 -#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 -#: builtin/stash.c:267 +#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022 +#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706 +#: builtin/stash.c:269 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: midx.c:74 +#: midx.c:78 msgid "multi-pack-index OID fanout is of the wrong size" msgstr "multi-pack-indexets OID-utbredning har fel storlek" -#: midx.c:105 +#: midx.c:111 #, c-format msgid "multi-pack-index file %s is too small" msgstr "multi-pack-indexfilen %s är för liten" -#: midx.c:121 +#: midx.c:127 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x" -#: midx.c:126 +#: midx.c:132 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-indexversionen %d stöds inte" -#: midx.c:131 +#: midx.c:137 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "multi-pack-index-hashversionen %u stämmer inte med versionen %u" -#: midx.c:148 +#: midx.c:154 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index saknar krävd paketnamn-stycke" -#: midx.c:150 +#: midx.c:156 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index saknar krävt OID-utbredningsstycke" -#: midx.c:152 +#: midx.c:158 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke" -#: midx.c:154 +#: midx.c:160 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index saknar krävt objekt-offsetstycke" -#: midx.c:170 +#: midx.c:176 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\"" -#: midx.c:214 +#: midx.c:224 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "bad pack-int-id: %u (%u paket totalt)" -#: midx.c:264 +#: midx.c:274 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten" -#: midx.c:490 +#: midx.c:505 #, c-format msgid "failed to add packfile '%s'" msgstr "misslyckades läsa paketfilen \"%s\"" -#: midx.c:496 +#: midx.c:511 #, c-format msgid "failed to open pack-index '%s'" msgstr "misslyckades öppna paketindexet \"%s\"" -#: midx.c:564 +#: midx.c:579 #, c-format msgid "failed to locate object %d in packfile" msgstr "misslyckades hitta objekt %d i paketfilen" -#: midx.c:880 builtin/index-pack.c:1535 +#: midx.c:895 msgid "cannot store reverse index file" msgstr "kan inte spara reverse-index-fil" -#: midx.c:933 -msgid "Adding packfiles to multi-pack-index" -msgstr "Lägger till paketfiler till multi-pack-index" +#: midx.c:993 +#, c-format +msgid "could not parse line: %s" +msgstr "kunde inte tolka rad: %s" -#: midx.c:979 +#: midx.c:995 #, c-format -msgid "did not see pack-file %s to drop" -msgstr "såg inte paketfilen %s som skulle kastas" +msgid "malformed line: %s" +msgstr "felaktig rad: %s" + +#: midx.c:1162 +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "ignorerar befintlig multi-pack-index; felaktig kontrollsumma" -#: midx.c:1024 +#: midx.c:1187 +msgid "could not load pack" +msgstr "kunde inte läsa paket{" + +#: midx.c:1193 +#, c-format +msgid "could not open index for %s" +msgstr "kunde inte öppna indexet för %s" + +#: midx.c:1204 +msgid "Adding packfiles to multi-pack-index" +msgstr "Lägger till paketfiler till multi-pack-index" + +#: midx.c:1247 #, c-format msgid "unknown preferred pack: '%s'" msgstr "okänt föredraget paket: %s" -#: midx.c:1029 +#: midx.c:1292 +#, c-format +msgid "cannot select preferred pack %s with no objects" +msgstr "kan inte välja föredraget paket %s som inte har några objekt" + +#: midx.c:1324 +#, c-format +msgid "did not see pack-file %s to drop" +msgstr "såg inte paketfilen %s som skulle kastas" + +#: midx.c:1370 #, c-format msgid "preferred pack '%s' is expired" msgstr "föredraget paket \"%s\" har löpt ut" -#: midx.c:1045 +#: midx.c:1383 msgid "no pack files to index." msgstr "inga paketfiler att indexera." -#: midx.c:1125 builtin/clean.c:37 +#: midx.c:1420 +msgid "could not write multi-pack bitmap" +msgstr "kunde inte skriva fler-paketsbitkarta" + +#: midx.c:1430 +msgid "could not write multi-pack-index" +msgstr "kunde inte skriva flerpakets-index" + +#: midx.c:1489 builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "misslyckades ta bort %s" -#: midx.c:1156 +#: midx.c:1522 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "misslyckades städa multi-pack-index på %s" -#: midx.c:1214 +#: midx.c:1585 msgid "multi-pack-index file exists, but failed to parse" msgstr "multi-pack-indexfilen finns, men kunde inte tolkas" -#: midx.c:1222 +#: midx.c:1593 +msgid "incorrect checksum" +msgstr "felaktig kontrollsumma" + +#: midx.c:1596 msgid "Looking for referenced packfiles" msgstr "Ser efter refererade packfiler" -#: midx.c:1237 +#: midx.c:1611 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" "oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1242 +#: midx.c:1616 msgid "the midx contains no oid" msgstr "midx saknar oid" -#: midx.c:1251 +#: midx.c:1625 msgid "Verifying OID order in multi-pack-index" msgstr "Bekräftar OID-ordning i multi-pack-index" -#: midx.c:1260 +#: midx.c:1634 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1280 +#: midx.c:1654 msgid "Sorting objects by packfile" msgstr "Sorterar objekt efter packfil" -#: midx.c:1287 +#: midx.c:1661 msgid "Verifying object offsets" msgstr "Bekräftar offset för objekt" -#: midx.c:1303 +#: midx.c:1677 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "misslyckades läsa paketpost för oid[%d] = %s" -#: midx.c:1309 +#: midx.c:1683 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "misslyckades läsa paketindex för paketfil %s" -#: midx.c:1318 +#: midx.c:1692 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1343 +#: midx.c:1719 msgid "Counting referenced objects" msgstr "Räknar refererade objekt" -#: midx.c:1353 +#: midx.c:1729 msgid "Finding and deleting unreferenced packfiles" msgstr "Ser efter och tar bort orefererade packfiler" -#: midx.c:1544 +#: midx.c:1921 msgid "could not start pack-objects" msgstr "kunde inte starta pack-objects" -#: midx.c:1564 +#: midx.c:1941 msgid "could not finish pack-objects" msgstr "kunde inte avsluta pack-objects" @@ -5423,271 +5581,272 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Felaktigt värde på %s: \"%s\"" -#: object-file.c:526 +#: object-file.c:456 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates" -#: object-file.c:577 +#: object-file.c:514 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "kunde inte normalisera supplerande objektsökväg: %s" -#: object-file.c:649 +#: object-file.c:588 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: ignorerar supplerande objektlager, för djup nästling" -#: object-file.c:656 +#: object-file.c:595 #, c-format msgid "unable to normalize object directory: %s" msgstr "kan inte normalisera objektkatalogen: %s" -#: object-file.c:699 +#: object-file.c:638 msgid "unable to fdopen alternates lockfile" msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil" -#: object-file.c:717 +#: object-file.c:656 msgid "unable to read alternates file" msgstr "kan inte läsa \"alternates\"-filen" -#: object-file.c:724 +#: object-file.c:663 msgid "unable to move new alternates file into place" msgstr "kan inte flytta ny \"alternates\"-fil på plats" -#: object-file.c:759 +#: object-file.c:741 #, c-format msgid "path '%s' does not exist" msgstr "sökvägen \"%s\" finns inte" -#: object-file.c:780 +#: object-file.c:762 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu." -#: object-file.c:786 +#: object-file.c:768 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: object-file.c:792 +#: object-file.c:774 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: object-file.c:800 +#: object-file.c:782 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: object-file.c:860 +#: object-file.c:813 +#, c-format +msgid "could not find object directory matching %s" +msgstr "kunde inte hitta objektkatalog för %s" + +#: object-file.c:863 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "felaktig rad vid tolkning av supplerande referenser: %s" -#: object-file.c:1010 +#: object-file.c:1013 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>" -#: object-file.c:1031 -msgid "mmap failed" -msgstr "mmap misslyckades" +#: object-file.c:1048 +#, c-format +msgid "mmap failed%s" +msgstr "mmap misslyckades%s" -#: object-file.c:1195 +#: object-file.c:1214 #, c-format msgid "object file %s is empty" msgstr "objektfilen %s är tom" -#: object-file.c:1330 object-file.c:2524 +#: object-file.c:1333 object-file.c:2542 #, c-format msgid "corrupt loose object '%s'" msgstr "trasigt löst objekt \"%s\"" -#: object-file.c:1332 object-file.c:2528 +#: object-file.c:1335 object-file.c:2546 #, c-format msgid "garbage at end of loose object '%s'" msgstr "skräp i slutet av löst objekt \"%s\"" -#: object-file.c:1374 +#: object-file.c:1457 +#, c-format +msgid "unable to parse %s header" +msgstr "kan inte tolka %s-huvud" + +#: object-file.c:1459 msgid "invalid object type" msgstr "felaktig objekttyp" -#: object-file.c:1458 -#, c-format -msgid "unable to unpack %s header with --allow-unknown-type" -msgstr "kan inte packa upp %s-huvud med --allow-unknown-type" - -#: object-file.c:1461 +#: object-file.c:1470 #, c-format msgid "unable to unpack %s header" msgstr "kan inte packa upp %s-huvudet" -#: object-file.c:1467 +#: object-file.c:1474 #, c-format -msgid "unable to parse %s header with --allow-unknown-type" -msgstr "kan inte tolka %s-huvud med --allow-unknown-type" +msgid "header for %s too long, exceeds %d bytes" +msgstr "huvudet för %s är för långt, mer än %d byte" -#: object-file.c:1470 -#, c-format -msgid "unable to parse %s header" -msgstr "kan inte tolka %s-huvud" - -#: object-file.c:1697 +#: object-file.c:1704 #, c-format msgid "failed to read object %s" msgstr "misslyckades läsa objektet %s" -#: object-file.c:1701 +#: object-file.c:1708 #, c-format msgid "replacement %s not found for %s" msgstr "ersättningen %s hittades inte för %s" -#: object-file.c:1705 +#: object-file.c:1712 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "löst objekt %s (lagrat i %s) är trasigt" -#: object-file.c:1709 +#: object-file.c:1716 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "packat objekt %s (lagrat i %s) är trasigt" -#: object-file.c:1814 +#: object-file.c:1821 #, c-format msgid "unable to write file %s" msgstr "kunde inte skriva filen %s" -#: object-file.c:1821 +#: object-file.c:1828 #, c-format msgid "unable to set permission to '%s'" msgstr "kan inte sätta behörigheten till \"%s\"" -#: object-file.c:1828 +#: object-file.c:1835 msgid "file write error" msgstr "fel vid skrivning av fil" -#: object-file.c:1848 +#: object-file.c:1858 msgid "error when closing loose object file" msgstr "fel vid stängning av fil för löst objekt" -#: object-file.c:1913 +#: object-file.c:1925 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s" -#: object-file.c:1915 +#: object-file.c:1927 msgid "unable to create temporary file" msgstr "kan inte skapa temporär fil" -#: object-file.c:1939 +#: object-file.c:1951 msgid "unable to write loose object file" msgstr "kunde inte skriva fil för löst objekt" -#: object-file.c:1945 +#: object-file.c:1957 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)" -#: object-file.c:1949 +#: object-file.c:1961 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "\"deflateend\" på objektet %s misslyckades (%d)" -#: object-file.c:1953 +#: object-file.c:1965 #, c-format msgid "confused by unstable object source data for %s" msgstr "förvirrad av instabil objektkälldata för %s" -#: object-file.c:1963 builtin/pack-objects.c:1097 +#: object-file.c:1976 builtin/pack-objects.c:1243 #, c-format msgid "failed utime() on %s" msgstr "\"utime()\" misslyckades på %s" -#: object-file.c:2040 +#: object-file.c:2054 #, c-format msgid "cannot read object for %s" msgstr "kan inte läsa objekt för %s" -#: object-file.c:2091 +#: object-file.c:2105 msgid "corrupt commit" msgstr "trasik incheckning" -#: object-file.c:2099 +#: object-file.c:2113 msgid "corrupt tag" msgstr "trasig tagg" -#: object-file.c:2199 +#: object-file.c:2213 #, c-format msgid "read error while indexing %s" msgstr "läsfel vid indexering av %s" -#: object-file.c:2202 +#: object-file.c:2216 #, c-format msgid "short read while indexing %s" msgstr "för lite lästes vid indexering av %s" -#: object-file.c:2275 object-file.c:2285 +#: object-file.c:2289 object-file.c:2299 #, c-format msgid "%s: failed to insert into database" msgstr "%s: misslyckades lägga in i databasen" -#: object-file.c:2291 +#: object-file.c:2305 #, c-format msgid "%s: unsupported file type" msgstr "%s: filtypen stöds ej" -#: object-file.c:2315 +#: object-file.c:2329 builtin/fetch.c:1453 #, c-format msgid "%s is not a valid object" msgstr "%s är inte ett giltigt objekt" -#: object-file.c:2317 +#: object-file.c:2331 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt \"%s\"-objekt" -#: object-file.c:2344 builtin/index-pack.c:192 +#: object-file.c:2358 #, c-format msgid "unable to open %s" msgstr "kan inte öppna %s" -#: object-file.c:2535 object-file.c:2588 +#: object-file.c:2553 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "hash stämmer inte för %s (förväntade %s)" -#: object-file.c:2559 +#: object-file.c:2576 #, c-format msgid "unable to mmap %s" msgstr "kan inte utföra \"mmap\" för %s" -#: object-file.c:2564 +#: object-file.c:2582 #, c-format msgid "unable to unpack header of %s" msgstr "kan inte packa upp huvud för %s" -#: object-file.c:2570 +#: object-file.c:2587 #, c-format msgid "unable to parse header of %s" msgstr "kan inte tolka huvud för %s" -#: object-file.c:2581 +#: object-file.c:2598 #, c-format msgid "unable to unpack contents of %s" msgstr "kan inte tolka innehåll i %s" -#: object-name.c:486 +#: object-name.c:480 #, c-format msgid "short object ID %s is ambiguous" msgstr "kort objekt-ID %s är tvetydigt" -#: object-name.c:497 +#: object-name.c:491 msgid "The candidates are:" msgstr "Kandidaterna är:" -#: object-name.c:796 +#: object-name.c:790 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" @@ -5709,22 +5868,22 @@ msgstr "" "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n" "genom att köra \"git config advice.objectNameWarning false\"" -#: object-name.c:916 +#: object-name.c:910 #, c-format msgid "log for '%.*s' only goes back to %s" msgstr "loggen för \"%.*s\" räcker bara tillbaka till %s" -#: object-name.c:924 +#: object-name.c:918 #, c-format msgid "log for '%.*s' only has %d entries" msgstr "loggen för \"%.*s\" har bara %d poster" -#: object-name.c:1702 +#: object-name.c:1696 #, c-format msgid "path '%s' exists on disk, but not in '%.*s'" msgstr "Sökvägen \"%s\" finns på disken, men inte i \"%.*s\"" -#: object-name.c:1708 +#: object-name.c:1702 #, c-format msgid "" "path '%s' exists, but not '%s'\n" @@ -5733,12 +5892,12 @@ msgstr "" "sökvägen \"%s\" finns, men inte i \"%s\"\n" "tips: Menade du \"%.*s:%s\", även känd som \"%.*s:./%s\"?" -#: object-name.c:1717 +#: object-name.c:1711 #, c-format msgid "path '%s' does not exist in '%.*s'" msgstr "sökvägen \"%s\" finns inte i \"%.*s\"" -#: object-name.c:1745 +#: object-name.c:1739 #, c-format msgid "" "path '%s' is in the index, but not at stage %d\n" @@ -5747,7 +5906,7 @@ msgstr "" "sökvägen \"%s\" finns i indexet men inte i etapp %d\n" "tips: Menade du \":%d:%s\"?" -#: object-name.c:1761 +#: object-name.c:1755 #, c-format msgid "" "path '%s' is in the index, but not '%s'\n" @@ -5756,21 +5915,21 @@ msgstr "" "sökvägen \"%s\" finns i indexet, men inte i \"%s\"\n" "tips: Menade du \":%d:%s\", även känd som \":%d:./%s\"?" -#: object-name.c:1769 +#: object-name.c:1763 #, c-format msgid "path '%s' exists on disk, but not in the index" msgstr "sökvägen \"%s\" finns på disk, men inte i indexet" -#: object-name.c:1771 +#: object-name.c:1765 #, c-format msgid "path '%s' does not exist (neither on disk nor in the index)" msgstr "sökvägen \"%s\" finns inte (varken i disken eller i indexet)" -#: object-name.c:1784 +#: object-name.c:1778 msgid "relative path syntax can't be used outside working tree" msgstr "relativ sökväg kan inte användas utanför arbetskatalogen" -#: object-name.c:1922 +#: object-name.c:1916 #, c-format msgid "invalid object name '%.*s'." msgstr "felaktigt objektnamn \"%.*s\"." @@ -5785,27 +5944,40 @@ msgstr "ogiltig objekttyp \"%s\"" msgid "object %s is a %s, not a %s" msgstr "objektet %s är en %s, inte en %s" -#: object.c:232 +#: object.c:250 #, c-format msgid "object %s has unknown type id %d" msgstr "objektet %s har okänd typ-id %d" -#: object.c:245 +#: object.c:263 #, c-format msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" -#: object.c:265 object.c:277 +#: object.c:283 object.c:295 #, c-format msgid "hash mismatch %s" msgstr "hashvärde stämmer inte överens %s" -#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251 +#: pack-bitmap.c:353 +msgid "multi-pack bitmap is missing required reverse index" +msgstr "flerpaketsbitkarta saknar nödvändigt omvänt index" + +#: pack-bitmap.c:429 +msgid "load_reverse_index: could not open pack" +msgstr "load_reverse_index: kunde inte öppna paket" + +#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424 #, c-format msgid "unable to get size of %s" msgstr "kan inte hämta storlek på %s" -#: pack-bitmap.c:1547 builtin/rev-list.c:92 +#: pack-bitmap.c:1935 +#, c-format +msgid "could not find %s in pack %s at offset %<PRIuMAX>" +msgstr "kunde inte hitta %s i paketet %s på offset %<PRIuMAX>" + +#: pack-bitmap.c:1971 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "kan inte hämta diskanvändning för %s" @@ -5835,125 +6007,135 @@ msgstr "reverse-index-filen %s har versionen %<PRIu32> som inte stöds" msgid "reverse-index file %s has unsupported hash id %<PRIu32>" msgstr "reverse-index-filen %s har hash-ID %<PRIu32> som inte stöds" -#: pack-write.c:250 +#: pack-write.c:251 msgid "cannot both write and verify reverse index" msgstr "kan inte både skriva och bekräfta reverse-index" -#: pack-write.c:271 +#: pack-write.c:270 #, c-format msgid "could not stat: %s" msgstr "kunde inte ta status: %s" -#: pack-write.c:283 +#: pack-write.c:282 #, c-format msgid "failed to make %s readable" msgstr "kunde inte göra %s läsbar" -#: pack-write.c:522 +#: pack-write.c:520 #, c-format msgid "could not write '%s' promisor file" msgstr "kunde inte skriva kontraktsfilen \"%s\"" -#: packfile.c:625 +#: packfile.c:627 msgid "offset before end of packfile (broken .idx?)" msgstr "offset före slutet av packfilen (trasig .idx?)" -#: packfile.c:1937 +#: packfile.c:657 +#, c-format +msgid "packfile %s cannot be mapped%s" +msgstr "paketfilen %s kunde inte kopplas%s" + +#: packfile.c:1924 #, 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:1941 +#: packfile.c:1928 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex för %s (trunkerat index?)" -#: parse-options-cb.c:20 parse-options-cb.c:24 +#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175 #, c-format msgid "option `%s' expects a numerical value" msgstr "flaggan \"%s\" antar ett numeriskt värde" -#: parse-options-cb.c:41 +#: parse-options-cb.c:42 #, c-format msgid "malformed expiration date '%s'" msgstr "trasigt utlöpsdatum: \"%s\"" -#: parse-options-cb.c:54 +#: parse-options-cb.c:55 #, c-format msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "" "flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)" -#: parse-options-cb.c:132 parse-options-cb.c:149 +#: parse-options-cb.c:133 parse-options-cb.c:150 #, c-format msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: parse-options.c:38 +#: parse-options-cb.c:307 +#, c-format +msgid "option `%s' expects \"%s\" or \"%s\"" +msgstr "flaggan \"%s\" kräver \"%s\" eller \"%s\"" + +#: parse-options.c:58 #, c-format msgid "%s requires a value" msgstr "%s behöver ett värde" -#: parse-options.c:73 +#: parse-options.c:93 #, c-format msgid "%s is incompatible with %s" msgstr "%s är inkompatibel med %s" -#: parse-options.c:78 +#: parse-options.c:98 #, c-format msgid "%s : incompatible with something else" msgstr "%s: inkompatibelt med något annat" -#: parse-options.c:92 parse-options.c:96 parse-options.c:317 +#: parse-options.c:112 parse-options.c:116 #, c-format msgid "%s takes no value" msgstr "%s tar inget värde" -#: parse-options.c:94 +#: parse-options.c:114 #, c-format msgid "%s isn't available" msgstr "%s är inte tillgängligt" -#: parse-options.c:217 +#: parse-options.c:237 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffix" -#: parse-options.c:386 +#: parse-options.c:393 #, 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:420 parse-options.c:428 +#: parse-options.c:428 parse-options.c:436 #, c-format msgid "did you mean `--%s` (with two dashes)?" msgstr "menade du \"--%s\" (med två bindestreck)?" -#: parse-options.c:668 parse-options.c:988 +#: parse-options.c:678 parse-options.c:1054 #, c-format msgid "alias of --%s" msgstr "alias för --%s" -#: parse-options.c:879 +#: parse-options.c:892 #, c-format msgid "unknown option `%s'" msgstr "okänd flagga \"%s\"" -#: parse-options.c:881 +#: parse-options.c:894 #, c-format msgid "unknown switch `%c'" msgstr "okänd flagga \"%c\"" -#: parse-options.c:883 +#: parse-options.c:896 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "okänd icke-ascii-flagga i strängen: \"%s\"" -#: parse-options.c:907 +#: parse-options.c:920 msgid "..." msgstr "..." -#: parse-options.c:926 +#: parse-options.c:934 #, c-format msgid "usage: %s" msgstr "användning: %s" @@ -5961,48 +6143,72 @@ msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:932 +#: parse-options.c:949 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:935 +#. TRANSLATORS: You should only need to translate this format +#. string if your language is a RTL language (e.g. Arabic, +#. Hebrew etc.), not if it's a LTR language (e.g. German, +#. Russian, Chinese etc.). +#. * +#. When a translated usage string has an embedded "\n" it's +#. because options have wrapped to the next line. The line +#. after the "\n" will then be padded to align with the +#. command name, such as N_("git cmd [opt]\n<8 +#. spaces>[opt2]"), where the 8 spaces are the same length as +#. "git cmd ". +#. * +#. This format string prints out that already-translated +#. line. The "%*s" is whitespace padding to account for the +#. padding at the start of the line that we add in this +#. function. The "%s" is a line in the (hopefully already +#. translated) N_() usage string, which contained embedded +#. newlines before we split it up. +#. +#: parse-options.c:970 +#, c-format +msgid "%*s%s" +msgstr "%*s%s" + +#: parse-options.c:993 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:974 +#: parse-options.c:1040 msgid "-NUM" msgstr "-TAL" -#: path.c:915 +#: path.c:922 #, c-format msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för gruppen" -#: pathspec.c:151 +#: pathspec.c:150 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "Specialtecknet \"\\\" tillåts inte som sista tecken i attributvärde" -#: pathspec.c:169 +#: pathspec.c:168 msgid "Only one 'attr:' specification is allowed." msgstr "Endast en \"attr:\"-angivelse tillåten." -#: pathspec.c:172 +#: pathspec.c:171 msgid "attr spec must not be empty" msgstr "attr-angivelse kan inte vara tom" -#: pathspec.c:215 +#: pathspec.c:214 #, c-format msgid "invalid attribute name %s" msgstr "ogiltigt attributnamn %s" -#: pathspec.c:280 +#: pathspec.c:279 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla" -#: pathspec.c:287 +#: pathspec.c:286 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -6010,51 +6216,51 @@ msgstr "" "den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra " "globala sökvägsinställningar" -#: pathspec.c:327 +#: pathspec.c:326 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\"" -#: pathspec.c:348 +#: pathspec.c:347 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Felaktigt sökvägsuttryck \"%.*s\" i \"%s\"" -#: pathspec.c:353 +#: pathspec.c:352 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\"" -#: pathspec.c:391 +#: pathspec.c:390 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Ej implementerat sökvägsuttryckmagi \"%c\" i \"%s\"" -#: pathspec.c:450 +#: pathspec.c:449 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: \"literal\" och \"glob\" är inkompatibla" -#: pathspec.c:466 +#: pathspec.c:465 #, c-format msgid "%s: '%s' is outside repository at '%s'" msgstr "%s: \"%s\" är utanför arkivet på \"%s\"" -#: pathspec.c:542 +#: pathspec.c:541 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "\"%s\" (minnesstöd: \"%c\")" -#: pathspec.c:552 +#: pathspec.c:551 #, 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:619 +#: pathspec.c:618 #, 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:664 +#: pathspec.c:663 #, c-format msgid "line is badly quoted: %s" msgstr "linjen er felaktigt citerad: %s" @@ -6068,14 +6274,14 @@ msgid "unable to write delim packet" msgstr "kan inte skriva delim-paket" #: pkt-line.c:106 -msgid "unable to write stateless separator packet" -msgstr "kan inte skriva tillståndslöst avdelarpaket" +msgid "unable to write response end packet" +msgstr "kunde inte skriva svarsavslutningspaket" #: pkt-line.c:113 msgid "flush packet write failed" msgstr "fel vid skrivning av \"flush\"-paket" -#: pkt-line.c:153 pkt-line.c:265 +#: pkt-line.c:153 msgid "protocol error: impossibly long line" msgstr "protokollfel: omöjligt lång rad" @@ -6083,7 +6289,7 @@ msgstr "protokollfel: omöjligt lång rad" msgid "packet write with format failed" msgstr "paketskrivning med format misslyckades" -#: pkt-line.c:204 +#: pkt-line.c:204 pkt-line.c:252 msgid "packet write failed - data exceeds max packet size" msgstr "paketskrivning misslyckades - data överskrider maximal paketstorlek" @@ -6092,25 +6298,25 @@ msgstr "paketskrivning misslyckades - data överskrider maximal paketstorlek" msgid "packet write failed: %s" msgstr "paketskrivning misslyckades: %s" -#: pkt-line.c:328 pkt-line.c:329 +#: pkt-line.c:349 pkt-line.c:350 msgid "read error" msgstr "läsfel" -#: pkt-line.c:339 pkt-line.c:340 +#: pkt-line.c:360 pkt-line.c:361 msgid "the remote end hung up unexpectedly" msgstr "fjärren lade på oväntat" -#: pkt-line.c:369 pkt-line.c:371 +#: pkt-line.c:417 pkt-line.c:419 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "protokollfel: felaktig radlängdstecken: %.4s" -#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396 +#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444 #, c-format msgid "protocol error: bad line length %d" msgstr "protokollfel: felaktig radlängd: %d" -#: pkt-line.c:413 sideband.c:165 +#: pkt-line.c:472 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "fjärrfel: %s" @@ -6124,24 +6330,24 @@ msgstr "Uppdaterar indexet" msgid "unable to create threaded lstat: %s" msgstr "kunde inte skapa trådad lstat: %s" -#: pretty.c:988 +#: pretty.c:1051 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" -#: promisor-remote.c:30 +#: promisor-remote.c:31 msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "promisor-remote: kunde inte starta (fork) underprocessen för fetch" -#: promisor-remote.c:35 promisor-remote.c:37 +#: promisor-remote.c:38 promisor-remote.c:40 msgid "promisor-remote: could not write to fetch subprocess" msgstr "promisor-remote: kunde skriva till underprocessen för fetch" -#: promisor-remote.c:41 +#: promisor-remote.c:44 msgid "promisor-remote: could not close stdin to fetch subprocess" msgstr "" "promisor-remote: kunde inte stänga standard in för underprocessen för fetch" -#: promisor-remote.c:53 +#: promisor-remote.c:54 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "kontraktsfjärr kan inte börja med \"/\": %s" @@ -6154,20 +6360,20 @@ msgstr "object-info: förväntade \"flush\" efter argument" msgid "Removing duplicate objects" msgstr "Tar bort duplicerade objekt" -#: range-diff.c:78 +#: range-diff.c:67 msgid "could not start `log`" msgstr "kunde inte starta \"log\"" -#: range-diff.c:80 +#: range-diff.c:69 msgid "could not read `log` output" msgstr "kunde inte läsa utdata från \"log\"" -#: range-diff.c:101 sequencer.c:5551 +#: range-diff.c:97 sequencer.c:5602 #, c-format msgid "could not parse commit '%s'" msgstr "kunde inte tolka incheckningen \"%s\"" -#: range-diff.c:115 +#: range-diff.c:111 #, c-format msgid "" "could not parse first line of `log` output: did not start with 'commit ': " @@ -6176,69 +6382,65 @@ msgstr "" "kunde inte tolka första raden i \"log\"-updata: börjar inte med \"commit \": " "\"%s\"" -#: range-diff.c:140 +#: range-diff.c:137 #, c-format msgid "could not parse git header '%.*s'" msgstr "kunde inte tolka git-huvudet \"%.*s\"" -#: range-diff.c:306 +#: range-diff.c:304 msgid "failed to generate diff" msgstr "misslyckades skapa diff" -#: range-diff.c:558 -msgid "--left-only and --right-only are mutually exclusive" -msgstr "--left-only och --right-only är ömsesidigt uteslutande" - -#: range-diff.c:561 range-diff.c:563 +#: range-diff.c:562 range-diff.c:564 #, c-format msgid "could not parse log for '%s'" msgstr "kunde inte tolka loggen för \"%s\"" -#: read-cache.c:708 +#: read-cache.c:723 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "lägger inte till filalias \"%s\" (\"%s\" finns redan i indexet)" -#: read-cache.c:724 +#: read-cache.c:739 msgid "cannot create an empty blob in the object database" msgstr "kan inte skapa tom blob i objektdatabasen" -#: read-cache.c:746 +#: read-cache.c:761 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" "%s: kan bara lägga till vanliga filer, symboliska länkar och git-kataloger" -#: read-cache.c:751 +#: read-cache.c:766 builtin/submodule--helper.c:3242 #, c-format msgid "'%s' does not have a commit checked out" msgstr "\"%s\" har inte någon utcheckad incheckning" -#: read-cache.c:803 +#: read-cache.c:818 #, c-format msgid "unable to index file '%s'" msgstr "kan inte indexera filen \"%s\"" -#: read-cache.c:822 +#: read-cache.c:837 #, c-format msgid "unable to add '%s' to index" msgstr "kan inte lägga till \"%s\" till indexet" -#: read-cache.c:833 +#: read-cache.c:848 #, c-format msgid "unable to stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: read-cache.c:1356 +#: read-cache.c:1386 #, 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:1571 +#: read-cache.c:1601 msgid "Refresh index" msgstr "Uppdatera indexet" -#: read-cache.c:1700 +#: read-cache.c:1733 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -6247,7 +6449,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1710 +#: read-cache.c:1743 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6256,143 +6458,143 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1766 +#: read-cache.c:1799 #, c-format msgid "bad signature 0x%08x" msgstr "felaktig signatur 0x%08x" -#: read-cache.c:1769 +#: read-cache.c:1802 #, c-format msgid "bad index version %d" msgstr "felaktig indexversion %d" -#: read-cache.c:1778 +#: read-cache.c:1811 msgid "bad index file sha1 signature" msgstr "felaktig sha1-signatur för indexfil" -#: read-cache.c:1812 +#: read-cache.c:1845 #, 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:1814 +#: read-cache.c:1847 #, c-format msgid "ignoring %.4s extension" msgstr "ignorerar filtillägget %.4s" -#: read-cache.c:1851 +#: read-cache.c:1884 #, c-format msgid "unknown index entry format 0x%08x" msgstr "okänt format 0x%08x på indexpost" -#: read-cache.c:1867 +#: read-cache.c:1900 #, 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:1924 +#: read-cache.c:1957 msgid "unordered stage entries in index" msgstr "osorterade köposter i index" -#: read-cache.c:1927 +#: read-cache.c:1960 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "flera köposter för den sammanslagna filen \"%s\"" -#: read-cache.c:1930 +#: read-cache.c:1963 #, c-format msgid "unordered stage entries for '%s'" msgstr "osorterade köposter för \"%s\"" -#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991 -#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 -#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 -#: builtin/submodule--helper.c:332 +#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183 +#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013 +#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519 +#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293 +#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202 msgid "index file corrupt" msgstr "indexfilen trasig" -#: read-cache.c:2180 +#: read-cache.c:2222 #, c-format msgid "unable to create load_cache_entries thread: %s" -msgstr "kunde inte läsa in cache_entries-tråden: %s" +msgstr "kunde inte skapa tråd för load_cache_entries: %s" -#: read-cache.c:2193 +#: read-cache.c:2235 #, c-format msgid "unable to join load_cache_entries thread: %s" -msgstr "kunde inte utföra join på cache_entries-tråden: %s" +msgstr "kunde inte ansluta till tråden för load_cache_entries: %s" -#: read-cache.c:2226 +#: read-cache.c:2268 #, c-format msgid "%s: index file open failed" msgstr "%s: öppning av indexfilen misslyckades" -#: read-cache.c:2230 +#: read-cache.c:2272 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: kan inte ta startus på det öppna indexet" -#: read-cache.c:2234 +#: read-cache.c:2276 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: indexfilen mindre än förväntat" -#: read-cache.c:2238 +#: read-cache.c:2280 #, c-format -msgid "%s: unable to map index file" -msgstr "%s: kan inte koppla indexfilen" +msgid "%s: unable to map index file%s" +msgstr "%s: kan inte koppla indexfilen%s" -#: read-cache.c:2280 +#: read-cache.c:2323 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "kunde inte skapa load_index_extensions-tråden: %s" -#: read-cache.c:2307 +#: read-cache.c:2350 #, 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:2345 +#: read-cache.c:2396 #, c-format msgid "could not freshen shared index '%s'" msgstr "kunde inte uppdatera delat index \"%s\"" -#: read-cache.c:2392 +#: read-cache.c:2455 #, 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:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 +#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: read-cache.c:3138 +#: read-cache.c:3129 msgid "failed to convert to a sparse-index" msgstr "misslyckades omvandla till glest index" -#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441 +#: read-cache.c:3200 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" -#: read-cache.c:3222 +#: read-cache.c:3213 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte öppna git-katalog: %s" -#: read-cache.c:3234 +#: read-cache.c:3225 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort länken: %s" -#: read-cache.c:3263 +#: read-cache.c:3254 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "kan inte rätta behörighetsbitar på \"%s\"" -#: read-cache.c:3412 +#: read-cache.c:3411 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: kan inte återgå till kö 0" @@ -6475,7 +6677,7 @@ 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:75 git-rebase--preserve-merges.sh:218 +#: rebase-interactive.c:75 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -6484,7 +6686,7 @@ msgstr "" "Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en " "incheckning.\n" -#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222 +#: rebase-interactive.c:78 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -6492,7 +6694,7 @@ msgstr "" "\n" "Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n" -#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861 +#: rebase-interactive.c:84 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -6506,7 +6708,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938 +#: rebase-interactive.c:89 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -6516,14 +6718,14 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816 -#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883 +#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791 +#: builtin/rebase.c:190 #, c-format msgid "could not write '%s'" msgstr "kunde inte skriva \"%s\"" -#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229 -#: builtin/rebase.c:253 +#: rebase-interactive.c:119 #, c-format msgid "could not write '%s'." msgstr "kunde inte skriva \"%s\"." @@ -6557,14 +6759,12 @@ msgstr "" "\" (fel).\n" "\n" -#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597 -#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240 -#: builtin/rebase.c:265 +#: rebase.c:29 #, c-format -msgid "could not read '%s'." -msgstr "kunde inte läsa \"%s\"." +msgid "%s: 'preserve' superseded by 'merges'" +msgstr "%s: \"preserve\" har ersatts av \"merges\"" -#: ref-filter.c:42 wt-status.c:1978 +#: ref-filter.c:42 wt-status.c:2048 msgid "gone" msgstr "försvunnen" @@ -6583,258 +6783,229 @@ msgstr "bakom %d" msgid "ahead %d, behind %d" msgstr "före %d, bakom %d" -#: ref-filter.c:175 +#: ref-filter.c:235 #, c-format msgid "expected format: %%(color:<color>)" msgstr "förväntat format: %%(color:<color>)" -#: ref-filter.c:177 +#: ref-filter.c:237 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "okänd färg: %%(color:%s)" -#: ref-filter.c:199 +#: ref-filter.c:259 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Heltalsvärde förväntades refname:lstrip=%s" -#: ref-filter.c:203 +#: ref-filter.c:263 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Heltalsvärde förväntades refname:rstrip=%s" -#: ref-filter.c:205 +#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431 +#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "okänt %%(%s)-argument: %s" -#: ref-filter.c:260 +#: ref-filter.c:320 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) tar inte argument" -#: ref-filter.c:282 -#, c-format -msgid "unrecognized %%(objectsize) argument: %s" -msgstr "okänt %%(objectsize)-argument: %s" - -#: ref-filter.c:290 +#: ref-filter.c:352 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) tar inte argument" -#: ref-filter.c:302 +#: ref-filter.c:364 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) tar inte argument" -#: ref-filter.c:315 -#, c-format -msgid "unrecognized %%(subject) argument: %s" -msgstr "okänt %%(subject)-argument: %s" - -#: ref-filter.c:334 +#: ref-filter.c:396 #, c-format msgid "expected %%(trailers:key=<value>)" -msgstr "förvändate %%(trailers:nyckel=<värde>)" +msgstr "förväntade %%(trailers:key=<värde>)" -#: ref-filter.c:336 +#: ref-filter.c:398 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "okänt %%(trailers)-argument: %s" -#: ref-filter.c:367 +#: ref-filter.c:429 #, c-format msgid "positive value expected contents:lines=%s" msgstr "positivt värde förväntat contents:lines=%s" -#: ref-filter.c:369 -#, c-format -msgid "unrecognized %%(contents) argument: %s" -msgstr "okänt %%(contents)-argument: %s" - -#: ref-filter.c:384 +#: ref-filter.c:458 #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "positivt värde förväntat \"%s\" i %%(%s)" -#: ref-filter.c:388 -#, c-format -msgid "unrecognized argument '%s' in %%(%s)" -msgstr "okänt argument \"%s\" i %%(%s)" - -#: ref-filter.c:402 +#: ref-filter.c:476 #, c-format msgid "unrecognized email option: %s" msgstr "okänd e-postalternativ: %s" -#: ref-filter.c:432 +#: ref-filter.c:506 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "förväntat format: %%(align:<bredd>,<position>)" -#: ref-filter.c:444 +#: ref-filter.c:518 #, c-format msgid "unrecognized position:%s" msgstr "okänd position:%s" -#: ref-filter.c:451 +#: ref-filter.c:525 #, c-format msgid "unrecognized width:%s" msgstr "okänd bredd:%s" -#: ref-filter.c:460 -#, c-format -msgid "unrecognized %%(align) argument: %s" -msgstr "okänt %%(align)-argument: %s" - -#: ref-filter.c:468 +#: ref-filter.c:542 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "positiv bredd förväntad med atomen %%(align)" -#: ref-filter.c:486 +#: ref-filter.c:568 #, c-format -msgid "unrecognized %%(if) argument: %s" -msgstr "okänt %%(if)-argument: %s" +msgid "%%(rest) does not take arguments" +msgstr "%%(rest) tar inte argument" -#: ref-filter.c:588 +#: ref-filter.c:680 #, c-format msgid "malformed field name: %.*s" msgstr "felformat fältnamn: %.*s" -#: ref-filter.c:615 +#: ref-filter.c:707 #, c-format msgid "unknown field name: %.*s" msgstr "okänt fältnamn: %.*s" -#: ref-filter.c:619 +#: ref-filter.c:711 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" "inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata" -#: ref-filter.c:743 -#, c-format -msgid "format: %%(if) atom used without a %%(then) atom" -msgstr "format: atomen %%(if) använd utan en %%(then)-atom" - -#: ref-filter.c:807 +#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948 #, c-format -msgid "format: %%(then) atom used without an %%(if) atom" -msgstr "format: atomen %%(then) använd utan en %%(if)-atom" +msgid "format: %%(%s) atom used without a %%(%s) atom" +msgstr "format: atomen %%(%s) använd utan en %%(%s)-atom" -#: ref-filter.c:809 +#: ref-filter.c:912 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: atomen %%(then) använd mer än en gång" -#: ref-filter.c:811 +#: ref-filter.c:914 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atomen %%(then) använd efter %%(else)" -#: ref-filter.c:839 -#, c-format -msgid "format: %%(else) atom used without an %%(if) atom" -msgstr "format: atomen %%(else) använd utan en %%(if)-atom" - -#: ref-filter.c:841 -#, c-format -msgid "format: %%(else) atom used without a %%(then) atom" -msgstr "format: atomen %%(else) använd utan en %%(then)-atom" - -#: ref-filter.c:843 +#: ref-filter.c:950 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format: atomen %%(else) använd mer än en gång" -#: ref-filter.c:858 +#: ref-filter.c:965 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: atomen %%(end) använd utan motsvarande atom" -#: ref-filter.c:915 +#: ref-filter.c:1027 #, c-format msgid "malformed format string %s" msgstr "felformad formatsträng %s" -#: ref-filter.c:1556 +#: ref-filter.c:1033 +#, c-format +msgid "this command reject atom %%(%.*s)" +msgstr "kommandot förkastar atom %%(%.*s)" + +#: ref-filter.c:1040 +#, c-format +msgid "--format=%.*s cannot be used with --python, --shell, --tcl" +msgstr "--format=%.*s kan inte användas med --python, --shell, --tcl" + +#: ref-filter.c:1706 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: ref-filter.c:1559 +#: ref-filter.c:1709 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)" -#: ref-filter.c:1562 +#: ref-filter.c:1712 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" -#: ref-filter.c:1566 +#: ref-filter.c:1716 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD frånkopplat vid %s)" -#: ref-filter.c:1569 +#: ref-filter.c:1719 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD frånkopplat från %s)" -#: ref-filter.c:1572 +#: ref-filter.c:1722 msgid "(no branch)" msgstr "(ingen gren)" -#: ref-filter.c:1604 ref-filter.c:1813 +#: ref-filter.c:1754 ref-filter.c:1972 #, c-format msgid "missing object %s for %s" msgstr "objektet %s saknas för %s" -#: ref-filter.c:1614 +#: ref-filter.c:1764 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer misslyckades på %s för %s" -#: ref-filter.c:1997 +#: ref-filter.c:2155 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:2086 +#: ref-filter.c:2245 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:2091 refs.c:676 +#: ref-filter.c:2250 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" -#: ref-filter.c:2431 +#: ref-filter.c:2629 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:2525 +#: ref-filter.c:2740 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: ref-filter.c:2530 +#: ref-filter.c:2745 #, c-format msgid "option `%s' must point to a commit" msgstr "flaggan \"%s\" måste peka på en incheckning" -#: refs.c:264 +#: refs.c:261 #, c-format msgid "%s does not point to a valid object!" msgstr "\"%s\" pekar inte på ett giltigt objekt!" -#: refs.c:566 +#: refs.c:563 #, c-format msgid "" "Using '%s' as the name for the initial branch. This default branch name\n" @@ -6854,17 +7025,17 @@ msgstr "" "\n" "\tgit config --global init.defaultBranch <namn>\n" "\n" -"Namn som ofta används instället för \"master\" är \"main\", \"trunk\" och\n" +"Namn som ofta används istället för \"master\" är \"main\", \"trunk\" och\n" "\"development\". Den nyskapade grenen kan ges nytt namn med kommandot:\n" "\n" "\tgit branch -m <namn>\n" -#: refs.c:588 +#: refs.c:585 #, c-format msgid "could not retrieve `%s`" msgstr "kunde inte hämta \"%s\"" -#: refs.c:598 +#: refs.c:595 #, c-format msgid "invalid branch name: %s = %s" msgstr "felaktigt namn på gren: %s = %s" @@ -6874,66 +7045,66 @@ msgstr "felaktigt namn på gren: %s = %s" msgid "ignoring dangling symref %s" msgstr "ignorerar dinglande symbolisk referens %s" -#: refs.c:922 +#: refs.c:925 #, c-format msgid "log for ref %s has gap after %s" msgstr "loggen för referensen %s har lucka efter %s" -#: refs.c:929 +#: refs.c:932 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "loggen för referensen %s slutade oväntat på %s" -#: refs.c:994 +#: refs.c:997 #, c-format msgid "log for %s is empty" msgstr "loggen för %s är tom" -#: refs.c:1086 +#: refs.c:1090 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "vägrar uppdatera referens med trasigt namn \"%s\"" -#: refs.c:1157 +#: refs.c:1168 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref misslyckades för referensen \"%s\": %s" -#: refs.c:2051 +#: refs.c:2067 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "flera uppdateringar för referensen \"%s\" tillåts inte" -#: refs.c:2131 +#: refs.c:2150 msgid "ref updates forbidden inside quarantine environment" msgstr "referensuppdateringar förbjudna i karantänmiljö" -#: refs.c:2142 +#: refs.c:2161 msgid "ref updates aborted by hook" msgstr "referensuppdateringar avbrutna av krok" -#: refs.c:2242 refs.c:2272 +#: refs.c:2269 refs.c:2299 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "\"%s\" finns; kan inte skapa \"%s\"" -#: refs.c:2248 refs.c:2283 +#: refs.c:2275 refs.c:2310 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt" -#: refs/files-backend.c:1228 +#: refs/files-backend.c:1267 #, c-format msgid "could not remove reference %s" msgstr "kunde inte ta bort referensen %s" -#: refs/files-backend.c:1242 refs/packed-backend.c:1542 -#: refs/packed-backend.c:1552 +#: refs/files-backend.c:1281 refs/packed-backend.c:1549 +#: refs/packed-backend.c:1559 #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" -#: refs/files-backend.c:1245 refs/packed-backend.c:1555 +#: refs/files-backend.c:1284 refs/packed-backend.c:1562 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" @@ -6943,50 +7114,50 @@ msgstr "kunde inte ta bort referenser: %s" msgid "invalid refspec '%s'" msgstr "felaktig referensspecifikation: \"%s\"" -#: remote.c:351 +#: remote.c:402 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "konfigurerad kortform för fjärr kan inte börja med \"/\": %s" -#: remote.c:399 +#: remote.c:450 msgid "more than one receivepack given, using the first" msgstr "mer än en receivepack angavs, använder den första" -#: remote.c:407 +#: remote.c:458 msgid "more than one uploadpack given, using the first" msgstr "mer än en uploadpack angavs, använder den första" -#: remote.c:590 +#: remote.c:699 #, 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:594 +#: remote.c:703 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spårar vanligtvis %s, inte %s" -#: remote.c:598 +#: remote.c:707 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#: remote.c:666 +#: remote.c:775 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\"" -#: remote.c:676 +#: remote.c:785 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\"" -#: remote.c:1083 +#: remote.c:1192 #, c-format msgid "src refspec %s does not match any" msgstr "käll-referensspecifikationen %s motsvarar ingen" -#: remote.c:1088 +#: remote.c:1197 #, c-format msgid "src refspec %s matches more than one" msgstr "käll-referensspecifikationen %s motsvarar mer än en" @@ -6995,7 +7166,7 @@ msgstr "käll-referensspecifikationen %s motsvarar mer än en" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1103 +#: remote.c:1212 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -7018,7 +7189,7 @@ msgstr "" "\n" "Inget av dem fungerade, så vi gav upp. Ange fullständig referens." -#: remote.c:1123 +#: remote.c:1232 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -7029,7 +7200,7 @@ msgstr "" "Var det meningen att skapa en ny gren genom att sända\n" "till \"%s:refs/heads/%s\"?" -#: remote.c:1128 +#: remote.c:1237 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -7040,7 +7211,7 @@ msgstr "" "Var det meningen att skapa en ny tagg genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1133 +#: remote.c:1242 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -7051,7 +7222,7 @@ msgstr "" "Var det meningen att tagga ett nytt träd genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1138 +#: remote.c:1247 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -7062,114 +7233,114 @@ msgstr "" "Var det meningen att tagga en ny blob genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1174 +#: remote.c:1283 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s kan inte slås upp till en gren" -#: remote.c:1185 +#: remote.c:1294 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte" -#: remote.c:1197 +#: remote.c:1306 #, c-format msgid "dst refspec %s matches more than one" msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en" -#: remote.c:1204 +#: remote.c:1313 #, 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:1724 remote.c:1825 +#: remote.c:1834 remote.c:1941 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: remote.c:1733 +#: remote.c:1843 #, c-format msgid "no such branch: '%s'" msgstr "okänd gren: \"%s\"" -#: remote.c:1736 +#: remote.c:1846 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppström angiven för grenen \"%s\"" -#: remote.c:1742 +#: remote.c:1852 #, 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:1757 +#: remote.c:1867 #, 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:1769 +#: remote.c:1882 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "grenen \"%s\" har ingen fjärr för \"push\"" -#: remote.c:1779 +#: remote.c:1892 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\"" -#: remote.c:1792 +#: remote.c:1905 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mål (push.default är \"ingenting\")" -#: remote.c:1814 +#: remote.c:1927 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mål" -#: remote.c:1943 +#: remote.c:2060 #, c-format msgid "couldn't find remote ref %s" msgstr "Kunde inte hitta fjärr-referensen %s" -#: remote.c:1956 +#: remote.c:2073 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignorerar märklig referens \"%s\" lokalt" -#: remote.c:2119 +#: remote.c:2236 #, 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:2123 +#: remote.c:2240 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:2126 +#: remote.c:2243 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:2130 +#: remote.c:2247 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n" -#: remote.c:2133 +#: remote.c:2250 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (använd \"%s\" för detaljer)\n" -#: remote.c:2137 +#: remote.c:2254 #, 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:2143 +#: remote.c:2260 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:2146 +#: remote.c:2263 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -7179,11 +7350,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2154 +#: remote.c:2271 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:2157 +#: remote.c:2274 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -7198,11 +7369,11 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2167 +#: remote.c:2284 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:2359 +#: remote.c:2476 #, c-format msgid "cannot parse expected object name '%s'" msgstr "kan inte tolka förväntat objektnamn \"%s\"" @@ -7235,7 +7406,7 @@ msgstr "kunde inte skriva rerere-post" msgid "there were errors while writing '%s' (%s)" msgstr "fel vid skrivning av \"%s\" (%s)" -#: rerere.c:482 +#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298 #, c-format msgid "failed to flush '%s'" msgstr "misslyckades spola \"%s\"" @@ -7280,8 +7451,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:865 submodule.c:2089 builtin/log.c:2000 -#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891 +#: rerere.c:865 submodule.c:2121 builtin/log.c:2017 +#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" @@ -7319,46 +7490,33 @@ msgstr "kan inte uppdatera katalogen rr-cache" msgid "could not determine HEAD revision" msgstr "kunde inte bestämma HEAD-revision" -#: reset.c:70 reset.c:76 sequencer.c:3669 +#: reset.c:70 reset.c:76 sequencer.c:3700 #, c-format msgid "failed to find tree of %s" msgstr "kunde inte hitta trädet för %s." -#: revision.c:2343 +#: revision.c:2347 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<paketfil> stöds inte längre" -#: revision.c:2683 +#: revision.c:2686 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2686 +#: revision.c:2689 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar" -#: revision.c:2892 +#: revision.c:2891 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:767 -msgid "open /dev/null failed" -msgstr "misslyckades öppna /dev/null" - -#: run-command.c:1275 +#: run-command.c:1262 #, c-format msgid "cannot create async thread: %s" msgstr "kan inte skapa asynkron tråd: %s" -#: run-command.c:1345 -#, c-format -msgid "" -"The '%s' hook was ignored because it's not set as executable.\n" -"You can disable this warning with `git config advice.ignoredHook false`." -msgstr "" -"Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n" -"Du kan inaktivera varningen med \"git config advice.ignoredHook false\"." - #: send-pack.c:150 msgid "unexpected flush packet while reading remote unpack status" msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus" @@ -7377,23 +7535,23 @@ msgstr "fjärruppackning misslyckades: %s" msgid "failed to sign the push certificate" msgstr "misslyckades underteckna push-certifikatet" -#: send-pack.c:433 +#: send-pack.c:435 msgid "send-pack: unable to fork off fetch subprocess" msgstr "send-pack: kunde inte starta (fork) underprocessen för fetch" -#: send-pack.c:455 +#: send-pack.c:457 msgid "push negotiation failed; proceeding anyway with push" msgstr "sänd-förhandling misslyckades; fortsätter ändå med sändningen" -#: send-pack.c:520 +#: send-pack.c:528 msgid "the receiving end does not support this repository's hash algorithm" msgstr "mottagarsidan stöder inte arkivets hashningsalgoritm" -#: send-pack.c:529 +#: send-pack.c:537 msgid "the receiving end does not support --signed push" msgstr "mottagarsidan stöder inte push med --signed" -#: send-pack.c:531 +#: send-pack.c:539 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -7401,47 +7559,48 @@ msgstr "" "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --" "signed" -#: send-pack.c:543 +#: send-pack.c:546 msgid "the receiving end does not support --atomic push" msgstr "mottagarsidan stöder inte push med --atomic" -#: send-pack.c:548 +#: send-pack.c:551 msgid "the receiving end does not support push options" msgstr "mottagarsidan stöder inte push-flaggor" -#: sequencer.c:196 +#: sequencer.c:197 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\"" -#: sequencer.c:324 +#: sequencer.c:325 #, c-format msgid "could not delete '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402 +#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297 +#: builtin/rm.c:409 #, c-format msgid "could not remove '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:354 +#: sequencer.c:355 msgid "revert" msgstr "revert" -#: sequencer.c:356 +#: sequencer.c:357 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:358 +#: sequencer.c:359 msgid "rebase" msgstr "rebase" -#: sequencer.c:360 +#: sequencer.c:361 #, c-format msgid "unknown action: %d" msgstr "okänd funktion: %d" -#: sequencer.c:419 +#: sequencer.c:420 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -7449,53 +7608,81 @@ msgstr "" "efter att ha löst konflikterna, markera de rättade sökvägarna\n" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"" -#: sequencer.c:422 +#: sequencer.c:423 msgid "" -"after resolving the conflicts, mark the corrected paths\n" -"with 'git add <paths>' or 'git rm <paths>'\n" -"and commit the result with 'git commit'" +"After resolving the conflicts, mark them with\n" +"\"git add/rm <pathspec>\", then run\n" +"\"git cherry-pick --continue\".\n" +"You can instead skip this commit with \"git cherry-pick --skip\".\n" +"To abort and get back to the state before \"git cherry-pick\",\n" +"run \"git cherry-pick --abort\"." msgstr "" -"efter att ha löst konflikterna, markera de rättade sökvägarna\n" -"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" -"och checka in resultatet med \"git commit\"" +"Efter att ha löst konflikterna, märk dem med\n" +"\"git add/rm <sökvägsangivelse>\" och kör sedan\n" +"\"git cherry-pick --continue\".\n" +"Du kan hoppa över incheckningen istället med \"git cherry-pick --skip\"\n" +"För att avbryta och återgå till där du var före \"git cherry-pick\",\n" +"kör \"git cherry-pick --abort\"." -#: sequencer.c:435 sequencer.c:3271 +#: sequencer.c:430 +msgid "" +"After resolving the conflicts, mark them with\n" +"\"git add/rm <pathspec>\", then run\n" +"\"git revert --continue\".\n" +"You can instead skip this commit with \"git revert --skip\".\n" +"To abort and get back to the state before \"git revert\",\n" +"run \"git revert --abort\"." +msgstr "" +"Efter att ha löst konflikterna, märk dem med\n" +"\"git add/rm <sökvägsangivelse>\" och kör sedan\n" +"\"git revert --continue\".\n" +"Du kan hoppa över incheckningen istället med \"git revert --skip\"\n" +"För att avbryta och återgå till där du var före \"git revert\",\n" +"kör \"git revert --abort\"." + +#: sequencer.c:448 sequencer.c:3292 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 -#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631 +#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310 +#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" -#: sequencer.c:442 +#: sequencer.c:455 #, c-format msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 -#: sequencer.c:3554 +#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312 +#: sequencer.c:3569 #, c-format msgid "failed to finalize '%s'" msgstr "misslyckades färdigställa \"%s\"" -#: sequencer.c:486 +#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551 +#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148 +#, c-format +msgid "could not read '%s'" +msgstr "kunde inte läsa \"%s\"" + +#: sequencer.c:499 #, c-format msgid "your local changes would be overwritten by %s." msgstr "dina lokala ändringar skulle skrivas över av %s." -#: sequencer.c:490 +#: sequencer.c:503 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:522 +#: sequencer.c:535 #, c-format msgid "%s: fast-forward" msgstr "%s: snabbspola" -#: sequencer.c:561 builtin/tag.c:609 +#: sequencer.c:574 builtin/tag.c:614 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" @@ -7503,65 +7690,65 @@ msgstr "Felaktigt städningsläge %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:671 +#: sequencer.c:685 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:685 +#: sequencer.c:699 msgid "unable to update cache tree" msgstr "kan inte uppdatera cacheträd" -#: sequencer.c:699 +#: sequencer.c:713 msgid "could not resolve HEAD commit" msgstr "kunde inte bestämma HEAD:s incheckning" -#: sequencer.c:779 +#: sequencer.c:793 #, c-format msgid "no key present in '%.*s'" msgstr "ingen nyckel i \"%.*s\"" -#: sequencer.c:790 +#: sequencer.c:804 #, c-format msgid "unable to dequote value of '%s'" msgstr "kan inte ta bort citering av värdet \"%s\"" -#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728 -#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910 +#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756 +#: builtin/am.c:848 builtin/rebase.c:694 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: sequencer.c:837 +#: sequencer.c:851 msgid "'GIT_AUTHOR_NAME' already given" msgstr "\"GIT_AUTHOR_NAME\" har redan angivits" -#: sequencer.c:842 +#: sequencer.c:856 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits" -#: sequencer.c:847 +#: sequencer.c:861 msgid "'GIT_AUTHOR_DATE' already given" msgstr "\"GIT_AUTHOR_DATE\" har redan angivits" -#: sequencer.c:851 +#: sequencer.c:865 #, c-format msgid "unknown variable '%s'" msgstr "okänd variabel \"%s\"" -#: sequencer.c:856 +#: sequencer.c:870 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "\"GIT_AUTHOR_NAME\" saknas" -#: sequencer.c:858 +#: sequencer.c:872 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "\"GIT_AUTHOR_EMAIL\" saknas" -#: sequencer.c:860 +#: sequencer.c:874 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "\"GIT_AUTHOR_DATE\" saknas" -#: sequencer.c:925 +#: sequencer.c:939 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -7590,11 +7777,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1212 +#: sequencer.c:1225 msgid "'prepare-commit-msg' hook failed" msgstr "kroken \"prepare-commit-msg\" misslyckades" -#: sequencer.c:1218 +#: sequencer.c:1231 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7621,7 +7808,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1231 +#: sequencer.c:1244 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7646,344 +7833,351 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1273 +#: sequencer.c:1288 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: sequencer.c:1275 +#: sequencer.c:1290 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: sequencer.c:1321 +#: sequencer.c:1339 msgid "unable to resolve HEAD after creating commit" msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning" -#: sequencer.c:1323 +#: sequencer.c:1342 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: sequencer.c:1327 +#: sequencer.c:1346 msgid " (root-commit)" msgstr " (rotincheckning)" -#: sequencer.c:1348 +#: sequencer.c:1367 msgid "could not parse HEAD" msgstr "kunde inte tolka HEAD" -#: sequencer.c:1350 +#: sequencer.c:1369 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s är inte en incheckning!" -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692 +#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: sequencer.c:1410 sequencer.c:2295 +#: sequencer.c:1429 sequencer.c:2314 msgid "unable to parse commit author" msgstr "kunde inte tolka incheckningens författare" -#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706 +#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: sequencer.c:1454 sequencer.c:1574 +#: sequencer.c:1473 sequencer.c:1593 #, c-format msgid "unable to read commit message from '%s'" msgstr "kunde inte läsa incheckningsmeddelande från \"%s\"" -#: sequencer.c:1485 sequencer.c:1517 +#: sequencer.c:1504 sequencer.c:1536 #, c-format msgid "invalid author identity '%s'" msgstr "ogiltig författar-identitet \"%s\"" -#: sequencer.c:1491 +#: sequencer.c:1510 msgid "corrupt author: missing date information" msgstr "trasig författare: saknar datuminformation" -#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909 -#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915 +#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199 +#: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:1606 +#: sequencer.c:1625 #, c-format msgid "could not parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: sequencer.c:1611 +#: sequencer.c:1630 #, c-format msgid "could not parse parent commit %s" msgstr "kunde inte tolka föräldraincheckningen %s" -#: sequencer.c:1694 sequencer.c:1975 +#: sequencer.c:1713 sequencer.c:1994 #, c-format msgid "unknown command: %d" msgstr "okänt kommando: %d" -#: sequencer.c:1736 git-rebase--preserve-merges.sh:486 +#: sequencer.c:1755 msgid "This is the 1st commit message:" msgstr "Det här är 1:a incheckningsmeddelandet:" -#: sequencer.c:1737 +#: sequencer.c:1756 #, c-format msgid "This is the commit message #%d:" msgstr "Det här är incheckningsmeddelande %d:" -#: sequencer.c:1738 +#: sequencer.c:1757 msgid "The 1st commit message will be skipped:" msgstr "1:a incheckningsmeddelandet kommer hoppas över:" -#: sequencer.c:1739 +#: sequencer.c:1758 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Incheckningsmeddelande %d kommer hoppas över:" -#: sequencer.c:1740 +#: sequencer.c:1759 #, c-format msgid "This is a combination of %d commits." msgstr "Det här är en kombination av %d incheckningar." -#: sequencer.c:1887 sequencer.c:1944 +#: sequencer.c:1906 sequencer.c:1963 #, c-format msgid "cannot write '%s'" msgstr "kan inte skriva \"%s\"" -#: sequencer.c:1934 +#: sequencer.c:1953 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:1936 sequencer.c:3581 +#: sequencer.c:1955 sequencer.c:3596 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:1938 +#: sequencer.c:1957 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:1962 +#: sequencer.c:1981 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:2072 +#: sequencer.c:2091 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:2079 +#: sequencer.c:2098 msgid "cannot fixup root commit" msgstr "kan inte göra \"fixup\" på rotincheckning" -#: sequencer.c:2098 +#: sequencer.c:2117 #, 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:2106 sequencer.c:2114 +#: sequencer.c:2125 sequencer.c:2133 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:2120 +#: sequencer.c:2139 #, 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:2139 +#: sequencer.c:2158 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:2205 +#: sequencer.c:2224 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:2265 +#: sequencer.c:2284 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:2266 +#: sequencer.c:2285 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:2287 +#: sequencer.c:2306 #, 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:2345 +#: sequencer.c:2364 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:2352 +#: sequencer.c:2372 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:2425 +#: sequencer.c:2452 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s tar inte argument: \"%s\"" -#: sequencer.c:2434 +#: sequencer.c:2461 #, c-format msgid "missing arguments for %s" msgstr "argument saknas för %s" -#: sequencer.c:2477 +#: sequencer.c:2504 #, c-format msgid "could not parse '%s'" msgstr "kunde inte tolka \"%s\"" -#: sequencer.c:2538 +#: sequencer.c:2565 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:2549 +#: sequencer.c:2576 #, c-format msgid "cannot '%s' without a previous commit" msgstr "kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:2635 +#: sequencer.c:2624 builtin/rebase.c:184 +#, c-format +msgid "could not read '%s'." +msgstr "kunde inte läsa \"%s\"." + +#: sequencer.c:2662 msgid "cancelling a cherry picking in progress" msgstr "avbryter pågående \"cherry-pick\"" -#: sequencer.c:2644 +#: sequencer.c:2671 msgid "cancelling a revert in progress" msgstr "avbryter pågående \"revert\"" -#: sequencer.c:2690 +#: sequencer.c:2711 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:2692 +#: sequencer.c:2713 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: \"%s\"" -#: sequencer.c:2697 +#: sequencer.c:2718 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:2708 +#: sequencer.c:2729 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:2710 +#: sequencer.c:2731 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:2788 +#: sequencer.c:2809 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:2897 +#: sequencer.c:2918 msgid "unusable squash-onto" msgstr "oanvändbar squash-onto" -#: sequencer.c:2917 +#: sequencer.c:2938 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: \"%s\"" -#: sequencer.c:3012 sequencer.c:4869 +#: sequencer.c:3033 sequencer.c:4902 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:3029 +#: sequencer.c:3050 msgid "revert is already in progress" msgstr "en \"revert\" pågår redan" -#: sequencer.c:3031 +#: sequencer.c:3052 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "testa \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:3034 +#: sequencer.c:3055 msgid "cherry-pick is already in progress" msgstr "en \"cherry-pick\" pågår redan" -#: sequencer.c:3036 +#: sequencer.c:3057 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:3050 +#: sequencer.c:3071 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:3065 +#: sequencer.c:3086 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:3125 sequencer.c:4582 +#: sequencer.c:3146 sequencer.c:4612 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:3127 sequencer.c:3138 +#: sequencer.c:3148 sequencer.c:3159 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:3129 sequencer.c:3173 +#: sequencer.c:3150 sequencer.c:3194 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:3159 builtin/grep.c:759 +#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416 +#: builtin/grep.c:772 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:3161 +#: sequencer.c:3182 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:3162 +#: sequencer.c:3183 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:3168 +#: sequencer.c:3189 #, 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:3179 +#: sequencer.c:3200 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:3220 +#: sequencer.c:3241 msgid "no revert in progress" msgstr "ingen \"revers\" pågår" -#: sequencer.c:3229 +#: sequencer.c:3250 msgid "no cherry-pick in progress" msgstr "ingen \"cherry-pick\" pågår" -#: sequencer.c:3239 +#: sequencer.c:3260 msgid "failed to skip the commit" msgstr "kunde inte hoppa över incheckningen" -#: sequencer.c:3246 +#: sequencer.c:3267 msgid "there is nothing to skip" msgstr "ingenting att hoppa över" -#: sequencer.c:3249 +#: sequencer.c:3270 #, c-format msgid "" "have you committed already?\n" @@ -7992,16 +8186,16 @@ msgstr "" "har du redan checkat in?\n" "testa \"git %s --continue\"" -#: sequencer.c:3411 sequencer.c:4473 +#: sequencer.c:3432 sequencer.c:4503 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:3428 +#: sequencer.c:3449 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "kan inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3436 +#: sequencer.c:3457 #, c-format msgid "" "You can amend the commit now, with\n" @@ -8020,27 +8214,27 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:3446 +#: sequencer.c:3467 #, c-format msgid "Could not apply %s... %.*s" msgstr "Kunde inte tillämpa %s... %.*s" -#: sequencer.c:3453 +#: sequencer.c:3474 #, c-format msgid "Could not merge %.*s" msgstr "Kunde inte slå ihop %.*s" -#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644 +#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3483 +#: sequencer.c:3503 #, c-format msgid "Executing: %s\n" msgstr "Kör: %s\n" -#: sequencer.c:3498 +#: sequencer.c:3514 #, c-format msgid "" "execution failed: %s\n" @@ -8055,11 +8249,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3504 +#: sequencer.c:3520 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:3510 +#: sequencer.c:3526 #, c-format msgid "" "execution succeeded: %s\n" @@ -8076,90 +8270,90 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3571 +#: sequencer.c:3586 #, c-format msgid "illegal label name: '%.*s'" msgstr "ogiltigt etikettnamn: \"%.*s\"" -#: sequencer.c:3625 +#: sequencer.c:3659 msgid "writing fake root commit" msgstr "skriver fejkad rotincheckning" -#: sequencer.c:3630 +#: sequencer.c:3664 msgid "writing squash-onto" msgstr "skriver squash-onto" -#: sequencer.c:3714 +#: sequencer.c:3743 #, c-format msgid "could not resolve '%s'" msgstr "kunde inte upplösa \"%s\"" -#: sequencer.c:3747 +#: sequencer.c:3775 msgid "cannot merge without a current revision" msgstr "kan inte slå ihop utan en aktuell incheckning" -#: sequencer.c:3769 +#: sequencer.c:3797 #, c-format msgid "unable to parse '%.*s'" msgstr "kan inte tolka \"%.*s\"" -#: sequencer.c:3778 +#: sequencer.c:3806 #, c-format msgid "nothing to merge: '%.*s'" msgstr "inget att slå samman: \"%.*s\"" -#: sequencer.c:3790 +#: sequencer.c:3818 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:3806 +#: sequencer.c:3873 #, c-format msgid "could not get commit message of '%s'" msgstr "kunde inte läsa incheckningsmeddelande för \"%s\"" -#: sequencer.c:3989 +#: sequencer.c:4019 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "kunde inte ens försöka slå ihop \"%.*s\"" -#: sequencer.c:4005 +#: sequencer.c:4035 msgid "merge: Unable to write new index file" msgstr "sammanslagning: Kunde inte skriva ny indexfil" -#: sequencer.c:4079 +#: sequencer.c:4116 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: sequencer.c:4082 +#: sequencer.c:4119 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Oväntat svar från stash: \"%s\"" -#: sequencer.c:4088 +#: sequencer.c:4125 #, c-format msgid "Could not create directory for '%s'" msgstr "Kunde inte skapa katalog för \"%s\"" -#: sequencer.c:4091 +#: sequencer.c:4128 #, c-format msgid "Created autostash: %s\n" msgstr "Skapade autostash: %s\n" -#: sequencer.c:4095 +#: sequencer.c:4132 msgid "could not reset --hard" msgstr "kunde inte utföra \"reset --hard\"" -#: sequencer.c:4120 +#: sequencer.c:4157 #, c-format msgid "Applied autostash.\n" msgstr "Tillämpade autostash.\n" -#: sequencer.c:4132 +#: sequencer.c:4169 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:4135 +#: sequencer.c:4172 #, c-format msgid "" "%s\n" @@ -8170,29 +8364,29 @@ msgstr "" "Dina ändringar är säkra i stashen.\n" "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" -#: sequencer.c:4140 +#: sequencer.c:4177 msgid "Applying autostash resulted in conflicts." msgstr "Tillämpning av autostash gav konflikter." -#: sequencer.c:4141 +#: sequencer.c:4178 msgid "Autostash exists; creating a new stash entry." msgstr "Autostash finns; skapar ny stash-post." -#: sequencer.c:4234 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4252 msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" -#: sequencer.c:4249 +#: sequencer.c:4267 #, c-format msgid "Stopped at HEAD\n" msgstr "Stoppade på HEAD\n" -#: sequencer.c:4251 +#: sequencer.c:4269 #, c-format msgid "Stopped at %s\n" msgstr "Stoppade på %s\n" -#: sequencer.c:4259 +#: sequencer.c:4301 #, c-format msgid "" "Could not execute the todo command\n" @@ -8213,58 +8407,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4305 +#: sequencer.c:4347 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Ombaserar (%d/%d)%s" -#: sequencer.c:4351 +#: sequencer.c:4393 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:4422 +#: sequencer.c:4463 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:4481 +#: sequencer.c:4511 msgid "could not read orig-head" msgstr "kunde inte läsa orig-head" -#: sequencer.c:4486 +#: sequencer.c:4516 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:4500 +#: sequencer.c:4530 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:4560 +#: sequencer.c:4590 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Lyckades ombasera och uppdatera %s.\n" -#: sequencer.c:4612 +#: sequencer.c:4642 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:4621 +#: sequencer.c:4651 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:4623 +#: sequencer.c:4653 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:4625 +#: sequencer.c:4655 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:4628 +#: sequencer.c:4658 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -8274,59 +8468,68 @@ msgstr "" "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" "först och kör sedan \"git rebase --continue\" igen." -#: sequencer.c:4664 sequencer.c:4703 +#: sequencer.c:4694 sequencer.c:4733 #, c-format msgid "could not write file: '%s'" msgstr "kunde inte skriva fil: \"%s\"" -#: sequencer.c:4719 +#: sequencer.c:4749 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:4726 +#: sequencer.c:4759 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:4846 +#: sequencer.c:4879 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:4850 +#: sequencer.c:4883 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:4885 +#: sequencer.c:4918 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" -#: sequencer.c:5362 +#: sequencer.c:5189 sequencer.c:5418 +#, c-format +msgid "skipped previously applied commit %s" +msgstr "hoppade över tidigare applicerad incheckning %s" + +#: sequencer.c:5259 sequencer.c:5434 +msgid "use --reapply-cherry-picks to include skipped commits" +msgstr "använd --reapply-cherry-picks för att ta med överhoppade incheckningar" + +#: sequencer.c:5405 msgid "make_script: unhandled options" msgstr "make_script: flaggor som inte stöds" -#: sequencer.c:5365 +#: sequencer.c:5408 msgid "make_script: error preparing revisions" msgstr "make_script: fel när revisioner skulle förberedas" -#: sequencer.c:5615 sequencer.c:5632 +#: sequencer.c:5666 sequencer.c:5683 msgid "nothing to do" msgstr "inget att göra" -#: sequencer.c:5651 +#: sequencer.c:5702 msgid "could not skip unnecessary pick commands" msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon" -#: sequencer.c:5751 +#: sequencer.c:5802 msgid "the script was already rearranged." msgstr "skriptet har redan omordnats." -#: setup.c:133 +#: setup.c:134 #, c-format msgid "'%s' is outside repository at '%s'" msgstr "\"%s\" är utanför arkivet på \"%s\"" -#: setup.c:185 +#: setup.c:186 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -8336,7 +8539,7 @@ msgstr "" "Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns " "lokalt." -#: setup.c:198 +#: setup.c:199 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -8348,12 +8551,12 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:264 +#: setup.c:265 #, 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:283 +#: setup.c:284 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -8364,96 +8567,100 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:419 +#: setup.c:420 msgid "unable to set up work tree using invalid config" msgstr "kan inte skapa arbetskatalog med felaktig konfiguration" -#: setup.c:423 +#: setup.c:424 builtin/rev-parse.c:895 msgid "this operation must be run in a work tree" msgstr "funktionen måste köras i en arbetskatalog" -#: setup.c:661 +#: setup.c:722 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Förväntade git-arkivversion <= %d, hittade %d" -#: setup.c:669 -msgid "unknown repository extensions found:" -msgstr "okända arkivutökningar hittades:" +#: setup.c:730 +msgid "unknown repository extension found:" +msgid_plural "unknown repository extensions found:" +msgstr[0] "okänd arkivutökning hittades:" +msgstr[1] "okända arkivutökningar hittades:" -#: setup.c:681 -msgid "repo version is 0, but v1-only extensions found:" -msgstr "arkivversionen är 0, men utökningar som bara finns i v1 upptäcktes:" +#: setup.c:744 +msgid "repo version is 0, but v1-only extension found:" +msgid_plural "repo version is 0, but v1-only extensions found:" +msgstr[0] "arkivversionen är 0, men utökning som bara finns i v1 upptäcktes:" +msgstr[1] "arkivversionen är 0, men utökningar som bara finns i v1 upptäcktes:" -#: setup.c:700 +#: setup.c:765 #, c-format msgid "error opening '%s'" msgstr "fel vid öppning av \"%s\"" -#: setup.c:702 +#: setup.c:767 #, 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:704 +#: setup.c:769 #, c-format msgid "error reading %s" msgstr "fel vid läsning av %s" -#: setup.c:706 +#: setup.c:771 #, c-format msgid "invalid gitfile format: %s" msgstr "ogiltigt gitfilformat: %s" -#: setup.c:708 +#: setup.c:773 #, c-format msgid "no path in gitfile: %s" msgstr "ingen sökväg i gitfil: %s" -#: setup.c:710 +#: setup.c:775 #, c-format msgid "not a git repository: %s" msgstr "inte ett git-arkiv: %s" -#: setup.c:812 +#: setup.c:877 #, c-format msgid "'$%s' too big" msgstr "\"$%s\" för stor" -#: setup.c:826 +#: setup.c:891 #, c-format msgid "not a git repository: '%s'" msgstr "inte ett git-arkiv: \"%s\"" -#: setup.c:855 setup.c:857 setup.c:888 +#: setup.c:920 setup.c:922 setup.c:953 #, c-format msgid "cannot chdir to '%s'" msgstr "kan inte byta katalog (chdir) till \"%s\"" -#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 +#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038 msgid "cannot come back to cwd" msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)" -#: setup.c:987 +#: setup.c:1052 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "misslyckades ta status på \"%*ss%s%s\"" -#: setup.c:1225 +#: setup.c:1295 msgid "Unable to read current working directory" msgstr "Kan inte läsa aktuell arbetskatalog" -#: setup.c:1234 setup.c:1240 +#: setup.c:1304 setup.c:1310 #, c-format msgid "cannot change to '%s'" msgstr "kan inte byta till \"%s\"" -#: setup.c:1245 +#: setup.c:1315 #, 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:1251 +#: setup.c:1321 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -8463,7 +8670,7 @@ msgstr "" "monteringspunkten %s)\n" "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." -#: setup.c:1370 +#: setup.c:1446 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -8472,27 +8679,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:1417 -msgid "open /dev/null or dup failed" -msgstr "misslyckades öppna /dev/null eller \"dup\"" - -#: setup.c:1432 +#: setup.c:1508 msgid "fork failed" msgstr "\"fork\" misslyckades" -#: setup.c:1437 t/helper/test-simple-ipc.c:285 +#: setup.c:1513 msgid "setsid failed" msgstr "\"setsid\" misslyckades" -#: sparse-index.c:151 -msgid "attempting to use sparse-index without cone mode" -msgstr "försöker använda glest index utan \"cone\"-läge" - -#: sparse-index.c:156 -msgid "unable to update cache-tree, staying full" -msgstr "kan inte uppdatera cacheträd, behåller fullt läge" - -#: sparse-index.c:239 +#: sparse-index.c:289 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "indexposten är en katalog, men inte gles (%08x)" @@ -8549,13 +8744,13 @@ msgid_plural "%u bytes/s" msgstr[0] "%u byte/s" msgstr[1] "%u bytes/s" -#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737 -#: builtin/rebase.c:866 +#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765 +#: builtin/rebase.c:650 #, c-format msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" -#: strbuf.c:1177 +#: strbuf.c:1195 #, c-format msgid "could not edit '%s'" msgstr "kunde inte redigera \"%s\"" @@ -8579,7 +8774,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:766 +#: submodule-config.c:767 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Kunde inte uppdatera .gitmodules-posten %s" @@ -8604,22 +8799,22 @@ msgstr "Kunde inte ta bort .gitmodules-posten för %s" msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:328 +#: submodule.c:358 #, c-format msgid "in unpopulated submodule '%s'" msgstr "i ej utcheckad undermodul \"%s\"" -#: submodule.c:359 +#: submodule.c:389 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" -#: submodule.c:436 +#: submodule.c:466 #, c-format msgid "bad --ignore-submodules argument: %s" msgstr "felaktigt argument till --ignore-submodules: %s" -#: submodule.c:818 +#: submodule.c:844 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " @@ -8628,12 +8823,12 @@ msgstr "" "Undermodulen i incheckning %s på sökvägen: \"%s\" krockar med en undermodul " "med samma namn. Hoppar över den." -#: submodule.c:921 +#: submodule.c:954 #, 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:1006 +#: submodule.c:1042 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " @@ -8642,36 +8837,36 @@ msgstr "" "kunde inte köra \"git rev-list <incheckningar> --not --remotes -n 1\" i " "undermodulen \"%s\"" -#: submodule.c:1129 +#: submodule.c:1165 #, c-format msgid "process for submodule '%s' failed" msgstr "process för undermodulen \"%s\" misslyckades" -#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470 +#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens." -#: submodule.c:1169 +#: submodule.c:1205 #, c-format msgid "Pushing submodule '%s'\n" msgstr "Sänder undermodulen \"%s\"\n" -#: submodule.c:1172 +#: submodule.c:1208 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "Kunde inte sända undermodulen \"%s\"\n" -#: submodule.c:1464 +#: submodule.c:1491 #, c-format msgid "Fetching submodule %s%s\n" msgstr "Hämtar undermodulen %s%s\n" -#: submodule.c:1498 +#: submodule.c:1525 #, c-format msgid "Could not access submodule '%s'\n" msgstr "Kunde inte komma åt undermodulen \"%s\"\n" -#: submodule.c:1653 +#: submodule.c:1680 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8680,61 +8875,61 @@ msgstr "" "Fel vid hämtning av undermodul:\n" "%s" -#: submodule.c:1678 +#: submodule.c:1705 #, c-format msgid "'%s' not recognized as a git repository" msgstr "\"%s\" känns inte igen som ett git-arkiv" -#: submodule.c:1695 +#: submodule.c:1722 #, 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:1736 +#: submodule.c:1763 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\"" -#: submodule.c:1811 +#: submodule.c:1838 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "kunde inte starta \"git status\" i undermodulen \"%s\"" -#: submodule.c:1824 +#: submodule.c:1851 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "kunde inte köra \"git status\" i undermodulen \"%s\"" -#: submodule.c:1839 +#: submodule.c:1868 #, 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:1866 submodule.c:2176 +#: submodule.c:1895 submodule.c:2210 #, c-format msgid "could not recurse into submodule '%s'" msgstr "kunde inte rekursera in i undermodulen \"%s\"" -#: submodule.c:1887 +#: submodule.c:1917 msgid "could not reset submodule index" msgstr "kunde inte återställa indexet i undermodul" -#: submodule.c:1929 +#: submodule.c:1959 #, c-format msgid "submodule '%s' has dirty index" msgstr "undermodulen \"%s\" har ett smutsigt index" -#: submodule.c:1981 +#: submodule.c:2013 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Undermoduler \"%s\" kunde inte uppdateras." -#: submodule.c:2049 +#: submodule.c:2081 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\"" -#: submodule.c:2070 +#: submodule.c:2102 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8742,17 +8937,17 @@ msgstr "" "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " "stöds ej" -#: submodule.c:2082 submodule.c:2141 +#: submodule.c:2114 submodule.c:2174 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" -#: submodule.c:2086 +#: submodule.c:2118 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog" -#: submodule.c:2093 +#: submodule.c:2124 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8763,11 +8958,11 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:2221 +#: submodule.c:2255 msgid "could not start ls-files in .." msgstr "kunde inte starta ls-files i .." -#: submodule.c:2261 +#: submodule.c:2295 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en oväntad returkod %d" @@ -8789,7 +8984,7 @@ msgid "unknown value '%s' for key '%s'" msgstr "okänt värde \"%s\" för nyckeln \"%s\"" #: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299 -#: builtin/remote.c:324 +#: builtin/remote.c:327 #, c-format msgid "more than one %s" msgstr "mer än en %s" @@ -8804,11 +8999,11 @@ msgstr "tom släpradssymbol i släpraden \"%.*s\"" msgid "could not read input file '%s'" msgstr "kunde inte läsa indatafilen \"%s\"" -#: trailer.c:766 builtin/mktag.c:88 +#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573 msgid "could not read from stdin" msgstr "kunde inte läsa från standard in" -#: trailer.c:1024 wrapper.c:676 +#: trailer.c:1024 wrapper.c:684 #, c-format msgid "could not stat %s" msgstr "kunde inte ta status på %s" @@ -8878,7 +9073,7 @@ msgstr "kunde inte köra fast-import" msgid "error while running fast-import" msgstr "fel när fast-import kördes" -#: transport-helper.c:549 transport-helper.c:1247 +#: transport-helper.c:549 transport-helper.c:1251 #, c-format msgid "could not read ref %s" msgstr "kunde inte läsa referensen %s" @@ -8896,7 +9091,7 @@ msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst" msgid "invalid remote service path" msgstr "felaktig sökväg till fjärrtjänst" -#: transport-helper.c:661 transport.c:1471 +#: transport-helper.c:661 transport.c:1479 msgid "operation not supported by protocol" msgstr "funktionen stöds inte av protokollet" @@ -8905,7 +9100,7 @@ msgstr "funktionen stöds inte av protokollet" msgid "can't connect to subservice %s" msgstr "kan inte ansluta till undertjänsten %s" -#: transport-helper.c:693 transport.c:397 +#: transport-helper.c:693 transport.c:404 msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only kräver protokoll v2" @@ -8918,59 +9113,59 @@ msgstr "\"option\" utan mostsvarande \"ok/error\"-direktiv" msgid "expected ok/error, helper said '%s'" msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\"" -#: transport-helper.c:855 +#: transport-helper.c:859 #, c-format msgid "helper reported unexpected status of %s" msgstr "hjälparen returnerade oväntad status %s" -#: transport-helper.c:938 +#: transport-helper.c:942 #, c-format msgid "helper %s does not support dry-run" msgstr "hjälparen %s stöder inte dry-run" -#: transport-helper.c:941 +#: transport-helper.c:945 #, c-format msgid "helper %s does not support --signed" msgstr "hjälparen %s stöder inte --signed" -#: transport-helper.c:944 +#: transport-helper.c:948 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "hjälparen %s stöder inte --signed=if-asked" -#: transport-helper.c:949 +#: transport-helper.c:953 #, c-format msgid "helper %s does not support --atomic" msgstr "hjälparen %s stöder inte --atomic" -#: transport-helper.c:953 +#: transport-helper.c:957 #, c-format msgid "helper %s does not support --%s" msgstr "hjälparen %s stöder inte --%s" -#: transport-helper.c:960 +#: transport-helper.c:964 #, c-format msgid "helper %s does not support 'push-option'" msgstr "hjälparen %s stöder inte \"push-option\"" -#: transport-helper.c:1060 +#: transport-helper.c:1064 msgid "remote-helper doesn't support push; refspec needed" msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs" -#: transport-helper.c:1065 +#: transport-helper.c:1069 #, c-format msgid "helper %s does not support 'force'" msgstr "hjälparen %s stöder inte \"force\"" -#: transport-helper.c:1112 +#: transport-helper.c:1116 msgid "couldn't run fast-export" msgstr "kunde inte köra fast-export" -#: transport-helper.c:1117 +#: transport-helper.c:1121 msgid "error while running fast-export" msgstr "fel vid körning av fast-export" -#: transport-helper.c:1142 +#: transport-helper.c:1146 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8979,52 +9174,52 @@ msgstr "" "Inga gemensamma referenser och inga angavs; gör inget.\n" "Du kanske borde ange en gren.\n" -#: transport-helper.c:1224 +#: transport-helper.c:1228 #, c-format msgid "unsupported object format '%s'" msgstr "objektformatet \"%s\" stöds ej" -#: transport-helper.c:1233 +#: transport-helper.c:1237 #, c-format msgid "malformed response in ref list: %s" msgstr "felformat svar i referenslistan: %s" -#: transport-helper.c:1385 +#: transport-helper.c:1389 #, c-format msgid "read(%s) failed" msgstr "läs(%s) misslyckades" -#: transport-helper.c:1412 +#: transport-helper.c:1416 #, c-format msgid "write(%s) failed" msgstr "skriv(%s) misslyckades" -#: transport-helper.c:1461 +#: transport-helper.c:1465 #, c-format msgid "%s thread failed" msgstr "%s-tråden misslyckades" -#: transport-helper.c:1465 +#: transport-helper.c:1469 #, c-format msgid "%s thread failed to join: %s" msgstr "%s-tråden misslyckades ansluta: %s" -#: transport-helper.c:1484 transport-helper.c:1488 +#: transport-helper.c:1488 transport-helper.c:1492 #, 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:1525 +#: transport-helper.c:1529 #, c-format msgid "%s process failed to wait" msgstr "processen %s misslyckades vänta" -#: transport-helper.c:1529 +#: transport-helper.c:1533 #, c-format msgid "%s process failed" msgstr "processen %s misslyckades" -#: transport-helper.c:1547 transport-helper.c:1556 +#: transport-helper.c:1551 transport-helper.c:1560 msgid "can't start thread for copying data" msgstr "kan inte skapa tråd för kopiering av data" @@ -9036,48 +9231,48 @@ msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n" #: transport.c:145 #, c-format msgid "could not read bundle '%s'" -msgstr "kunde inte läsa paketet (bundlen) \"%s\"" +msgstr "kunde inte läsa bunten \"%s\"" -#: transport.c:220 +#: transport.c:227 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: ogiltig flagga för depth: \"%s\"" -#: transport.c:272 +#: transport.c:279 msgid "see protocol.version in 'git help config' for more details" msgstr "se protocol.version i \"git help config\" för mer information" -#: transport.c:273 +#: transport.c:280 msgid "server options require protocol version 2 or later" msgstr "serverflaggor kräver protokollversion 2 eller senare" -#: transport.c:400 +#: transport.c:407 msgid "server does not support wait-for-done" msgstr "servern stöder inte wait-for-done" -#: transport.c:751 +#: transport.c:759 msgid "could not parse transport.color.* config" msgstr "kunde inte tolka inställningen för transport.color.*" -#: transport.c:826 +#: transport.c:834 msgid "support for protocol v2 not implemented yet" msgstr "stöd för protokoll v2 ännu ej implementerat" -#: transport.c:960 +#: transport.c:967 #, c-format msgid "unknown value for config '%s': %s" msgstr "okänt värde för inställningen \"%s\": %s" -#: transport.c:1026 +#: transport.c:1033 #, c-format msgid "transport '%s' not allowed" msgstr "transporten \"%s\" tillåts inte" -#: transport.c:1079 +#: transport.c:1082 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync stöds inte längre" -#: transport.c:1181 +#: transport.c:1185 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -9086,7 +9281,7 @@ msgstr "" "Följande undermodulsökvägar innehåller ändringar som\n" "inte kan hittas av fjärrarna:\n" -#: transport.c:1185 +#: transport.c:1189 #, c-format msgid "" "\n" @@ -9113,11 +9308,11 @@ msgstr "" "för att sända dem till fjärren.\n" "\n" -#: transport.c:1193 +#: transport.c:1197 msgid "Aborting." msgstr "Avbryter." -#: transport.c:1340 +#: transport.c:1343 msgid "failed to push all needed submodules" msgstr "kunde inte sända alla nödvändiga undermoduler" @@ -9137,7 +9332,7 @@ msgstr "tomt filnamn i trädpost" msgid "too-short tree file" msgstr "trädfil för kort" -#: unpack-trees.c:115 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -9146,7 +9341,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:117 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -9155,7 +9350,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%s" -#: unpack-trees.c:120 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -9165,7 +9360,7 @@ msgstr "" "sammanslagning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:122 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -9175,7 +9370,7 @@ msgstr "" "sammanslagning:\n" "%%s" -#: unpack-trees.c:125 +#: unpack-trees.c:128 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -9184,7 +9379,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"." -#: unpack-trees.c:127 +#: unpack-trees.c:130 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -9193,7 +9388,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:132 +#: unpack-trees.c:135 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -9203,7 +9398,16 @@ msgstr "" "dem:\n" "%s" -#: unpack-trees.c:136 +#: unpack-trees.c:138 +#, c-format +msgid "" +"Refusing to remove the current working directory:\n" +"%s" +msgstr "" +"Vägrar ta bort aktuell arbetskatalog:\n" +"%s" + +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -9212,7 +9416,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:138 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -9221,7 +9425,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%s" -#: unpack-trees.c:141 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -9231,7 +9435,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du slår samman." -#: unpack-trees.c:143 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -9241,7 +9445,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:146 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -9250,7 +9454,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%sFlytta eller ta bort dem innan du \"%s\"." -#: unpack-trees.c:148 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -9259,7 +9463,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:160 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -9270,7 +9474,7 @@ msgstr "" "utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:156 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -9281,7 +9485,7 @@ msgstr "" "utcheckningen:\n" "%%s" -#: unpack-trees.c:159 +#: unpack-trees.c:165 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -9291,7 +9495,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:161 +#: unpack-trees.c:167 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -9301,7 +9505,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:164 +#: unpack-trees.c:170 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -9310,7 +9514,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%sFlytta eller ta bort dem innan du \"%s\"." -#: unpack-trees.c:166 +#: unpack-trees.c:172 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -9319,12 +9523,12 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:174 +#: unpack-trees.c:180 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda." -#: unpack-trees.c:177 +#: unpack-trees.c:183 #, c-format msgid "" "Cannot update submodule:\n" @@ -9333,7 +9537,7 @@ msgstr "" "Kan inte uppdatera undermodul:\n" "%s" -#: unpack-trees.c:180 +#: unpack-trees.c:186 #, c-format msgid "" "The following paths are not up to date and were left despite sparse " @@ -9343,7 +9547,7 @@ msgstr "" "Följande sökvägar är inte àjour och lämnades till trots för gles-mönster:\n" "%s" -#: unpack-trees.c:182 +#: unpack-trees.c:188 #, c-format msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" @@ -9353,7 +9557,7 @@ msgstr "" "mönster:\n" "%s" -#: unpack-trees.c:184 +#: unpack-trees.c:190 #, c-format msgid "" "The following paths were already present and thus not updated despite sparse " @@ -9364,12 +9568,12 @@ msgstr "" "gles-mönster:\n" "%s" -#: unpack-trees.c:264 +#: unpack-trees.c:270 #, c-format msgid "Aborting\n" msgstr "Avbryter\n" -#: unpack-trees.c:291 +#: unpack-trees.c:297 #, c-format msgid "" "After fixing the above paths, you may want to run `git sparse-checkout " @@ -9378,11 +9582,11 @@ msgstr "" "Du bör köra \"git sparse-checkout reapply\" efter att ha fixat sökvägarna " "ovan.\n" -#: unpack-trees.c:352 +#: unpack-trees.c:358 msgid "Updating files" msgstr "Uppdaterar filer" -#: unpack-trees.c:384 +#: unpack-trees.c:390 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -9392,16 +9596,16 @@ msgstr "" "sökvägar på ett okänsligt filsystem) och endast en från samma\n" "kollisionsgrupp finns i arbetskatalogen:\n" -#: unpack-trees.c:1519 +#: unpack-trees.c:1636 msgid "Updating index flags" msgstr "Uppdaterar indexflaggor" -#: unpack-trees.c:2608 +#: unpack-trees.c:2803 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "arbetskatalog och ospårad incheckning har dublettposter: %s" -#: upload-pack.c:1548 +#: upload-pack.c:1565 msgid "expected flush after fetch arguments" msgstr "förväntade \"flush\" efter \"fetch\"-argument" @@ -9438,113 +9642,123 @@ msgstr "felaktigt \"..\"-sökvägssegment" msgid "Fetching objects" msgstr "Hämtar objekt" -#: worktree.c:238 builtin/am.c:2151 +#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156 #, 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:342 +#: worktree.c:343 #, c-format msgid "'%s' does not point back to '%s'" msgstr "\"%s\" pekar inte tillbaka till \"%s\"" -#: worktree.c:608 +#: worktree.c:604 msgid "not a directory" msgstr "inte en katalog" -#: worktree.c:617 +#: worktree.c:613 msgid ".git is not a file" msgstr ".git är inte en fil" -#: worktree.c:619 +#: worktree.c:615 msgid ".git file broken" msgstr ".git-filen är trasig" -#: worktree.c:621 +#: worktree.c:617 msgid ".git file incorrect" msgstr ".git-filen är felaktig" -#: worktree.c:727 +#: worktree.c:723 msgid "not a valid path" msgstr "inte en giltig sökväg" -#: worktree.c:733 +#: worktree.c:729 msgid "unable to locate repository; .git is not a file" msgstr "hittar inte arkivet; .git är inte en fil" -#: worktree.c:737 +#: worktree.c:733 msgid "unable to locate repository; .git file does not reference a repository" msgstr "hittar inte arkivet; .git-filen hänvisar inte till ett arkiv" -#: worktree.c:741 +#: worktree.c:737 msgid "unable to locate repository; .git file broken" msgstr "hittar inte arkivet; .git-filen är trasig" -#: worktree.c:747 +#: worktree.c:743 msgid "gitdir unreadable" msgstr "gitdir är oläsbar" -#: worktree.c:751 +#: worktree.c:747 msgid "gitdir incorrect" msgstr "gitdir är felaktig" -#: worktree.c:776 +#: worktree.c:772 msgid "not a valid directory" msgstr "inte i en giltig katalog" -#: worktree.c:782 +#: worktree.c:778 msgid "gitdir file does not exist" msgstr "gitdir-filen existerar inte" -#: worktree.c:787 worktree.c:796 +#: worktree.c:783 worktree.c:792 #, c-format msgid "unable to read gitdir file (%s)" msgstr "kunde inte läsa gitdir-filen (%s)" -#: worktree.c:806 +#: worktree.c:802 #, c-format msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "kort läsning (förväntade %<PRIuMAX> byte, läste %<PRIuMAX>)" -#: worktree.c:814 +#: worktree.c:810 msgid "invalid gitdir file" msgstr "ogiltig gitdir-fil" -#: worktree.c:822 +#: worktree.c:818 msgid "gitdir file points to non-existent location" msgstr "gitdir-filen pekar på en ickeexisterande plats" -#: wrapper.c:197 wrapper.c:367 +#: wrapper.c:151 +#, c-format +msgid "could not setenv '%s'" +msgstr "kunde inte lagra miljövariabeln \"%s\"" + +#: wrapper.c:203 +#, c-format +msgid "unable to create '%s'" +msgstr "kunde inte skapa \"%s\"" + +#: wrapper.c:205 wrapper.c:375 #, c-format msgid "could not open '%s' for reading and writing" msgstr "kunde inte öppna \"%s\" för läsning och skrivning" -#: wrapper.c:398 wrapper.c:599 +#: wrapper.c:406 wrapper.c:607 #, c-format msgid "unable to access '%s'" msgstr "kan inte komma åt \"%s\"" -#: wrapper.c:607 +#: wrapper.c:615 msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" @@ -9579,11 +9793,11 @@ msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning) msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:211 wt-status.c:1075 +#: wt-status.c:211 wt-status.c:1131 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:234 wt-status.c:1084 +#: wt-status.c:234 wt-status.c:1140 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" @@ -9686,22 +9900,22 @@ msgstr "ändrat innehåll, " msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:908 +#: wt-status.c:964 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Stashen innehåller just nu %d post" msgstr[1] "Stashen innehåller just nu %d poster" -#: wt-status.c:939 +#: wt-status.c:995 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:941 +#: wt-status.c:997 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:1023 +#: wt-status.c:1079 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9709,7 +9923,7 @@ msgstr "" "Raden ovan får inte ändras eller tas bort.\n" "Allt under den kommer tas bort." -#: wt-status.c:1115 +#: wt-status.c:1171 #, c-format msgid "" "\n" @@ -9720,107 +9934,114 @@ msgstr "" "Det tog %.2f sekunder att räkna före/bakom-värden.\n" "Du kan använda \"--no-ahead-behind\" för undvika detta.\n" -#: wt-status.c:1145 +#: wt-status.c:1201 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:1148 +#: wt-status.c:1204 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:1150 +#: wt-status.c:1206 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)" -#: wt-status.c:1154 +#: wt-status.c:1210 msgid "All conflicts fixed but you are still merging." msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning." -#: wt-status.c:1157 +#: wt-status.c:1213 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:1166 +#: wt-status.c:1224 msgid "You are in the middle of an am session." msgstr "Du är i mitten av en körning av \"git am\"." -#: wt-status.c:1169 +#: wt-status.c:1227 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:1173 +#: wt-status.c:1232 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:1175 +#: wt-status.c:1234 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:1177 +#: wt-status.c:1237 +msgid "" +" (use \"git am --allow-empty\" to record this patch as an empty commit)" +msgstr "" +" (använd \"git am --allow-empty\" för att registrera patchen som en tom " +"incheckning)" + +#: wt-status.c:1239 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" -#: wt-status.c:1310 +#: wt-status.c:1372 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo saknas." -#: wt-status.c:1312 +#: wt-status.c:1374 msgid "No commands done." msgstr "Inga kommandon utförda." -#: wt-status.c:1315 +#: wt-status.c:1377 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Sista kommandot utfört (%d kommando utfört):" msgstr[1] "Sista kommandot utfört (%d kommandon utfört):" -#: wt-status.c:1326 +#: wt-status.c:1388 #, c-format msgid " (see more in file %s)" msgstr " (se fler i filen %s)" -#: wt-status.c:1331 +#: wt-status.c:1393 msgid "No commands remaining." msgstr "Inga kommandon återstår." -#: wt-status.c:1334 +#: wt-status.c:1396 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Nästa kommando att utföra (%d kommando återstår):" msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):" -#: wt-status.c:1342 +#: wt-status.c:1404 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)" -#: wt-status.c:1354 +#: wt-status.c:1416 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"." -#: wt-status.c:1359 +#: wt-status.c:1421 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1372 +#: wt-status.c:1434 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1374 +#: wt-status.c:1436 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1376 +#: wt-status.c:1438 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)" -#: wt-status.c:1383 +#: wt-status.c:1445 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1387 +#: wt-status.c:1449 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -9828,155 +10049,159 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1392 +#: wt-status.c:1454 msgid "You are currently splitting a commit during a rebase." msgstr "Du håller på att dela upp en incheckning i en ombasering." -#: wt-status.c:1395 +#: wt-status.c:1457 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")" -#: wt-status.c:1399 +#: wt-status.c:1461 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1404 +#: wt-status.c:1466 msgid "You are currently editing a commit during a rebase." msgstr "Du håller på att redigera en incheckning under en ombasering." -#: wt-status.c:1407 +#: wt-status.c:1469 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)" -#: wt-status.c:1409 +#: wt-status.c:1471 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)" -#: wt-status.c:1420 +#: wt-status.c:1482 msgid "Cherry-pick currently in progress." msgstr "Cherry-pick pågår." -#: wt-status.c:1423 +#: wt-status.c:1485 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s." -#: wt-status.c:1430 +#: wt-status.c:1492 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1433 +#: wt-status.c:1495 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (kör \"git cherry-pick --continue\" för att fortsätta)" -#: wt-status.c:1436 +#: wt-status.c:1498 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1438 +#: wt-status.c:1500 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " (använd \"git cherry-pick --skip\" för att hoppa över patchen)" -#: wt-status.c:1440 +#: wt-status.c:1502 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-" "operationen)" -#: wt-status.c:1450 +#: wt-status.c:1512 msgid "Revert currently in progress." msgstr "Ångring pågår." -#: wt-status.c:1453 +#: wt-status.c:1515 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1459 +#: wt-status.c:1521 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1462 +#: wt-status.c:1524 msgid " (run \"git revert --continue\" to continue)" msgstr " (kör \"git revert --continue\" för att fortsätta)" -#: wt-status.c:1465 +#: wt-status.c:1527 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1467 +#: wt-status.c:1529 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (använd \"git revert --skip\" för att hoppa över patchen)" -#: wt-status.c:1469 +#: wt-status.c:1531 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1479 +#: wt-status.c:1541 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"." -#: wt-status.c:1483 +#: wt-status.c:1545 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1486 +#: wt-status.c:1548 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)" -#: wt-status.c:1497 +#: wt-status.c:1559 +msgid "You are in a sparse checkout." +msgstr "Du är i en gles utcheckning." + +#: wt-status.c:1562 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "Du är i en gles utcheckning med %d%% spårade filer på plats." -#: wt-status.c:1736 +#: wt-status.c:1806 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1743 +#: wt-status.c:1813 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå " -#: wt-status.c:1745 +#: wt-status.c:1815 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå " -#: wt-status.c:1750 +#: wt-status.c:1820 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1752 +#: wt-status.c:1822 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1755 +#: wt-status.c:1825 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1772 +#: wt-status.c:1842 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1773 +#: wt-status.c:1843 msgid "No commits yet" msgstr "Inga incheckningar ännu" -#: wt-status.c:1787 +#: wt-status.c:1857 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1789 +#: wt-status.c:1859 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1793 +#: wt-status.c:1863 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9988,32 +10213,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1799 +#: wt-status.c:1869 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1801 +#: wt-status.c:1871 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1807 +#: wt-status.c:1877 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1812 +#: wt-status.c:1882 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a" "\")\n" -#: wt-status.c:1816 +#: wt-status.c:1886 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1820 +#: wt-status.c:1890 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -10022,85 +10247,85 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1824 +#: wt-status.c:1894 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "inget köat för incheckning, men ospårade filer finns\n" -#: wt-status.c:1828 +#: wt-status.c:1898 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n" -#: wt-status.c:1832 wt-status.c:1838 +#: wt-status.c:1902 wt-status.c:1908 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1835 +#: wt-status.c:1905 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "inget att checka in (använd -u för att visa ospårade filer)\n" -#: wt-status.c:1840 +#: wt-status.c:1910 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1945 +#: wt-status.c:2015 msgid "No commits yet on " msgstr "Inga incheckningar ännu på " -#: wt-status.c:1949 +#: wt-status.c:2019 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1980 +#: wt-status.c:2050 msgid "different" msgstr "olika" -#: wt-status.c:1982 wt-status.c:1990 +#: wt-status.c:2052 wt-status.c:2060 msgid "behind " msgstr "efter " -#: wt-status.c:1985 wt-status.c:1988 +#: wt-status.c:2055 wt-status.c:2058 msgid "ahead " msgstr "före " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2511 +#: wt-status.c:2596 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "kan inte %s: Du har oköade ändringar." -#: wt-status.c:2517 +#: wt-status.c:2602 msgid "additionally, your index contains uncommitted changes." msgstr "dessutom innehåller dit index ändringar som inte har checkats in." -#: wt-status.c:2519 +#: wt-status.c:2604 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in." -#: compat/simple-ipc/ipc-unix-socket.c:178 +#: compat/simple-ipc/ipc-unix-socket.c:205 msgid "could not send IPC command" msgstr "kunde inte sända IPC-kommando" -#: compat/simple-ipc/ipc-unix-socket.c:185 +#: compat/simple-ipc/ipc-unix-socket.c:212 msgid "could not read IPC response" msgstr "kunde inte läsa IPC-svar" -#: compat/simple-ipc/ipc-unix-socket.c:862 +#: compat/simple-ipc/ipc-unix-socket.c:892 #, c-format msgid "could not start accept_thread '%s'" msgstr "kunde inte ta status \"accept_thread\" \"%s\"" -#: compat/simple-ipc/ipc-unix-socket.c:874 +#: compat/simple-ipc/ipc-unix-socket.c:904 #, c-format msgid "could not start worker[0] for '%s'" msgstr "kunde inte starta \"worker[0]\" för \"%s\"" -#: compat/precompose_utf8.c:58 builtin/clone.c:461 +#: compat/precompose_utf8.c:58 builtin/clone.c:347 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" @@ -10109,131 +10334,136 @@ msgstr "misslyckades ta bort länken \"%s\"" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<flaggor>] [--] <sökväg>..." -#: builtin/add.c:61 +#: builtin/add.c:64 #, c-format msgid "cannot chmod %cx '%s'" msgstr "kan inte utföra chmod %cx \"%s\"" -#: builtin/add.c:99 +#: builtin/add.c:106 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:104 builtin/commit.c:297 +#: builtin/add.c:111 builtin/commit.c:298 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:114 +#: builtin/add.c:121 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:198 +#: builtin/add.c:205 msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:307 builtin/rev-parse.c:991 +#: builtin/add.c:313 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:318 -#, c-format -msgid "Could not open '%s' for writing." -msgstr "Kunde inte öppna \"%s\" för skrivning." - -#: builtin/add.c:322 +#: builtin/add.c:326 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:325 +#: builtin/add.c:329 msgid "editing patch failed" msgstr "redigering av patch misslyckades" -#: builtin/add.c:328 +#: builtin/add.c:332 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:330 +#: builtin/add.c:334 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:335 +#: builtin/add.c:340 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:343 +#: builtin/add.c:348 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:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 -#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190 +#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550 +#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:366 +#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484 +#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313 +#: builtin/mv.c:123 builtin/read-tree.c:120 +msgid "be verbose" +msgstr "var pratsam" + +#: builtin/add.c:371 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308 +#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409 msgid "select hunks interactively" msgstr "välj stycken interaktivt" -#: builtin/add.c:368 +#: builtin/add.c:373 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:369 +#: builtin/add.c:374 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:370 +#: builtin/add.c:375 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:371 +#: builtin/add.c:376 msgid "renormalize EOL of tracked files (implies -u)" msgstr "åternormalisera radslut i spårade filer (implicerar -u)" -#: builtin/add.c:372 +#: builtin/add.c:377 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:373 +#: builtin/add.c:378 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:376 +#: builtin/add.c:381 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:378 +#: builtin/add.c:383 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:379 +#: builtin/add.c:384 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:380 +#: builtin/add.c:385 msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: builtin/add.c:382 builtin/update-index.c:1006 +#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251 +msgid "allow updating entries outside of the sparse-checkout cone" +msgstr "tillåt uppdatera poster utanför området angivet i \"sparse-checkout\"" + +#: builtin/add.c:388 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" -#: builtin/add.c:384 +#: builtin/add.c:390 msgid "warn when adding an embedded repository" msgstr "varna när ett inbyggt arkiv läggs till" -#: builtin/add.c:386 +#: builtin/add.c:392 msgid "backend for `git stash -p`" msgstr "bakända för \"git stash -p\"" -#: builtin/add.c:404 +#: builtin/add.c:410 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -10264,12 +10494,12 @@ msgstr "" "\n" "Se \"git help submodule\" för ytterligare information." -#: builtin/add.c:432 +#: builtin/add.c:439 #, c-format msgid "adding embedded git repository: %s" msgstr "lägger till inbäddat git-arkiv: %s" -#: builtin/add.c:451 +#: builtin/add.c:459 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -10279,51 +10509,27 @@ msgstr "" "Slå av detta meddelande med\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:460 +#: builtin/add.c:474 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:488 -msgid "--dry-run is incompatible with --interactive/--patch" -msgstr "--dry-run är inkompatibelt med --interactive/--patch" - -#: builtin/add.c:490 builtin/commit.c:357 -msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch" - -#: builtin/add.c:507 -msgid "--pathspec-from-file is incompatible with --edit" -msgstr "--pathspec-from-file är inkompatibelt med --edit" - -#: builtin/add.c:519 -msgid "-A and -u are mutually incompatible" -msgstr "-A och -u är ömsesidigt inkompatibla" - -#: builtin/add.c:522 -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:526 +#: builtin/add.c:548 #, 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:544 builtin/checkout.c:1735 builtin/commit.c:363 -#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637 -msgid "--pathspec-from-file is incompatible with pathspec arguments" -msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar" +msgstr "\"--chmod\"-parametern \"%s\" måste antingen vara -x eller +x" -#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 -#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643 -msgid "--pathspec-file-nul requires --pathspec-from-file" -msgstr "--pathspec-file-nul kräver --pathspec-from-file" +#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364 +#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713 +#, c-format +msgid "'%s' and pathspec arguments cannot be used together" +msgstr "\"%s\" kan inte användas tillsammans med sökvägsangivelser" -#: builtin/add.c:555 +#: builtin/add.c:580 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:557 +#: builtin/add.c:582 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -10333,109 +10539,117 @@ msgstr "" "Slå av detta meddelande genom att köra\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:364 +#: builtin/am.c:202 +#, c-format +msgid "Invalid value for --empty: %s" +msgstr "Felaktigt värde för --empty: %s" + +#: builtin/am.c:392 msgid "could not parse author script" msgstr "kunde inte tolka författarskript" -#: builtin/am.c:454 +#: builtin/am.c:482 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "\"%s\" togs bort av kroken applypatch-msg" -#: builtin/am.c:496 +#: builtin/am.c:524 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/am.c:534 +#: builtin/am.c:562 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/am.c:560 +#: builtin/am.c:588 msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:748 +#: builtin/am.c:776 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:813 +#: builtin/am.c:841 msgid "Only one StGIT patch series can be applied at once" msgstr "Endast en StGIT-patchserie kan tillämpas åt gången" -#: builtin/am.c:861 +#: builtin/am.c:889 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:866 builtin/am.c:878 +#: builtin/am.c:894 builtin/am.c:906 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:873 +#: builtin/am.c:901 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:966 +#: builtin/am.c:994 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:971 builtin/clone.c:414 +#: builtin/am.c:999 builtin/clone.c:300 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:976 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1125 +#: builtin/am.c:1153 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "När du har löst problemet, kör \"%s --continue\"." -#: builtin/am.c:1126 +#: builtin/am.c:1154 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället." -#: builtin/am.c:1127 +#: builtin/am.c:1159 +#, c-format +msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." +msgstr "" +"För att registrera den tomma patchen som en tom incheckning, kör \"%s --" +"allow-empty\"." + +#: builtin/am.c:1161 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"." -#: builtin/am.c:1222 +#: builtin/am.c:1256 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Patch sänd med format=flowed; blanksteg på slut av rader kan ha tappats." -#: builtin/am.c:1250 -msgid "Patch is empty." -msgstr "Patchen är tom." - -#: builtin/am.c:1315 +#: builtin/am.c:1344 #, c-format msgid "missing author line in commit %s" msgstr "saknad \"author\"-rad i incheckningen %s" -#: builtin/am.c:1318 +#: builtin/am.c:1347 #, c-format msgid "invalid ident line: %.*s" msgstr "ogiltig ident-rad: %.*s" -#: builtin/am.c:1537 +#: builtin/am.c:1566 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: builtin/am.c:1539 +#: builtin/am.c:1568 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1558 +#: builtin/am.c:1587 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10443,25 +10657,25 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1564 +#: builtin/am.c:1593 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1590 +#: builtin/am.c:1619 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1622 +#: builtin/am.c:1651 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1674 builtin/am.c:1678 +#: builtin/am.c:1703 builtin/am.c:1707 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1696 +#: builtin/am.c:1725 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -10469,41 +10683,59 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1706 +#: builtin/am.c:1735 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: " -#: builtin/am.c:1752 builtin/commit.c:408 +#: builtin/am.c:1781 builtin/commit.c:409 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/am.c:1756 +#: builtin/am.c:1785 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1796 builtin/am.c:1864 +#: builtin/am.c:1827 +#, c-format +msgid "Skipping: %.*s" +msgstr "Hoppar över: %.*s" + +#: builtin/am.c:1832 +#, c-format +msgid "Creating an empty commit: %.*s" +msgstr "Skapar en tom incheckningar: %.*s" + +#: builtin/am.c:1836 +msgid "Patch is empty." +msgstr "Patchen är tom." + +#: builtin/am.c:1847 builtin/am.c:1916 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1813 +#: builtin/am.c:1864 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1819 +#: builtin/am.c:1870 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1823 +#: builtin/am.c:1874 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" "Använd \"git am --show-current-patch=diff\" för att se patchen som " "misslyckades" -#: builtin/am.c:1867 +#: builtin/am.c:1920 +msgid "No changes - recorded it as an empty commit." +msgstr "Inga ändringar - sparat som en tom incheckning." + +#: builtin/am.c:1922 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10513,7 +10745,7 @@ msgstr "" "Om det inte är något kvar att köa kan det hända att något annat redan\n" "introducerat samma ändringar; kanske du bör hoppa över patchen." -#: builtin/am.c:1874 +#: builtin/am.c:1930 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10525,17 +10757,17 @@ msgstr "" "lösta.\n" "Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den." -#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347 -#: builtin/reset.c:355 +#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448 +#: builtin/reset.c:456 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"." -#: builtin/am.c:2033 +#: builtin/am.c:2090 builtin/am.c:2166 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2077 +#: builtin/am.c:2134 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10543,159 +10775,167 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2184 +#: builtin/am.c:2242 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt värde för --patch-format: %s" -#: builtin/am.c:2226 +#: builtin/am.c:2285 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "Felaktigt värde för --show-current-patch: %s" -#: builtin/am.c:2230 +#: builtin/am.c:2289 #, c-format -msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" -msgstr "--show-current-patch=%s är inkompatibelt med --show-current-patch=%s" +msgid "options '%s=%s' and '%s=%s' cannot be used together" +msgstr "flaggorna \"%s=%s\" och \"%s=%s\" kan inte användas samtidigt" -#: builtin/am.c:2261 +#: builtin/am.c:2320 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2262 +#: builtin/am.c:2321 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2268 +#: builtin/am.c:2327 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2270 +#: builtin/am.c:2329 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2272 +#: builtin/am.c:2331 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16 -#: builtin/repack.c:472 builtin/stash.c:948 +#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16 +#: builtin/repack.c:642 builtin/stash.c:962 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2275 +#: builtin/am.c:2334 msgid "add a Signed-off-by trailer to the commit message" msgstr "lägg till \"Signed-off-by\"-släprad i incheckningsmeddelandet" -#: builtin/am.c:2278 +#: builtin/am.c:2337 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2280 +#: builtin/am.c:2339 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2282 +#: builtin/am.c:2341 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2284 +#: builtin/am.c:2343 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2286 +#: builtin/am.c:2345 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet" -#: builtin/am.c:2289 +#: builtin/am.c:2348 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr" -#: builtin/am.c:2292 +#: builtin/am.c:2351 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2294 +#: builtin/am.c:2353 msgid "pass it through git-mailinfo" msgstr "sänd det genom git-mailinfo" -#: builtin/am.c:2297 builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 -#: builtin/am.c:2309 builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 -#: builtin/am.c:2324 +#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 +#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 +#: builtin/am.c:2383 msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261 -#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 -#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172 -#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176 +#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18 +#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263 +#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221 +#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657 +#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172 +#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175 #: parse-options.h:317 msgid "n" msgstr "n" -#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137 -#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 +#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109 +#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479 #: builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2321 +#: builtin/am.c:2380 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2327 +#: builtin/am.c:2386 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2329 +#: builtin/am.c:2388 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2332 +#: builtin/am.c:2391 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2335 +#: builtin/am.c:2394 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2338 +#: builtin/am.c:2397 msgid "restore the original branch and abort the patching operation" msgstr "återställ originalgrenen och avbryt patchningen" -#: builtin/am.c:2341 +#: builtin/am.c:2400 msgid "abort the patching operation but keep HEAD where it is" msgstr "avbryt patchningen men behåll HEAD där det är" -#: builtin/am.c:2345 +#: builtin/am.c:2404 msgid "show the patch being applied" msgstr "visa patchen som tillämpas" -#: builtin/am.c:2350 +#: builtin/am.c:2408 +msgid "record the empty patch as an empty commit" +msgstr "lagra den tomma patchen som en tom incheckning" + +#: builtin/am.c:2412 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2352 +#: builtin/am.c:2414 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630 -#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 -#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462 +#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643 +#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099 +#: builtin/revert.c:117 builtin/tag.c:460 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396 +#: builtin/am.c:2417 builtin/rebase.c:1100 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2358 +#: builtin/am.c:2420 +msgid "how to handle empty patches" +msgstr "hantering av tomma patchar" + +#: builtin/am.c:2423 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2376 +#: builtin/am.c:2441 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -10703,16 +10943,16 @@ msgstr "" "Flaggan -b/--binary har varit utan funktion länge, och\n" "kommer tas bort. Vi ber dig att inte använda den längre." -#: builtin/am.c:2383 +#: builtin/am.c:2448 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2398 +#: builtin/am.c:2463 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs." -#: builtin/am.c:2422 +#: builtin/am.c:2487 #, c-format msgid "" "Stray %s directory found.\n" @@ -10721,11 +10961,11 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2428 +#: builtin/am.c:2493 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." -#: builtin/am.c:2438 +#: builtin/am.c:2503 msgid "interactive mode requires patches on the command line" msgstr "interaktivt läge kräver patchar på kommandoraden" @@ -10733,51 +10973,41 @@ msgstr "interaktivt läge kräver patchar på kommandoraden" msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<flaggor>] [<patch>...]" -#: builtin/archive.c:17 -#, c-format -msgid "could not create archive file '%s'" -msgstr "kunde inte skapa arkivfilen \"%s\"" - -#: builtin/archive.c:20 +#: builtin/archive.c:18 msgid "could not redirect output" msgstr "kunde inte omdirigera utdata" -#: builtin/archive.c:37 +#: builtin/archive.c:35 msgid "git archive: Remote with no URL" msgstr "git archive: Fjärr utan URL" -#: builtin/archive.c:61 +#: builtin/archive.c:59 msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive: förväntade ACK/NAK, fick flush-paket" -#: builtin/archive.c:64 +#: builtin/archive.c:62 #, c-format msgid "git archive: NACK %s" msgstr "git archive: NACK %s" -#: builtin/archive.c:65 +#: builtin/archive.c:63 msgid "git archive: protocol error" msgstr "git archive: protokollfel" -#: builtin/archive.c:69 +#: builtin/archive.c:67 msgid "git archive: expected a flush" msgstr "git archive: förväntade en tömning (flush)" -#: builtin/bisect--helper.c:23 +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --bisect-reset [<incheckning>]" -#: builtin/bisect--helper.c:24 -msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" -msgstr "" -"git bisect--helper --bisect-next-check <term-för-rätt> <term-för-fel> <eterm>" - #: builtin/bisect--helper.c:25 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" msgstr "" -"git-bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" +"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" #: builtin/bisect--helper.c:26 @@ -10810,46 +11040,59 @@ msgstr "git bisect--helper --bisect-replay <filnamn>" msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" msgstr "git bisect--helper --bisect-skip [(<incheckning>|<intervall>)...]" -#: builtin/bisect--helper.c:107 +#: builtin/bisect--helper.c:33 +msgid "git bisect--helper --bisect-visualize" +msgstr "git bisect--helper --bisect-visualize" + +#: builtin/bisect--helper.c:34 +msgid "git bisect--helper --bisect-run <cmd>..." +msgstr "git bisect--helper --bisect-run <kommando>..." + +#: builtin/bisect--helper.c:109 #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "kan inte kopiera filen \"%s\" i läget \"%s\"" -#: builtin/bisect--helper.c:114 +#: builtin/bisect--helper.c:116 #, c-format msgid "could not write to file '%s'" msgstr "kunde inte skriva till filen \"%s\"" -#: builtin/bisect--helper.c:153 +#: builtin/bisect--helper.c:154 +#, c-format +msgid "cannot open file '%s' for reading" +msgstr "kan inte öppna filen \"%s\" för läsning" + +#: builtin/bisect--helper.c:170 #, c-format msgid "'%s' is not a valid term" msgstr "\"%s\" är inte en giltig term" -#: builtin/bisect--helper.c:157 +#: builtin/bisect--helper.c:174 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "kan inte använda det inbyggda kommandot \"%s\" som term" -#: builtin/bisect--helper.c:167 +#: builtin/bisect--helper.c:184 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "kan inte ändra betydelsen av termen \"%s\"" -#: builtin/bisect--helper.c:177 +#: builtin/bisect--helper.c:194 msgid "please use two different terms" msgstr "termerna måste vara olika" -#: builtin/bisect--helper.c:193 +#: builtin/bisect--helper.c:210 #, c-format msgid "We are not bisecting.\n" msgstr "Vi utför ingen bisect för tillfället.\n" -#: builtin/bisect--helper.c:201 +#: builtin/bisect--helper.c:218 #, c-format msgid "'%s' is not a valid commit" msgstr "\"%s\" är inte en giltig incheckning" -#: builtin/bisect--helper.c:210 +#: builtin/bisect--helper.c:227 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -10857,27 +11100,27 @@ msgstr "" "Kunde inte checka ut original-HEAD \"%s\". Försök \"git bisect reset " "<incheckning>\"." -#: builtin/bisect--helper.c:254 +#: builtin/bisect--helper.c:271 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Felaktigt argument till bisect_write: %s" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:276 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "kan inte läsa oid för referensen \"%s\"" -#: builtin/bisect--helper.c:271 +#: builtin/bisect--helper.c:288 #, c-format msgid "couldn't open the file '%s'" msgstr "kunde inte öppna filen \"%s\"" -#: builtin/bisect--helper.c:297 +#: builtin/bisect--helper.c:314 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Ogiltigt kommando: du utför just nu en \"bisect\" med %s/%s." -#: builtin/bisect--helper.c:324 +#: builtin/bisect--helper.c:341 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10886,7 +11129,7 @@ msgstr "" "Du måste ange åtminstone en %s och en %s version.\n" "(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)" -#: builtin/bisect--helper.c:328 +#: builtin/bisect--helper.c:345 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10897,7 +11140,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:348 +#: builtin/bisect--helper.c:365 #, c-format msgid "bisecting only with a %s commit" msgstr "utför bisect med endast en %s incheckning" @@ -10906,15 +11149,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:356 +#: builtin/bisect--helper.c:373 msgid "Are you sure [Y/n]? " msgstr "Är du säker [Y=ja/N=nej]? " -#: builtin/bisect--helper.c:417 +#: builtin/bisect--helper.c:434 msgid "no terms defined" msgstr "inga termer angivna" -#: builtin/bisect--helper.c:420 +#: builtin/bisect--helper.c:437 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10923,7 +11166,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:430 +#: builtin/bisect--helper.c:447 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10932,54 +11175,54 @@ 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:497 builtin/bisect--helper.c:1021 +#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038 msgid "revision walk setup failed\n" msgstr "misslyckades starta revisionstraversering\n" -#: builtin/bisect--helper.c:519 +#: builtin/bisect--helper.c:536 #, c-format msgid "could not open '%s' for appending" msgstr "kunde inte öppna \"%s\" för tillägg" -#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668 msgid "'' is not a valid term" msgstr "\"\" är inte en giltig term" -#: builtin/bisect--helper.c:661 +#: builtin/bisect--helper.c:678 #, c-format msgid "unrecognized option: '%s'" msgstr "okänd flagga: %s" -#: builtin/bisect--helper.c:665 +#: builtin/bisect--helper.c:682 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "\"%s\" verkar inte vara en giltig revision" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:713 msgid "bad HEAD - I need a HEAD" msgstr "felaktigt HEAD - Jag behöver ett HEAD" -#: builtin/bisect--helper.c:711 +#: builtin/bisect--helper.c:728 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "misslyckades checka ut \"%s\". Försök \"git bisect reset <giltig_gren>\"." # cogito-relaterat -#: builtin/bisect--helper.c:732 +#: builtin/bisect--helper.c:749 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:735 +#: builtin/bisect--helper.c:752 msgid "bad HEAD - strange symbolic ref" msgstr "felaktigt HEAD - konstig symbolisk referens" -#: builtin/bisect--helper.c:755 +#: builtin/bisect--helper.c:772 #, c-format msgid "invalid ref: '%s'" msgstr "ogiltig referens: \"%s\"" -#: builtin/bisect--helper.c:813 +#: builtin/bisect--helper.c:830 msgid "You need to start by \"git bisect start\"\n" msgstr "Du måste starta med \"git bisect start\"\n" @@ -10987,104 +11230,151 @@ msgstr "Du måste starta med \"git bisect start\"\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:824 +#: builtin/bisect--helper.c:841 msgid "Do you want me to do it for you [Y/n]? " msgstr "Vill du att jag ska göra det åt dig [Y=ja/N=nej]? " -#: builtin/bisect--helper.c:842 +#: builtin/bisect--helper.c:859 msgid "Please call `--bisect-state` with at least one argument" msgstr "Anropa \"--bisect-state\" med minst ett argument." -#: builtin/bisect--helper.c:855 +#: builtin/bisect--helper.c:872 #, c-format msgid "'git bisect %s' can take only one argument." msgstr "\"git bisect %s\" kan bara ta ett argument." -#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880 +#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897 #, c-format msgid "Bad rev input: %s" msgstr "Felaktig rev-indata: %s" -#: builtin/bisect--helper.c:887 +#: builtin/bisect--helper.c:904 #, c-format msgid "Bad rev input (not a commit): %s" msgstr "Felaktig rev-indata (ej incheckning): %s" -#: builtin/bisect--helper.c:919 +#: builtin/bisect--helper.c:936 msgid "We are not bisecting." msgstr "Vi utför ingen bisect för tillfället." -#: builtin/bisect--helper.c:969 +#: builtin/bisect--helper.c:986 #, c-format msgid "'%s'?? what are you talking about?" msgstr "\"%s\"?? vad menar du?" -#: builtin/bisect--helper.c:981 +#: builtin/bisect--helper.c:998 #, c-format msgid "cannot read file '%s' for replaying" msgstr "kan inte läsa filen \"%s\" för återuppspelning" -#: builtin/bisect--helper.c:1054 +#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274 +msgid "bisect run failed: no command provided." +msgstr "bisect-körning misslyckades: inget kommando gavs." + +#: builtin/bisect--helper.c:1116 +#, c-format +msgid "running %s\n" +msgstr "kör %s\n" + +#: builtin/bisect--helper.c:1120 +#, c-format +msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128" +msgstr "" +"\"bisect\"-körningen misslyckades: felkod %d från \"%s\" är < 0 eller >= 128" + +#: builtin/bisect--helper.c:1136 +#, c-format +msgid "cannot open file '%s' for writing" +msgstr "kan inte öppna \"%s\" för skrivning" + +#: builtin/bisect--helper.c:1152 +msgid "bisect run cannot continue any more" +msgstr "\"bisect\"-körningen kan inte fortsätta längre" + +#: builtin/bisect--helper.c:1154 +#, c-format +msgid "bisect run success" +msgstr "\"bisect\"-körningen lyckades" + +#: builtin/bisect--helper.c:1157 +#, c-format +msgid "bisect found first bad commit" +msgstr "bisect hittade första trasiga incheckning" + +#: builtin/bisect--helper.c:1160 +#, c-format +msgid "" +"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error " +"code %d" +msgstr "" +"\"bisect\"-körningen misslyckades: \"git bisect--helper --bisect-state %s\" " +"avslutades med felkoden %d" + +#: builtin/bisect--helper.c:1192 msgid "reset the bisection state" msgstr "återställ bisect-tillstånd" -#: builtin/bisect--helper.c:1056 +#: builtin/bisect--helper.c:1194 msgid "check whether bad or good terms exist" msgstr "se efter om termer för rätt och fel finns" -#: builtin/bisect--helper.c:1058 +#: builtin/bisect--helper.c:1196 msgid "print out the bisect terms" msgstr "skriv ut termer för bisect" -#: builtin/bisect--helper.c:1060 +#: builtin/bisect--helper.c:1198 msgid "start the bisect session" msgstr "påbörja bisect-körningen" -#: builtin/bisect--helper.c:1062 +#: builtin/bisect--helper.c:1200 msgid "find the next bisection commit" msgstr "hitta nästa incheckning i bisect" -#: builtin/bisect--helper.c:1064 +#: builtin/bisect--helper.c:1202 msgid "mark the state of ref (or refs)" msgstr "markera tillståndet för en eller flera referenser" -#: builtin/bisect--helper.c:1066 +#: builtin/bisect--helper.c:1204 msgid "list the bisection steps so far" msgstr "lista \"bisect\"-stegen som utförts så långt" -#: builtin/bisect--helper.c:1068 +#: builtin/bisect--helper.c:1206 msgid "replay the bisection process from the given file" msgstr "spela upp \"bisect\"-processen från angiven fil" -#: builtin/bisect--helper.c:1070 +#: builtin/bisect--helper.c:1208 msgid "skip some commits for checkout" msgstr "hoppa över ett par incheckningar" -#: builtin/bisect--helper.c:1072 +#: builtin/bisect--helper.c:1210 +msgid "visualize the bisection" +msgstr "visualisera \"bisect\"-körningen" + +#: builtin/bisect--helper.c:1212 +msgid "use <cmd>... to automatically bisect." +msgstr "använd <kommando>... för att utföra \"bisect\" automatiskt." + +#: builtin/bisect--helper.c:1214 msgid "no log for BISECT_WRITE" msgstr "ingen logg för BISECT_WRITE" -#: builtin/bisect--helper.c:1087 +#: builtin/bisect--helper.c:1229 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:1092 -msgid "--bisect-next-check requires 2 or 3 arguments" -msgstr "--bisect-next-check kräver 2 eller 3 argument" - -#: builtin/bisect--helper.c:1098 +#: builtin/bisect--helper.c:1234 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms kräver noll eller ett argument" -#: builtin/bisect--helper.c:1107 +#: builtin/bisect--helper.c:1243 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next kräver 0 argument" -#: builtin/bisect--helper.c:1118 +#: builtin/bisect--helper.c:1254 msgid "--bisect-log requires 0 arguments" msgstr "--bisect-log kräver 0 argument" -#: builtin/bisect--helper.c:1123 +#: builtin/bisect--helper.c:1259 msgid "no logfile given" msgstr "ingen loggfil angiven" @@ -11096,150 +11386,152 @@ msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" -#: builtin/blame.c:410 +#: builtin/blame.c:406 #, c-format msgid "expecting a color: %s" msgstr "förväntade en färg: %s" -#: builtin/blame.c:417 +#: builtin/blame.c:413 msgid "must end with a color" msgstr "måste sluta med en färg" -#: builtin/blame.c:728 +#: builtin/blame.c:724 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "felaktig färg \"%s\" i color.blame.repeatedLines" -#: builtin/blame.c:746 +#: builtin/blame.c:742 msgid "invalid value for blame.coloring" msgstr "ogiltigt värde för blame.coloring" -#: builtin/blame.c:845 +#: builtin/blame.c:841 #, c-format msgid "cannot find revision %s to ignore" msgstr "kan inte hitta revision %s att ignorera" -#: builtin/blame.c:867 +#: builtin/blame.c:863 msgid "show blame entries as we find them, incrementally" msgstr "visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:868 +#: builtin/blame.c:864 msgid "do not show object names of boundary commits (Default: off)" msgstr "visa inte objektnamn för gränsincheckningar (Standard: av)" -#: builtin/blame.c:869 +#: builtin/blame.c:865 msgid "do not treat root commits as boundaries (Default: off)" msgstr "vehandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:870 +#: builtin/blame.c:866 msgid "show work cost statistics" msgstr "visa statistik över arbetskostnad" -#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 -#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 -#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 -#: builtin/push.c:575 builtin/send-pack.c:198 +#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94 +#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180 +#: builtin/merge.c:301 builtin/multi-pack-index.c:103 +#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180 +#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566 +#: builtin/send-pack.c:202 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/blame.c:872 +#: builtin/blame.c:868 msgid "show output score for blame entries" msgstr "visa utdatapoäng för klandringsposter" -#: builtin/blame.c:873 +#: builtin/blame.c:869 msgid "show original filename (Default: auto)" msgstr "visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:874 +#: builtin/blame.c:870 msgid "show original linenumber (Default: off)" msgstr "visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:875 +#: builtin/blame.c:871 msgid "show in a format designed for machine consumption" msgstr "visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:876 +#: builtin/blame.c:872 msgid "show porcelain format with per-line commit information" msgstr "visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:877 +#: builtin/blame.c:873 msgid "use the same output mode as git-annotate (Default: off)" msgstr "använd samma utdataläge som git-annotate (Standard: av)" -#: builtin/blame.c:878 +#: builtin/blame.c:874 msgid "show raw timestamp (Default: off)" msgstr "visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:879 +#: builtin/blame.c:875 msgid "show long commit SHA1 (Default: off)" msgstr "visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:880 +#: builtin/blame.c:876 msgid "suppress author name and timestamp (Default: off)" msgstr "undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:881 +#: builtin/blame.c:877 msgid "show author email instead of name (Default: off)" msgstr "visa författarens e-post istället för namn (Standard: av)" -#: builtin/blame.c:882 +#: builtin/blame.c:878 msgid "ignore whitespace differences" msgstr "ignorera ändringar i blanksteg" -#: builtin/blame.c:883 builtin/log.c:1820 +#: builtin/blame.c:879 builtin/log.c:1838 msgid "rev" msgstr "incheckning" -#: builtin/blame.c:883 +#: builtin/blame.c:879 msgid "ignore <rev> when blaming" msgstr "ignorera <incheckning> vid klandringen" -#: builtin/blame.c:884 +#: builtin/blame.c:880 msgid "ignore revisions from <file>" msgstr "ignorera incheckningar från <fil>" -#: builtin/blame.c:885 +#: builtin/blame.c:881 msgid "color redundant metadata from previous line differently" msgstr "färglägg redundant metadata från tidigare rader annorlunda" -#: builtin/blame.c:886 +#: builtin/blame.c:882 msgid "color lines by age" msgstr "färglägg rader efter ålder" -#: builtin/blame.c:887 +#: builtin/blame.c:883 msgid "spend extra cycles to find better match" msgstr "slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:888 +#: builtin/blame.c:884 msgid "use revisions from <file> instead of calling git-rev-list" msgstr "använd revisioner från <fil> istället för att anropa git-rev-list" -#: builtin/blame.c:889 +#: builtin/blame.c:885 msgid "use <file>'s contents as the final image" msgstr "använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:890 builtin/blame.c:891 +#: builtin/blame.c:886 builtin/blame.c:887 msgid "score" msgstr "poäng" -#: builtin/blame.c:890 +#: builtin/blame.c:886 msgid "find line copies within and across files" msgstr "hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:891 +#: builtin/blame.c:887 msgid "find line movements within and across files" msgstr "hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:892 +#: builtin/blame.c:888 msgid "range" msgstr "intervall" -#: builtin/blame.c:893 +#: builtin/blame.c:889 msgid "process only line range <start>,<end> or function :<funcname>" msgstr "" "behandla endast intervallet <start>,<slut> eller funktionen :<funknamn>" -#: builtin/blame.c:945 +#: builtin/blame.c:947 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress kan inte användas med --incremental eller porslinsformat" @@ -11251,18 +11543,18 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:996 +#: builtin/blame.c:998 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" -#: builtin/blame.c:1112 +#: builtin/blame.c:1114 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "filen %s har bara %lu rad" msgstr[1] "filen %s har bara %lu rader" -#: builtin/blame.c:1157 +#: builtin/blame.c:1159 msgid "Blaming lines" msgstr "Klandra rader" @@ -11294,7 +11586,7 @@ msgstr "git branch [<flaggor>] [-r | -a] [--points-at]" msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<flaggor>] [-r | -a] [--format]" -#: builtin/branch.c:154 +#: builtin/branch.c:153 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -11303,7 +11595,7 @@ msgstr "" "tar bort grenen \"%s\" som har slagits ihop med\n" " \"%s\", men ännu inte slagits ihop med HEAD." -#: builtin/branch.c:158 +#: builtin/branch.c:157 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -11312,12 +11604,12 @@ msgstr "" "tar inte bort grenen \"%s\" som inte har slagits ihop med\n" " \"%s\", trots att den har slagits ihop med HEAD." -#: builtin/branch.c:172 +#: builtin/branch.c:171 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" -#: builtin/branch.c:176 +#: builtin/branch.c:175 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -11326,7 +11618,7 @@ msgstr "" "Grenen \"%s\" har inte slagits samman i sin helhet.\n" "Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"." -#: builtin/branch.c:189 +#: builtin/branch.c:188 msgid "Update of config-file failed" msgstr "Misslyckades uppdatera konfigurationsfil" @@ -11338,100 +11630,100 @@ msgstr "kan inte ange -a med -d" msgid "Couldn't look up commit object for HEAD" msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" -#: builtin/branch.c:244 +#: builtin/branch.c:247 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\"" -#: builtin/branch.c:259 +#: builtin/branch.c:262 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "fjärrspårande grenen \"%s\" hittades inte." -#: builtin/branch.c:260 +#: builtin/branch.c:263 #, c-format msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." -#: builtin/branch.c:291 +#: builtin/branch.c:294 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Tog bort fjärrspårande grenen %s (var %s).\n" -#: builtin/branch.c:292 +#: builtin/branch.c:295 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:440 builtin/tag.c:63 +#: builtin/branch.c:445 builtin/tag.c:63 msgid "unable to parse format string" msgstr "kan inte tolka formatsträng" -#: builtin/branch.c:471 +#: builtin/branch.c:476 msgid "could not resolve HEAD" msgstr "kunde inte slå upp HEAD" -#: builtin/branch.c:477 +#: builtin/branch.c:482 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) pekar utenför refs/heads/" -#: builtin/branch.c:492 +#: builtin/branch.c:497 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Grenen %s ombaseras på %s" -#: builtin/branch.c:496 +#: builtin/branch.c:501 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" på %s" -#: builtin/branch.c:513 +#: builtin/branch.c:518 msgid "cannot copy the current branch while not on any." msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon." -#: builtin/branch.c:515 +#: builtin/branch.c:520 msgid "cannot rename the current branch while not on any." msgstr "" "kunde inte byta namn på aktuell gren när du inte befinner dig på någon." -#: builtin/branch.c:526 +#: builtin/branch.c:531 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:555 +#: builtin/branch.c:560 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:557 +#: builtin/branch.c:562 msgid "Branch copy failed" msgstr "Misslyckades kopiera gren" -#: builtin/branch.c:561 +#: builtin/branch.c:566 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Skapade kopia av felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:564 +#: builtin/branch.c:569 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:570 +#: builtin/branch.c:575 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!" -#: builtin/branch.c:579 +#: builtin/branch.c:584 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:581 +#: builtin/branch.c:586 msgid "Branch is copied, but update of config-file failed" msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:597 +#: builtin/branch.c:602 #, c-format msgid "" "Please edit the description for the branch\n" @@ -11442,211 +11734,207 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/branch.c:631 +#: builtin/branch.c:637 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:633 +#: builtin/branch.c:639 msgid "show hash and subject, give twice for upstream branch" msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren" -#: builtin/branch.c:634 +#: builtin/branch.c:640 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:635 -msgid "set up tracking mode (see git-pull(1))" -msgstr "ställ in spårningsläge (se git-pull(1))" +#: builtin/branch.c:642 +msgid "set branch tracking configuration" +msgstr "ställ in inställningar för spårad gren" -#: builtin/branch.c:637 +#: builtin/branch.c:645 msgid "do not use" msgstr "använd ej" -#: builtin/branch.c:639 builtin/rebase.c:533 +#: builtin/branch.c:647 msgid "upstream" msgstr "uppströms" -#: builtin/branch.c:639 +#: builtin/branch.c:647 msgid "change the upstream info" msgstr "ändra uppströmsinformationen" -#: builtin/branch.c:640 +#: builtin/branch.c:648 msgid "unset the upstream info" msgstr "ta bort uppströmsinformationen" -#: builtin/branch.c:641 +#: builtin/branch.c:649 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:642 +#: builtin/branch.c:650 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:644 builtin/branch.c:646 +#: builtin/branch.c:652 builtin/branch.c:654 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:645 builtin/branch.c:647 +#: builtin/branch.c:653 builtin/branch.c:655 msgid "print only branches that don't contain the commit" msgstr "visa endast grenar som inte innehåller incheckningen" -#: builtin/branch.c:650 +#: builtin/branch.c:658 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:651 +#: builtin/branch.c:659 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:653 +#: builtin/branch.c:661 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:654 +#: builtin/branch.c:662 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:655 +#: builtin/branch.c:663 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:656 +#: builtin/branch.c:664 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:657 +#: builtin/branch.c:665 msgid "copy a branch and its reflog" msgstr "kopiera en gren och dess reflogg" -#: builtin/branch.c:658 +#: builtin/branch.c:666 msgid "copy a branch, even if target exists" msgstr "kopiera en gren, även om målet finns" -#: builtin/branch.c:659 +#: builtin/branch.c:667 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:660 +#: builtin/branch.c:668 msgid "show current branch name" msgstr "visa namn på aktuell gren" -#: builtin/branch.c:661 +#: builtin/branch.c:669 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:663 +#: builtin/branch.c:671 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:664 +#: builtin/branch.c:672 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:665 +#: builtin/branch.c:673 msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:666 +#: builtin/branch.c:674 msgid "print only branches that are not merged" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:667 +#: builtin/branch.c:675 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415 -#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:477 +#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413 +#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582 +#: builtin/tag.c:475 msgid "object" msgstr "objekt" -#: builtin/branch.c:670 +#: builtin/branch.c:678 msgid "print only branches of the object" msgstr "visa endast grenar för objektet" -#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484 +#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482 msgid "sorting and filtering are case insensitive" msgstr "sortering och filtrering skiljer gemener och VERSALER" -#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482 +#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/branch.c:695 builtin/clone.c:794 +#: builtin/branch.c:703 builtin/clone.c:678 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:719 -msgid "--column and --verbose are incompatible" -msgstr "--column och --verbose är inkompatibla" - -#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799 +#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:766 +#: builtin/branch.c:774 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:771 +#: builtin/branch.c:779 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:778 +#: builtin/branch.c:786 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu." -#: builtin/branch.c:781 +#: builtin/branch.c:789 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:796 +#: builtin/branch.c:804 msgid "too many branches for a copy operation" msgstr "för många grenar för kopiering" -#: builtin/branch.c:805 +#: builtin/branch.c:813 msgid "too many arguments for a rename operation" msgstr "för många flaggor för namnbyte" -#: builtin/branch.c:810 +#: builtin/branch.c:818 msgid "too many arguments to set new upstream" msgstr "för många flaggor för att byta uppström" -#: builtin/branch.c:814 +#: builtin/branch.c:822 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren." -#: builtin/branch.c:817 builtin/branch.c:840 +#: builtin/branch.c:825 builtin/branch.c:848 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:821 +#: builtin/branch.c:829 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:834 +#: builtin/branch.c:842 msgid "too many arguments to unset upstream" msgstr "för många flaggor för att ta bort uppström" -#: builtin/branch.c:838 +#: builtin/branch.c:846 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren." -#: builtin/branch.c:844 +#: builtin/branch.c:852 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:854 +#: builtin/branch.c:862 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -11654,7 +11942,7 @@ msgstr "" "Flaggorna -a och -r på \"git branch\" tar inte ett namn på gren.\n" "Menade du att använda: -a|-r --list <mönster>?" -#: builtin/branch.c:858 +#: builtin/branch.c:866 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -11662,32 +11950,32 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " "eller --set-upstream-to istället." -#: builtin/bugreport.c:15 +#: builtin/bugreport.c:16 msgid "git version:\n" msgstr "git version:\n" -#: builtin/bugreport.c:21 +#: builtin/bugreport.c:22 #, c-format msgid "uname() failed with error '%s' (%d)\n" msgstr "uname() misslyckades med felet \"%s\" (%d)\n" -#: builtin/bugreport.c:31 +#: builtin/bugreport.c:32 msgid "compiler info: " msgstr "kompilatorinfo:" -#: builtin/bugreport.c:34 +#: builtin/bugreport.c:35 msgid "libc info: " msgstr "libc-info:" -#: builtin/bugreport.c:80 +#: builtin/bugreport.c:49 msgid "not run from a git repository - no hooks to show\n" msgstr "körs inte från ett git-arkiv - inga krokar att visa\n" -#: builtin/bugreport.c:90 +#: builtin/bugreport.c:62 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" msgstr "git bugreport [-o|--output-directory <fil>] [-s|--suffix <format>]" -#: builtin/bugreport.c:97 +#: builtin/bugreport.c:69 msgid "" "Thank you for filling out a Git bug report!\n" "Please answer the following questions to help us understand your issue.\n" @@ -11723,38 +12011,33 @@ msgstr "" "Se över resten av felrapporten nedan.\n" "Du kan ta bort rader du inte vill dela.\n" -#: builtin/bugreport.c:136 +#: builtin/bugreport.c:108 msgid "specify a destination for the bugreport file" msgstr "ange mål för buggrapporteringsfilen" -#: builtin/bugreport.c:138 +#: builtin/bugreport.c:110 msgid "specify a strftime format suffix for the filename" msgstr "ange ett filändelse i strftime-format" -#: builtin/bugreport.c:160 +#: builtin/bugreport.c:132 #, c-format msgid "could not create leading directories for '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/bugreport.c:167 +#: builtin/bugreport.c:139 msgid "System Info" msgstr "Systeminfo" -#: builtin/bugreport.c:170 +#: builtin/bugreport.c:142 msgid "Enabled Hooks" msgstr "Aktiverade krokar" -#: builtin/bugreport.c:177 -#, c-format -msgid "couldn't create a new file at '%s'" -msgstr "kunde inte skapa filen på \"%s\"" - -#: builtin/bugreport.c:180 +#: builtin/bugreport.c:149 #, c-format msgid "unable to write to %s" msgstr "kunde inte skriva till %s" -#: builtin/bugreport.c:190 +#: builtin/bugreport.c:159 #, c-format msgid "Created new report at '%s'.\n" msgstr "Skapade ny rapport på \"%s\"\n" @@ -11775,53 +12058,53 @@ msgstr "git bundle list-heads <fil> [<refnamn>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <fil> [<refnamn>...]" -#: builtin/bundle.c:67 builtin/pack-objects.c:3747 +#: builtin/bundle.c:65 builtin/pack-objects.c:3876 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/bundle.c:69 builtin/pack-objects.c:3749 +#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/bundle.c:71 builtin/pack-objects.c:3751 +#: builtin/bundle.c:69 builtin/pack-objects.c:3880 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/bundle.c:74 builtin/pack-objects.c:3754 +#: builtin/bundle.c:72 builtin/pack-objects.c:3883 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" -#: builtin/bundle.c:76 +#: builtin/bundle.c:74 msgid "specify bundle format version" -msgstr "ange formatversion för paket (bundle)." +msgstr "ange formatversion för bunten." -#: builtin/bundle.c:96 +#: builtin/bundle.c:94 msgid "Need a repository to create a bundle." -msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." +msgstr "Behöver ett arkiv för att skapa en bunt." #: builtin/bundle.c:107 msgid "do not show bundle details" -msgstr "visa inte paketdetaljer" +msgstr "visa inte buntdetaljer" -#: builtin/bundle.c:122 +#: builtin/bundle.c:126 #, c-format msgid "%s is okay\n" msgstr "%s är okej\n" -#: builtin/bundle.c:163 +#: builtin/bundle.c:182 msgid "Need a repository to unbundle." -msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." +msgstr "Behöver ett arkiv för att packa upp en bunt." -#: builtin/bundle.c:171 builtin/remote.c:1700 -msgid "be verbose; must be placed before a subcommand" -msgstr "var pratsam; måste skrivas före ett underkommando" +#: builtin/bundle.c:185 +msgid "Unbundling objects" +msgstr "Packar upp objektbunt" -#: builtin/bundle.c:193 builtin/remote.c:1731 +#: builtin/bundle.c:219 builtin/remote.c:1733 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" -#: builtin/cat-file.c:598 +#: builtin/cat-file.c:622 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -11829,7 +12112,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>" -#: builtin/cat-file.c:599 +#: builtin/cat-file.c:623 msgid "" "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" "symlinks] [--textconv | --filters]" @@ -11837,72 +12120,72 @@ msgstr "" "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" "symlinks] [--textconv | --filters]" -#: builtin/cat-file.c:620 +#: builtin/cat-file.c:644 msgid "only one batch option may be specified" msgstr "endast en buntflagga kan anges" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:662 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<typ> kan vara en av: blob, tree, commit, tag" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:663 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:664 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:666 msgid "exit with zero when there's no error" msgstr "avsluta med noll när det inte uppstått något fel" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:667 msgid "pretty-print object's content" msgstr "visa objektets innehåll snyggt" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:669 msgid "for blob objects, run textconv on object's content" msgstr "för blob-objekt, kör filter på objektets innehåll" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:671 msgid "for blob objects, run filters on object's content" msgstr "för blob-objekt, kör filger på objektets innehåll" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:672 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:673 msgid "use a specific path for --textconv/--filters" msgstr "använd specifik sökväg för --textconv/--filters" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:675 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt" -#: builtin/cat-file.c:652 +#: builtin/cat-file.c:676 msgid "buffer --batch output" msgstr "buffra utdata från --batch" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:678 msgid "show info and content of objects fed from the standard input" msgstr "visa information och innehåll för objekt som listas på standard in" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:682 msgid "show info about objects fed from the standard input" msgstr "visa information för objekt som listas på standard in" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:686 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "följ symboliska länkar i trädet (använd med --batch eller --batch-check)" -#: builtin/cat-file.c:664 +#: builtin/cat-file.c:688 msgid "show all objects with --batch or --batch-check" msgstr "visa alla objekt med --batch eller --batch-check" -#: builtin/cat-file.c:666 +#: builtin/cat-file.c:690 msgid "do not order --batch-all-objects output" msgstr "ordna inte --batch-all-objects output" @@ -11922,7 +12205,7 @@ msgstr "visa alla attribut som satts på filen" msgid "use .gitattributes only from the index" msgstr "använd .gitattributes endast från indexet" -#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102 +#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100 msgid "read file names from stdin" msgstr "läs filnamn från standard in" @@ -11930,8 +12213,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:1520 builtin/gc.c:549 -#: builtin/worktree.c:491 +#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550 +#: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -11989,9 +12272,10 @@ msgid "git checkout--worker [<options>]" msgstr "git checkout--worker [<flaggor>]" #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 -#: builtin/column.c:31 builtin/submodule--helper.c:1825 -#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836 -#: builtin/submodule--helper.c:2334 builtin/worktree.c:719 +#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875 +#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577 +#: builtin/worktree.c:491 builtin/worktree.c:728 msgid "string" msgstr "sträng" @@ -12055,98 +12339,93 @@ msgstr "git switch [<flaggor>] [<gren>]" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<flaggor>] [--source=<gren>] <fil>..." -#: builtin/checkout.c:190 builtin/checkout.c:229 +#: builtin/checkout.c:198 builtin/checkout.c:237 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:192 builtin/checkout.c:231 +#: builtin/checkout.c:200 builtin/checkout.c:239 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:208 +#: builtin/checkout.c:216 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner" -#: builtin/checkout.c:261 +#: builtin/checkout.c:269 #, c-format msgid "path '%s' does not have necessary versions" msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner" -#: builtin/checkout.c:278 +#: builtin/checkout.c:286 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:294 +#: builtin/checkout.c:302 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:414 +#: builtin/checkout.c:419 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Återskapade %d sammanslagningskonflikt" msgstr[1] "Återskapade %d sammanslagningskonflikter" -#: builtin/checkout.c:419 +#: builtin/checkout.c:424 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Uppdaterade %d sökväg från %s" msgstr[1] "Uppdaterade %d sökvägar från %s" -#: builtin/checkout.c:426 +#: builtin/checkout.c:431 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Uppdaterade %d sökväg från indexet" msgstr[1] "Uppdaterade %d sökvägar från indexet" -#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455 -#: builtin/checkout.c:459 +#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460 +#: builtin/checkout.c:464 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar" -#: builtin/checkout.c:462 builtin/checkout.c:465 -#, c-format -msgid "'%s' cannot be used with %s" -msgstr "\"%s\" kan inte användas med %s" - -#: builtin/checkout.c:469 +#: builtin/checkout.c:474 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt." -#: builtin/checkout.c:473 +#: builtin/checkout.c:478 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "varken \"%s\" eller \"%s\" har angivits" -#: builtin/checkout.c:477 +#: builtin/checkout.c:482 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "\"%s\" måste användas när \"%s\" inte anges" -#: builtin/checkout.c:482 builtin/checkout.c:487 +#: builtin/checkout.c:487 builtin/checkout.c:492 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "\"%s\" eller \"%s\" kan inte användas med %s" -#: builtin/checkout.c:563 builtin/checkout.c:570 +#: builtin/checkout.c:566 builtin/checkout.c:573 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:739 +#: builtin/checkout.c:747 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:793 +#: builtin/checkout.c:797 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12155,50 +12434,50 @@ msgstr "" "kan inte fortsätta med köade ändringar i följande filer:\n" "%s" -#: builtin/checkout.c:886 +#: builtin/checkout.c:890 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:928 +#: builtin/checkout.c:934 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:936 +#: builtin/checkout.c:942 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:939 +#: builtin/checkout.c:945 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:943 +#: builtin/checkout.c:949 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:945 builtin/checkout.c:1376 +#: builtin/checkout.c:951 builtin/checkout.c:1388 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:947 +#: builtin/checkout.c:953 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:998 +#: builtin/checkout.c:1004 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:1004 +#: builtin/checkout.c:1010 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12221,7 +12500,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1023 +#: builtin/checkout.c:1029 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12248,19 +12527,19 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:1058 +#: builtin/checkout.c:1064 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1068 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:1102 builtin/checkout.c:1371 +#: builtin/checkout.c:1114 builtin/checkout.c:1383 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:1184 +#: builtin/checkout.c:1196 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12269,7 +12548,7 @@ msgstr "" "\"%s\" kan vara både en lokal fil och en spårande gren.\n" "Använd -- (och möjligen --no-guess) för att göra otvetydig" -#: builtin/checkout.c:1191 +#: builtin/checkout.c:1203 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12289,51 +12568,51 @@ 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:1201 +#: builtin/checkout.c:1213 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1279 msgid "only one reference expected" msgstr "endast en referens förväntades" -#: builtin/checkout.c:1284 +#: builtin/checkout.c:1296 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438 +#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1343 builtin/checkout.c:1709 +#: builtin/checkout.c:1355 builtin/checkout.c:1725 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1402 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "förväntade gren, fick taggen \"%s\"" -#: builtin/checkout.c:1392 +#: builtin/checkout.c:1404 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "förväntade gren, fick fjärrgrenen \"%s\"" -#: builtin/checkout.c:1393 builtin/checkout.c:1401 +#: builtin/checkout.c:1405 builtin/checkout.c:1413 #, c-format msgid "a branch is expected, got '%s'" msgstr "förväntade gren, fick \"%s\"" -#: builtin/checkout.c:1396 +#: builtin/checkout.c:1408 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "förväntade gren, fick incheckningen \"%s\"" -#: builtin/checkout.c:1412 +#: builtin/checkout.c:1424 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12341,7 +12620,7 @@ msgstr "" "kan inte växla gren vid sammanslagning\n" "Överväg \"git merge --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1416 +#: builtin/checkout.c:1428 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12349,7 +12628,7 @@ msgstr "" "kan inte växla gren mitt i en \"am\"-körning\n" "Överväg \"git am --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1420 +#: builtin/checkout.c:1432 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12357,7 +12636,7 @@ msgstr "" "kan inte växla gren vid ombasering\n" "Överväg \"git rebase --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1424 +#: builtin/checkout.c:1436 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12365,7 +12644,7 @@ msgstr "" "kan inte växla gren i en \"cherry-pick\"\n" "Överväg \"git cherry-pick --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1428 +#: builtin/checkout.c:1440 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12373,139 +12652,127 @@ msgstr "" "kan inte växla gren i en \"revert\"\n" "Överväg \"git revert --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1432 +#: builtin/checkout.c:1444 msgid "you are switching branch while bisecting" msgstr "då växlar grenar medan du gör en \"bisect\"" -#: builtin/checkout.c:1439 +#: builtin/checkout.c:1451 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450 +#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 -#: builtin/checkout.c:1465 builtin/checkout.c:1470 +#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472 +#: builtin/checkout.c:1477 builtin/checkout.c:1482 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1467 +#: builtin/checkout.c:1479 #, c-format msgid "'%s' cannot take <start-point>" msgstr "\"%s\" kan inte ta <startpunkt>" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1487 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1494 msgid "missing branch or commit argument" msgstr "saknar gren- eller incheckingsargument" -#: builtin/checkout.c:1525 +#: builtin/checkout.c:1537 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:1526 builtin/log.c:1807 parse-options.h:323 +#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323 msgid "style" msgstr "stil" -#: builtin/checkout.c:1527 -msgid "conflict style (merge or diff3)" -msgstr "konfliktstil (merge eller diff3)" +#: builtin/checkout.c:1539 +msgid "conflict style (merge, diff3, or zdiff3)" +msgstr "konfliktstil (merge, diff3 eller zdiff3)" -#: builtin/checkout.c:1539 builtin/worktree.c:488 +#: builtin/checkout.c:1551 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1540 -msgid "set upstream info for new branch" -msgstr "sätt uppströmsinformation för ny gren" +#: builtin/checkout.c:1553 +msgid "set up tracking mode (see git-pull(1))" +msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1556 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1558 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1558 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1546 builtin/merge.c:301 +#: builtin/checkout.c:1560 builtin/merge.c:305 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1549 +#: builtin/checkout.c:1563 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:1562 +#: builtin/checkout.c:1576 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1579 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1569 +#: builtin/checkout.c:1583 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1624 +#: builtin/checkout.c:1640 #, c-format -msgid "-%c, -%c and --orphan are mutually exclusive" -msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande" - -#: builtin/checkout.c:1628 -msgid "-p and --overlay are mutually exclusive" -msgstr "-p och --overlay är ömsesidigt uteslutande" +msgid "options '-%c', '-%c', and '%s' cannot be used together" +msgstr "flaggorna \"%-c\", \"-%c\" och \"%s\" kan inte användas samtidigt" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1681 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1670 +#: builtin/checkout.c:1686 #, c-format msgid "missing branch name; try -%c" msgstr "grennamn saknas; försök med -%c" -#: builtin/checkout.c:1702 +#: builtin/checkout.c:1718 #, c-format msgid "could not resolve %s" msgstr "kunde inte upplösa %s" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1734 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1725 +#: builtin/checkout.c:1741 #, 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:1729 +#: builtin/checkout.c:1745 #, 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:1738 -msgid "--pathspec-from-file is incompatible with --detach" -msgstr "--pathspec-from-file är inkompatibelt med --detach" - -#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634 -msgid "--pathspec-from-file is incompatible with --patch" -msgstr "--pathspec-from-file är inkompatibelt med --patch" - -#: builtin/checkout.c:1754 +#: builtin/checkout.c:1770 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12513,70 +12780,71 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/checkout.c:1759 +#: builtin/checkout.c:1775 msgid "you must specify path(s) to restore" msgstr "du måste ange katalog(er) att återställa" -#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 -#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484 +#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854 +#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2959 +#: builtin/submodule--helper.c:3253 builtin/worktree.c:484 #: builtin/worktree.c:486 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1786 +#: builtin/checkout.c:1801 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1803 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1789 +#: builtin/checkout.c:1804 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1791 +#: builtin/checkout.c:1806 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "förutspå \"git checkout <gren-saknas>\" (förval)" -#: builtin/checkout.c:1792 +#: builtin/checkout.c:1807 msgid "use overlay mode (default)" msgstr "använd överläggsläge (standard)" -#: builtin/checkout.c:1837 +#: builtin/checkout.c:1855 msgid "create and switch to a new branch" msgstr "skapa och växla till en ny gren" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1857 msgid "create/reset and switch to a branch" msgstr "skapa/nollställ och växla till en gren" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1859 msgid "second guess 'git switch <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1861 msgid "throw away local modifications" msgstr "kasta bort lokala ändringar" -#: builtin/checkout.c:1877 +#: builtin/checkout.c:1897 msgid "which tree-ish to checkout from" msgstr "vilken träd-igt att checka ut från" -#: builtin/checkout.c:1879 +#: builtin/checkout.c:1899 msgid "restore the index" msgstr "återställ indexet" -#: builtin/checkout.c:1881 +#: builtin/checkout.c:1901 msgid "restore the working tree (default)" msgstr "återställ arbetskatalogen (förval)" -#: builtin/checkout.c:1883 +#: builtin/checkout.c:1903 msgid "ignore unmerged entries" msgstr "ignorera ej sammanslagna poster" -#: builtin/checkout.c:1884 +#: builtin/checkout.c:1904 msgid "use overlay mode" msgstr "använd överläggsläge" @@ -12612,7 +12880,15 @@ msgstr "Skulle hoppa över arkivet %s\n" msgid "could not lstat %s\n" msgstr "kunde inte ta status (\"lstat\") på %s\n" -#: builtin/clean.c:302 git-add--interactive.perl:593 +#: builtin/clean.c:39 +msgid "Refusing to remove current working directory\n" +msgstr "Vägrar ta bort aktuell arbetskatalog\n" + +#: builtin/clean.c:40 +msgid "Would refuse to remove current working directory\n" +msgstr "Skulle vägra ta bort aktuell arbetskatalog\n" + +#: builtin/clean.c:326 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12625,7 +12901,7 @@ msgstr "" "foo - markera post baserad på unikt prefix\n" " - (tomt) markera ingenting\n" -#: builtin/clean.c:306 git-add--interactive.perl:602 +#: builtin/clean.c:330 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12646,33 +12922,33 @@ msgstr "" "* - välj alla poster\n" " - (tomt) avsluta markering\n" -#: builtin/clean.c:521 git-add--interactive.perl:568 +#: builtin/clean.c:545 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Vadå (%s)?\n" -#: builtin/clean.c:661 +#: builtin/clean.c:685 #, c-format msgid "Input ignore patterns>> " msgstr "Ange ignoreringsmönster>>" -#: builtin/clean.c:696 +#: builtin/clean.c:719 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "VARNING: Hittar inte poster som motsvarar: %s" -#: builtin/clean.c:717 +#: builtin/clean.c:740 msgid "Select items to delete" msgstr "Välj poster att ta bort" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:781 #, c-format msgid "Remove %s [y/N]? " msgstr "Ta bort %s [Y=ja / N=nej]? " -#: builtin/clean.c:789 +#: builtin/clean.c:812 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12690,52 +12966,52 @@ msgstr "" "help - denna skärm\n" "? - hjälp för kommandoval" -#: builtin/clean.c:825 +#: builtin/clean.c:848 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Skulle ta bort följande post:" msgstr[1] "Skulle ta bort följande poster:" -#: builtin/clean.c:841 +#: builtin/clean.c:864 msgid "No more files to clean, exiting." msgstr "Inga fler filer att städa, avslutar." -#: builtin/clean.c:903 +#: builtin/clean.c:926 msgid "do not print names of files removed" msgstr "skriv inte ut namn på borttagna filer" -#: builtin/clean.c:905 +#: builtin/clean.c:928 msgid "force" msgstr "tvinga" -#: builtin/clean.c:906 +#: builtin/clean.c:929 msgid "interactive cleaning" msgstr "städa interaktivt" -#: builtin/clean.c:908 +#: builtin/clean.c:931 msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186 -#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186 +#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537 #: builtin/show-ref.c:179 msgid "pattern" msgstr "mönster" -#: builtin/clean.c:910 +#: builtin/clean.c:933 msgid "add <pattern> to ignore rules" msgstr "lägg till <mönster> till ignoreringsregler" -#: builtin/clean.c:911 +#: builtin/clean.c:934 msgid "remove ignored files, too" msgstr "ta även bort ignorerade filer" -#: builtin/clean.c:913 +#: builtin/clean.c:936 msgid "remove only ignored files" msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:929 +#: builtin/clean.c:951 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -12743,7 +13019,7 @@ msgstr "" "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar " "städa" -#: builtin/clean.c:932 +#: builtin/clean.c:954 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -12751,7 +13027,7 @@ msgstr "" "clean.requireForce har standardvärdet true och varken -i, -n eller -f " "angavs; vägrar städa" -#: builtin/clean.c:944 +#: builtin/clean.c:966 msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" @@ -12767,7 +13043,7 @@ msgstr "klona inte grunt arkiv" msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541 +#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" @@ -12799,27 +13075,29 @@ msgstr "initiera undermoduler i klonen" msgid "number of submodules cloned in parallel" msgstr "antal undermoduler som klonas parallellt" -#: builtin/clone.c:116 builtin/init-db.c:538 +#: builtin/clone.c:116 builtin/init-db.c:539 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:117 builtin/init-db.c:539 +#: builtin/clone.c:117 builtin/init-db.c:540 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832 -#: builtin/submodule--helper.c:2337 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871 +#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:123 builtin/submodule--helper.c:1834 -#: builtin/submodule--helper.c:2339 +#: builtin/clone.c:123 builtin/submodule--helper.c:1873 +#: builtin/submodule--helper.c:2516 msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" -#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:549 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495 -#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698 +#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27 +#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290 +#: builtin/pack-objects.c:3944 builtin/repack.c:665 +#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595 +#: t/helper/test-simple-ipc.c:597 msgid "name" msgstr "namn" @@ -12835,8 +13113,8 @@ msgstr "checka ut <gren> 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:130 builtin/fetch.c:180 builtin/grep.c:863 -#: builtin/pull.c:208 +#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876 +#: builtin/pull.c:212 msgid "depth" msgstr "djup" @@ -12844,8 +13122,8 @@ msgstr "djup" msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804 -#: builtin/pull.c:211 +#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933 +#: builtin/pull.c:215 msgid "time" msgstr "tid" @@ -12853,17 +13131,17 @@ msgstr "tid" msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon från en angiven tidpunkt" -#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318 +#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208 +#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022 msgid "revision" msgstr "revision" -#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215 +#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219 msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" -#: builtin/clone.c:137 builtin/submodule--helper.c:1844 -#: builtin/submodule--helper.c:2353 +#: builtin/clone.c:137 builtin/submodule--helper.c:1883 +#: builtin/submodule--helper.c:2530 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" @@ -12875,11 +13153,11 @@ msgstr "klona inga taggar och gör att senare hämtningar inte följer dem" msgid "any cloned submodules will be shallow" msgstr "klonade undermoduler kommer vara grunda" -#: builtin/clone.c:142 builtin/init-db.c:547 +#: builtin/clone.c:142 builtin/init-db.c:548 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:143 builtin/init-db.c:548 +#: builtin/clone.c:143 builtin/init-db.c:549 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" @@ -12891,25 +13169,23 @@ msgstr "nyckel=värde" msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 +#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77 +#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200 msgid "server-specific" msgstr "serverspecifik" -#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 +#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77 +#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201 msgid "option to transmit" -msgstr "" -"inget att checka in\n" -"flagga att sända" +msgstr "flagga att sända" -#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 -#: builtin/push.c:585 +#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238 +#: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 -#: builtin/push.c:587 +#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241 +#: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" @@ -12919,52 +13195,44 @@ msgstr "klonade undermoduler kommer använda sin fjärrspårningsgren" #: builtin/clone.c:156 msgid "initialize sparse-checkout file to include only files at root" -msgstr "initiera sparse-checkout-filen till att bara inkludera filer i roten" +msgstr "initiera sparse-checkout-filen till att bara ta med filer i roten" -#: builtin/clone.c:292 -msgid "" -"No directory name could be guessed.\n" -"Please specify a directory on the command line" -msgstr "" -"Kunde inte gissa katalognamn.\n" -"Ange en katalog på kommandoraden" - -#: builtin/clone.c:345 +#: builtin/clone.c:231 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Kan inte skapa suppleant för \"%s\": %s\n" -#: builtin/clone.c:418 +#: builtin/clone.c:304 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:436 +#: builtin/clone.c:322 #, c-format msgid "failed to start iterator over '%s'" msgstr "misslyckades starta iterator över \"%s\"" -#: builtin/clone.c:467 +#: builtin/clone.c:353 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:471 +#: builtin/clone.c:357 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:476 +#: builtin/clone.c:362 #, c-format msgid "failed to iterate over '%s'" msgstr "misslyckades iterera över \"%s\"" -#: builtin/clone.c:503 +#: builtin/clone.c:389 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:517 +#: builtin/clone.c:403 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12972,149 +13240,149 @@ msgid "" msgstr "" "Klonen lyckades, men utcheckningen misslyckades.\n" "Du kan inspektera det som checkades ut med \"git status\"\n" -"och försöka med \"git restore -source=HEAD :/\"\n" +"och försöka med \"git restore --source=HEAD :/\"\n" -#: builtin/clone.c:594 +#: builtin/clone.c:480 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Kunde inte hitta fjärrgrenen %s för att klona." -#: builtin/clone.c:713 +#: builtin/clone.c:597 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:761 +#: builtin/clone.c:645 msgid "failed to initialize sparse-checkout" msgstr "misslyckades initiera sparse-checkout" -#: builtin/clone.c:784 +#: builtin/clone.c:668 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:816 +#: builtin/clone.c:701 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:894 +#: builtin/clone.c:779 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:957 +#: builtin/clone.c:842 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:959 +#: builtin/clone.c:844 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:1001 builtin/receive-pack.c:2491 +#: builtin/clone.c:886 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:1005 +#: builtin/clone.c:890 contrib/scalar/scalar.c:414 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:1018 +#: builtin/clone.c:903 #, c-format -msgid "--bare and --origin %s options are incompatible." -msgstr "flaggorna --bare och --origin %s är inkompatibla." +msgid "options '%s' and '%s %s' cannot be used together" +msgstr "flaggorna \"%s\" och \"%s %s\" kan inte användas samtidigt" -#: builtin/clone.c:1021 -msgid "--bare and --separate-git-dir are incompatible." -msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." - -#: builtin/clone.c:1035 +#: builtin/clone.c:920 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:1039 builtin/fetch.c:2011 +#: builtin/clone.c:924 builtin/fetch.c:2052 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:1049 +#: builtin/clone.c:934 #, 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:1055 +#: builtin/clone.c:940 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "arkivsökvägen \"%s\" finns redan och är inte en tom katalog." -#: builtin/clone.c:1069 +#: builtin/clone.c:954 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 -#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314 +#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256 +#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:1089 +#: builtin/clone.c:974 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:1109 +#: builtin/clone.c:994 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:1111 +#: builtin/clone.c:996 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:1135 +#: builtin/clone.c:1025 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:1188 builtin/remote.c:200 builtin/remote.c:705 +#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710 #, c-format msgid "'%s' is not a valid remote name" msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" -#: builtin/clone.c:1229 +#: builtin/clone.c:1121 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1231 +#: builtin/clone.c:1123 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:1233 +#: builtin/clone.c:1125 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:1235 +#: builtin/clone.c:1127 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1240 +#: builtin/clone.c:1132 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1245 +#: builtin/clone.c:1137 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1337 builtin/clone.c:1345 +#: builtin/clone.c:1216 builtin/clone.c:1276 +msgid "remote transport reported error" +msgstr "fjärrtransport rapporterade fel" + +#: builtin/clone.c:1228 builtin/clone.c:1239 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1348 +#: builtin/clone.c:1242 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -13150,13 +13418,13 @@ msgstr "spaltfyllnad mellan spalter" msgid "--command must be the first argument" msgstr "--command måste vara första argument" -#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 +#: builtin/commit-graph.c:13 msgid "" "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" msgstr "" "git commit-graph verify [--object-dir <objkat>] [--shallow] [--[no-]progress]" -#: builtin/commit-graph.c:14 builtin/commit-graph.c:27 +#: builtin/commit-graph.c:16 msgid "" "git commit-graph write [--object-dir <objdir>] [--append] [--" "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" @@ -13166,94 +13434,92 @@ msgstr "" "split[=<strategi>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <delnings-flaggor>" -#: builtin/commit-graph.c:64 -#, c-format -msgid "could not find object directory matching %s" -msgstr "kunde inte hitta objektkatalog för %s" - -#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776 +#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794 msgid "dir" msgstr "kat" -#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 -#: builtin/commit-graph.c:317 +#: builtin/commit-graph.c:52 msgid "the object directory to store the graph" msgstr "objektkatalogen där grafen ska lagras" -#: builtin/commit-graph.c:83 +#: builtin/commit-graph.c:73 msgid "if the commit-graph is split, only verify the tip file" msgstr "om inchecknignsgrafen är delad, kontrollera bara spetsfilen" -#: builtin/commit-graph.c:106 +#: builtin/commit-graph.c:100 #, c-format msgid "Could not open commit-graph '%s'" msgstr "Kunde inte öppna incheckningsgrafen \"%s\"" -#: builtin/commit-graph.c:142 +#: builtin/commit-graph.c:137 #, c-format msgid "unrecognized --split argument, %s" msgstr "okänt argument för --split, %s" -#: builtin/commit-graph.c:155 +#: builtin/commit-graph.c:150 #, c-format msgid "unexpected non-hex object ID: %s" msgstr "oväntat icke-hexadecimalt objekt-ID: %s" -#: builtin/commit-graph.c:160 +#: builtin/commit-graph.c:155 #, c-format msgid "invalid object: %s" msgstr "ogiltigt objekt: %s" -#: builtin/commit-graph.c:213 +#: builtin/commit-graph.c:205 msgid "start walk at all refs" msgstr "starta traversering vid alla referenser" -#: builtin/commit-graph.c:215 +#: builtin/commit-graph.c:207 msgid "scan pack-indexes listed by stdin for commits" msgstr "sök paketindex listade på standard in efter incheckningar" -#: builtin/commit-graph.c:217 +#: builtin/commit-graph.c:209 msgid "start walk at commits listed by stdin" msgstr "börja gå genom incheckningar listade på standard in" -#: builtin/commit-graph.c:219 +#: builtin/commit-graph.c:211 msgid "include all commits already in the commit-graph file" msgstr "ta med alla incheckningar redan i filen commit-graph" -#: builtin/commit-graph.c:221 +#: builtin/commit-graph.c:213 msgid "enable computation for changed paths" msgstr "aktivera beräkning av ändrade sökvägar" -#: builtin/commit-graph.c:224 +#: builtin/commit-graph.c:215 msgid "allow writing an incremental commit-graph file" msgstr "tillåt skriva en inkrementell incheckningsgraffil" -#: builtin/commit-graph.c:228 +#: builtin/commit-graph.c:219 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:230 +#: builtin/commit-graph.c:221 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:232 +#: builtin/commit-graph.c:223 msgid "only expire files older than a given date-time" msgstr "låt tid endast gå ut för filer äldre än givet datum och tid" -#: builtin/commit-graph.c:234 +#: builtin/commit-graph.c:225 msgid "maximum number of changed-path Bloom filters to compute" msgstr "maximalt antal Bloom-filer med ändrad sökväg att beräkna" -#: builtin/commit-graph.c:255 +#: builtin/commit-graph.c:251 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" +msgstr "använd som mest en av --reachable, --stdin-commits och --stdin-packs" -#: builtin/commit-graph.c:287 +#: builtin/commit-graph.c:282 msgid "Collecting commits from input" msgstr "Hämtar incheckningar från indata" +#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259 +#, c-format +msgid "unrecognized subcommand: %s" +msgstr "okänt underkommando: %s" + #: builtin/commit-tree.c:18 msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " @@ -13267,70 +13533,65 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "duplicerad förälder %s ignorerades" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577 #, c-format msgid "not a valid object name %s" msgstr "objektnamnet är inte giltigt: %s" -#: builtin/commit-tree.c:93 -#, c-format -msgid "git commit-tree: failed to open '%s'" -msgstr "git commit-tree: misslyckades öppna \"%s\"" - -#: builtin/commit-tree.c:96 +#: builtin/commit-tree.c:94 #, c-format msgid "git commit-tree: failed to read '%s'" msgstr "git commit-tree: misslyckades läsa \"%s\"" -#: builtin/commit-tree.c:98 +#: builtin/commit-tree.c:96 #, c-format msgid "git commit-tree: failed to close '%s'" msgstr "git commit-tree: misslyckades stänga \"%s\"" -#: builtin/commit-tree.c:111 +#: builtin/commit-tree.c:109 msgid "parent" msgstr "förälder" -#: builtin/commit-tree.c:112 +#: builtin/commit-tree.c:110 msgid "id of a parent commit object" msgstr "id på ett förälderincheckningsobjekt" -#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605 -#: builtin/tag.c:456 +#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284 +#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677 +#: builtin/tag.c:454 msgid "message" msgstr "meddelande" -#: builtin/commit-tree.c:115 builtin/commit.c:1614 +#: builtin/commit-tree.c:113 builtin/commit.c:1627 msgid "commit message" msgstr "incheckningsmeddelande" -#: builtin/commit-tree.c:118 +#: builtin/commit-tree.c:116 msgid "read commit log message from file" msgstr "läs incheckningsloggmeddelande från fil" -#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299 -#: builtin/pull.c:176 builtin/revert.c:118 +#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303 +#: builtin/pull.c:180 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG-signera incheckning" -#: builtin/commit-tree.c:133 +#: builtin/commit-tree.c:131 msgid "must give exactly one tree" msgstr "måste ange exakt ett träd" -#: builtin/commit-tree.c:140 +#: builtin/commit-tree.c:138 msgid "git commit-tree: failed to read" msgstr "git commit-tree: misslyckades läsa" -#: builtin/commit.c:41 +#: builtin/commit.c:42 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<flaggor>] [--] <sökväg>..." -#: builtin/commit.c:46 +#: builtin/commit.c:47 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<flaggor>] [--] <sökväg>..." -#: builtin/commit.c:51 +#: builtin/commit.c:52 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -13340,7 +13601,7 @@ msgstr "" "blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n" "så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n" -#: builtin/commit.c:56 +#: builtin/commit.c:57 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -13354,15 +13615,15 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:63 +#: builtin/commit.c:64 msgid "Otherwise, please use 'git rebase --skip'\n" msgstr "Använd annars \"git rebase --skip\"\n" -#: builtin/commit.c:66 +#: builtin/commit.c:67 msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "Använd annars \"git cherry-pick --skip\"\n" -#: builtin/commit.c:69 +#: builtin/commit.c:70 msgid "" "and then use:\n" "\n" @@ -13384,73 +13645,69 @@ msgstr "" " git cherry-pick --skip\n" "\n" -#: builtin/commit.c:324 +#: builtin/commit.c:325 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:360 -msgid "--pathspec-from-file with -a does not make sense" -msgstr "--pathspec-from-file med -a ger ingen mening" - -#: builtin/commit.c:374 +#: builtin/commit.c:375 msgid "No paths with --include/--only does not make sense." msgstr "Du måste ange sökvägar tillsammans med --include/--only." -#: builtin/commit.c:386 +#: builtin/commit.c:387 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:395 +#: builtin/commit.c:396 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:410 +#: builtin/commit.c:411 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporärt index" -#: builtin/commit.c:412 +#: builtin/commit.c:413 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cacheträdet" -#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508 +#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:489 +#: builtin/commit.c:490 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:491 +#: builtin/commit.c:492 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:493 +#: builtin/commit.c:494 msgid "cannot do a partial commit during a rebase." msgstr "kan inte utföra en delvis incheckning under en ombasering." -#: builtin/commit.c:501 +#: builtin/commit.c:502 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:520 +#: builtin/commit.c:521 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:618 +#: builtin/commit.c:619 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar författarhuvud" -#: builtin/commit.c:620 +#: builtin/commit.c:621 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:639 +#: builtin/commit.c:640 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:692 +#: builtin/commit.c:693 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -13458,43 +13715,82 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158 +#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:758 builtin/shortlog.c:413 +#: builtin/commit.c:759 builtin/shortlog.c:416 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:760 +#: builtin/commit.c:761 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:764 +#: builtin/commit.c:765 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:801 +#: builtin/commit.c:802 #, c-format -msgid "cannot combine -m with --fixup:%s" -msgstr "kan inte kombinera -m med --fixup:%s" +msgid "options '%s' and '%s:%s' cannot be used together" +msgstr "flaggorna \"%s\" och \"%s:%s\" kan inte användas samtidigt" -#: builtin/commit.c:813 builtin/commit.c:829 +#: builtin/commit.c:814 builtin/commit.c:830 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:820 +#: builtin/commit.c:821 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:880 +#: builtin/commit.c:881 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" +#: builtin/commit.c:894 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored.\n" +msgstr "" +"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n" +"med \"%c\" kommer ignoreras.\n" + +#: builtin/commit.c:896 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n" +"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " +"incheckningen.\n" + #: builtin/commit.c:900 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +msgstr "" +"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n" +"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" + +#: builtin/commit.c:904 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n" +"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" +"Ett tomt meddelande avbryter incheckningen.\n" + +#: builtin/commit.c:916 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -13508,7 +13804,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "och försöker igen.\n" -#: builtin/commit.c:905 +#: builtin/commit.c:921 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -13522,196 +13818,168 @@ msgstr "" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "och försöker igen.\n" -#: builtin/commit.c:915 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be ignored, and an empty message aborts the commit.\n" -msgstr "" -"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n" -"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " -"incheckningen.\n" - -#: builtin/commit.c:923 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be kept; you may remove them yourself if you want to.\n" -"An empty message aborts the commit.\n" -msgstr "" -"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n" -"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" -"Ett tomt meddelande avbryter incheckningen.\n" - -#: builtin/commit.c:940 +#: builtin/commit.c:948 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:948 +#: builtin/commit.c:956 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:955 +#: builtin/commit.c:963 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:973 +#: builtin/commit.c:981 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:1018 +#: builtin/commit.c:1026 msgid "unable to pass trailers to --trailers" msgstr "kan inte sända släprader till --trailers" -#: builtin/commit.c:1058 +#: builtin/commit.c:1066 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:1072 builtin/tag.c:319 +#: builtin/commit.c:1080 builtin/tag.c:316 #, 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:1116 +#: builtin/commit.c:1124 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' är inte 'Namn <epost>' och motsvarar ingen befintlig författare" -#: builtin/commit.c:1130 +#: builtin/commit.c:1138 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Ogiltigt ignorerat läge \"%s\"" -#: builtin/commit.c:1148 builtin/commit.c:1441 +#: builtin/commit.c:1156 builtin/commit.c:1451 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1188 -msgid "--long and -z are incompatible" -msgstr "--long och -z är inkompatibla" - -#: builtin/commit.c:1219 +#: builtin/commit.c:1227 msgid "You are in the middle of a merge -- cannot reword." msgstr "Du är i mitten av en sammanslagning -- kan inte omformulera." -#: builtin/commit.c:1221 +#: builtin/commit.c:1229 msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "Du är i mitten av en cherry-pick -- kan inte omformulera." -#: builtin/commit.c:1224 +#: builtin/commit.c:1232 #, c-format -msgid "cannot combine reword option of --fixup with path '%s'" +msgid "reword option of '%s' and path '%s' cannot be used together" msgstr "" -"kan inte kombinera omformuleringsflaggor för --fixup med sökvägen \"%s\"" +"reword-flaggan till \"%s\" och sökvägen \"%s\" kan inte användas tillsammans" -#: builtin/commit.c:1226 -msgid "" -"reword option of --fixup is mutually exclusive with --patch/--interactive/--" -"all/--include/--only" -msgstr "" -"omformuleringsflaggan i --fixup är ömsesidigt uteslutande med --patch/--" -"interactive/--all/--include/--only" +#: builtin/commit.c:1234 +#, c-format +msgid "reword option of '%s' and '%s' cannot be used together" +msgstr "reword-flaggan till \"%s\" och \"%s\" kan inte användas tillsammans" -#: builtin/commit.c:1245 +#: builtin/commit.c:1254 msgid "Using both --reset-author and --author does not make sense" msgstr "Kan inte använda både --reset-author och --author" -#: builtin/commit.c:1254 +#: builtin/commit.c:1261 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1257 +#: builtin/commit.c:1264 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:1259 +#: builtin/commit.c:1266 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:1261 +#: builtin/commit.c:1268 msgid "You are in the middle of a rebase -- cannot amend." msgstr "Du är i mitten av en ombasering -- kan inte utöka." -#: builtin/commit.c:1264 +#: builtin/commit.c:1271 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1274 +#: builtin/commit.c:1281 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Endast en av -c/-C/-F/--fixup kan användas." -#: builtin/commit.c:1276 +#: builtin/commit.c:1283 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F." -#: builtin/commit.c:1285 +#: builtin/commit.c:1292 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:1303 +#: builtin/commit.c:1310 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Endast en av --include/--only/--all/--interactive/--patch kan användas." -#: builtin/commit.c:1331 +#: builtin/commit.c:1338 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "okänd flagga: --fixup=%s:%s" -#: builtin/commit.c:1345 +#: builtin/commit.c:1355 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "sökvägarna \"%s ...\" med -a ger ingen mening" -#: builtin/commit.c:1476 builtin/commit.c:1642 +#: builtin/commit.c:1486 builtin/commit.c:1655 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1478 builtin/commit.c:1644 +#: builtin/commit.c:1488 builtin/commit.c:1657 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1480 +#: builtin/commit.c:1490 msgid "show stash information" msgstr "visa information om stash" -#: builtin/commit.c:1482 builtin/commit.c:1646 +#: builtin/commit.c:1492 builtin/commit.c:1659 msgid "compute full ahead/behind values" msgstr "beräkna fullständiga före-/efter-värden" -#: builtin/commit.c:1484 +#: builtin/commit.c:1494 msgid "version" msgstr "version" -#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560 -#: builtin/worktree.c:681 +#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551 +#: builtin/worktree.c:690 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1487 builtin/commit.c:1650 +#: builtin/commit.c:1497 builtin/commit.c:1663 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1490 builtin/commit.c:1653 +#: builtin/commit.c:1500 builtin/commit.c:1666 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656 -#: builtin/fast-export.c:1198 builtin/fast-export.c:1201 -#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337 +#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669 +#: builtin/fast-export.c:1172 builtin/fast-export.c:1175 +#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337 msgid "mode" msgstr "läge" -#: builtin/commit.c:1493 builtin/commit.c:1656 +#: builtin/commit.c:1503 builtin/commit.c:1669 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:1497 +#: builtin/commit.c:1507 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -13719,11 +13987,11 @@ msgstr "" "visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: " "traditional)" -#: builtin/commit.c:1499 parse-options.h:193 +#: builtin/commit.c:1509 parse-options.h:192 msgid "when" msgstr "när" -#: builtin/commit.c:1500 +#: builtin/commit.c:1510 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -13731,194 +13999,194 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1502 +#: builtin/commit.c:1512 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1503 +#: builtin/commit.c:1513 msgid "do not detect renames" msgstr "detektera inte namnändringar" -#: builtin/commit.c:1505 +#: builtin/commit.c:1515 msgid "detect renames, optionally set similarity index" msgstr "detektera namnändringar, möjligen sätt likhetsindex" -#: builtin/commit.c:1525 +#: builtin/commit.c:1538 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:1607 +#: builtin/commit.c:1620 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1608 +#: builtin/commit.c:1621 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1610 +#: builtin/commit.c:1623 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458 +#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1612 +#: builtin/commit.c:1625 msgid "author" msgstr "författare" -#: builtin/commit.c:1612 +#: builtin/commit.c:1625 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1613 builtin/gc.c:550 +#: builtin/commit.c:1626 builtin/gc.c:551 msgid "date" msgstr "datum" -#: builtin/commit.c:1613 +#: builtin/commit.c:1626 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622 -#: parse-options.h:329 ref-filter.h:90 +#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635 +#: parse-options.h:329 ref-filter.h:89 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1615 +#: builtin/commit.c:1628 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1616 +#: builtin/commit.c:1629 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. #. -#: builtin/commit.c:1621 +#: builtin/commit.c:1634 msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]incheckning" -#: builtin/commit.c:1621 +#: builtin/commit.c:1634 msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa/omformulera angiven " "incheckning" -#: builtin/commit.c:1622 +#: builtin/commit.c:1635 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:1623 +#: builtin/commit.c:1636 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:1624 builtin/interpret-trailers.c:111 +#: builtin/commit.c:1637 builtin/interpret-trailers.c:111 msgid "trailer" msgstr "släprad" -#: builtin/commit.c:1624 +#: builtin/commit.c:1637 msgid "add custom trailer(s)" msgstr "använd skräddarsydd(a) släprad(er)" -#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302 -#: builtin/pull.c:145 builtin/revert.c:110 +#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306 +#: builtin/pull.c:146 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "lägg till Signed-off-by-släprad" -#: builtin/commit.c:1626 +#: builtin/commit.c:1639 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1627 +#: builtin/commit.c:1640 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1629 +#: builtin/commit.c:1642 msgid "include status in commit message template" -msgstr "inkludera status i mallen för incheckningsmeddelandet" +msgstr "ta med status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1634 +#: builtin/commit.c:1647 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1635 +#: builtin/commit.c:1648 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1636 +#: builtin/commit.c:1649 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1637 +#: builtin/commit.c:1650 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1638 +#: builtin/commit.c:1651 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1639 +#: builtin/commit.c:1652 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1640 +#: builtin/commit.c:1653 msgid "bypass pre-commit and commit-msg hooks" msgstr "förbigå pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1641 +#: builtin/commit.c:1654 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1654 +#: builtin/commit.c:1667 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1655 +#: builtin/commit.c:1668 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1662 +#: builtin/commit.c:1675 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1664 +#: builtin/commit.c:1677 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1737 +#: builtin/commit.c:1753 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1744 +#: builtin/commit.c:1760 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1765 +#: builtin/commit.c:1781 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1772 +#: builtin/commit.c:1788 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1777 +#: builtin/commit.c:1793 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1804 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "Avbryter på grund av tom incheckningsmeddelandekropp.\n" -#: builtin/commit.c:1824 +#: builtin/commit.c:1840 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -14283,7 +14551,7 @@ msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "" "\"credential-cache--daemon\" ej tillgänglig; stöd för unix-uttag saknas" -#: builtin/credential-cache.c:154 +#: builtin/credential-cache.c:180 msgid "credential-cache unavailable; no unix socket support" msgstr "\"credential-cache\" ej tillgänglig; stöd för unix-uttag saknas" @@ -14425,7 +14693,7 @@ msgstr "överväg endast taggar som motsvarar <mönster>" msgid "do not consider tags matching <pattern>" msgstr "överväg inte taggar som motsvarar <mönster>" -#: builtin/describe.c:570 builtin/name-rev.c:535 +#: builtin/describe.c:570 builtin/name-rev.c:544 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" @@ -14441,25 +14709,14 @@ msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")" msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")" -#: builtin/describe.c:593 -msgid "--long is incompatible with --abbrev=0" -msgstr "--long är inkompatibel med --abbrev=0" - #: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "Inga namn hittades, kan inte beskriva något." -#: builtin/describe.c:673 -msgid "--dirty is incompatible with commit-ishes" -msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden" - -#: builtin/describe.c:675 -msgid "--broken is incompatible with commit-ishes" -msgstr "--broken är inkompatibelt med \"commit-ish\"-värden" - -#: builtin/diff-tree.c:155 -msgid "--stdin and --merge-base are mutually exclusive" -msgstr "--stdin och --merge-base är ömsesidigt uteslutande" +#: builtin/describe.c:673 builtin/describe.c:675 +#, c-format +msgid "option '%s' and commit-ishes cannot be used together" +msgstr "flaggorna \"%s\" och incheckning-igter kan inte användas samtidigt" #: builtin/diff-tree.c:157 msgid "--merge-base only works with two commits" @@ -14480,26 +14737,26 @@ msgstr "ogiltig flagga: %s" msgid "%s...%s: no merge base" msgstr "%s...%s: ingen sammanslagningsbas" -#: builtin/diff.c:486 +#: builtin/diff.c:491 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:532 builtin/grep.c:684 +#: builtin/diff.c:537 builtin/grep.c:698 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:543 +#: builtin/diff.c:548 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:548 +#: builtin/diff.c:553 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." -#: builtin/diff.c:582 +#: builtin/diff.c:587 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s: flera sammanslagningsbaser, använder %s" @@ -14509,113 +14766,105 @@ msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" "git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]" -#: builtin/difftool.c:261 -#, c-format -msgid "failed: %d" -msgstr "misslyckades: %d" - -#: builtin/difftool.c:303 +#: builtin/difftool.c:287 #, c-format msgid "could not read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/difftool.c:305 +#: builtin/difftool.c:289 #, c-format msgid "could not read symlink file %s" msgstr "kunde inte läsa symbolisk länk-fil %s" -#: builtin/difftool.c:313 +#: builtin/difftool.c:297 #, c-format msgid "could not read object %s for symlink %s" msgstr "kunde inte läsa objektet %s för symboliska länken %s" -#: builtin/difftool.c:413 +#: builtin/difftool.c:421 msgid "" -"combined diff formats('-c' and '--cc') are not supported in\n" -"directory diff mode('-d' and '--dir-diff')." +"combined diff formats ('-c' and '--cc') are not supported in\n" +"directory diff mode ('-d' and '--dir-diff')." msgstr "" "kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n" "katalogdiffläge (\"-d\" och \"--dir-diff\")." -#: builtin/difftool.c:637 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "bägge filerna ändrade: \"%s\" och \"%s\"." -#: builtin/difftool.c:639 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "filen i arbetskatalogen lämnades kvar." -#: builtin/difftool.c:650 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "temporära filer finns i \"%s\"." -#: builtin/difftool.c:651 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "du kanske vill städa eller rädda dem." -#: builtin/difftool.c:700 +#: builtin/difftool.c:645 +#, c-format +msgid "failed: %d" +msgstr "misslyckades: %d" + +#: builtin/difftool.c:690 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "använd \"diff.guitool\" istället för \"diff.tool\"" -#: builtin/difftool.c:702 +#: builtin/difftool.c:692 msgid "perform a full-directory diff" msgstr "utför diff för hela katalogen" -#: builtin/difftool.c:704 +#: builtin/difftool.c:694 msgid "do not prompt before launching a diff tool" msgstr "fråga inte vid start av diff-verktyg" -#: builtin/difftool.c:709 +#: builtin/difftool.c:699 msgid "use symlinks in dir-diff mode" msgstr "använd symboliska länkar i katalogdiffläge" -#: builtin/difftool.c:710 +#: builtin/difftool.c:700 msgid "tool" msgstr "verktyg" -#: builtin/difftool.c:711 +#: builtin/difftool.c:701 msgid "use the specified diff tool" msgstr "använd angivet diff-verktyg" -#: builtin/difftool.c:713 +#: builtin/difftool.c:703 msgid "print a list of diff tools that may be used with `--tool`" msgstr "visa en lista över diff-verktyg som kan användas med \"--tool\"" -#: builtin/difftool.c:716 +#: builtin/difftool.c:706 msgid "" -"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " +"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit " "code" msgstr "" -"låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde " +"låt \"git-difftool\" avsluta när ett anropat diff-verktyg ger returvärde " "skilt från noll" -#: builtin/difftool.c:719 +#: builtin/difftool.c:709 msgid "specify a custom command for viewing diffs" msgstr "ange eget kommando för att visa diffar" -#: builtin/difftool.c:720 +#: builtin/difftool.c:710 msgid "passed to `diff`" msgstr "sändes till \"diff\"" -#: builtin/difftool.c:735 +#: builtin/difftool.c:726 msgid "difftool requires worktree or --no-index" msgstr "difftool kräver en arbetskatalog eller --no-index" -#: builtin/difftool.c:742 -msgid "--dir-diff is incompatible with --no-index" -msgstr "--dir-diff är inkompatibelt med --no-index" - -#: builtin/difftool.c:745 -msgid "--gui, --tool and --extcmd are mutually exclusive" -msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande" - -#: builtin/difftool.c:753 +#: builtin/difftool.c:744 msgid "no <tool> given for --tool=<tool>" msgstr "inget <verktyg> angavs för --tool=<verktyg>" -#: builtin/difftool.c:760 +#: builtin/difftool.c:751 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "inget <kommando> angavs för --extcmd=<kommando>" @@ -14623,7 +14872,7 @@ msgstr "inget <kommando> angavs för --extcmd=<kommando>" msgid "git env--helper --type=[bool|ulong] <options> <env-var>" msgstr "git env--helper --type=[bool|ulong] <flaggor> <miljövariabel>" -#: builtin/env--helper.c:42 builtin/hash-object.c:98 +#: builtin/env--helper.c:42 builtin/hash-object.c:96 msgid "type" msgstr "typ" @@ -14655,123 +14904,115 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-flaggor]" -#: builtin/fast-export.c:868 +#: builtin/fast-export.c:843 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." -#: builtin/fast-export.c:1177 +#: builtin/fast-export.c:1152 msgid "--anonymize-map token cannot be empty" msgstr "symbolen för --anonymize-map kan inte vara tom" -#: builtin/fast-export.c:1197 +#: builtin/fast-export.c:1171 msgid "show progress after <n> objects" msgstr "visa förlopp efter <n> objekt" -#: builtin/fast-export.c:1199 +#: builtin/fast-export.c:1173 msgid "select handling of signed tags" msgstr "välj hantering av signerade taggar" -#: builtin/fast-export.c:1202 +#: builtin/fast-export.c:1176 msgid "select handling of tags that tag filtered objects" msgstr "välj hantering av taggar som har taggfiltrerade objekt" -#: builtin/fast-export.c:1205 +#: builtin/fast-export.c:1179 msgid "select handling of commit messages in an alternate encoding" msgstr "välj hantering av incheckningsmeddelanden i alternativ teckenkodning" -#: builtin/fast-export.c:1208 +#: builtin/fast-export.c:1182 msgid "dump marks to this file" msgstr "dumpa märken till filen" -#: builtin/fast-export.c:1210 +#: builtin/fast-export.c:1184 msgid "import marks from this file" msgstr "importera märken från filen" -#: builtin/fast-export.c:1214 +#: builtin/fast-export.c:1188 msgid "import marks from this file if it exists" msgstr "importera märken från filen, om den finns" -#: builtin/fast-export.c:1216 +#: builtin/fast-export.c:1190 msgid "fake a tagger when tags lack one" msgstr "fejka taggare när taggen saknar en" -#: builtin/fast-export.c:1218 +#: builtin/fast-export.c:1192 msgid "output full tree for each commit" msgstr "skriv ut hela trädet för varje incheckning" -#: builtin/fast-export.c:1220 +#: builtin/fast-export.c:1194 msgid "use the done feature to terminate the stream" msgstr "använd done-funktionen för att avsluta strömmen" -#: builtin/fast-export.c:1221 +#: builtin/fast-export.c:1195 msgid "skip output of blob data" msgstr "hoppa över skrivning av blob-data" -#: builtin/fast-export.c:1222 builtin/log.c:1823 +#: builtin/fast-export.c:1196 builtin/log.c:1841 msgid "refspec" msgstr "referensspecifikation" -#: builtin/fast-export.c:1223 +#: builtin/fast-export.c:1197 msgid "apply refspec to exported refs" msgstr "applicera referensspecifikation på exporterade referenser" -#: builtin/fast-export.c:1224 +#: builtin/fast-export.c:1198 msgid "anonymize output" msgstr "anonymisera utdata" -#: builtin/fast-export.c:1225 +#: builtin/fast-export.c:1199 msgid "from:to" msgstr "från:till" -#: builtin/fast-export.c:1226 +#: builtin/fast-export.c:1200 msgid "convert <from> to <to> in anonymized output" msgstr "konvertera <från> till <till> i anonymiserad utdata" -#: builtin/fast-export.c:1229 +#: builtin/fast-export.c:1203 msgid "reference parents which are not in fast-export stream by object id" msgstr "referera föräldrar som inte finns i fast-export-ström med objekt-id" -#: builtin/fast-export.c:1231 +#: builtin/fast-export.c:1205 msgid "show original object ids of blobs/commits" msgstr "visa ursprungliga objekt-id för blobbar/incheckningar" -#: builtin/fast-export.c:1233 +#: builtin/fast-export.c:1207 msgid "label tags with mark ids" msgstr "märk taggar med märke-id" -#: builtin/fast-export.c:1256 -msgid "--anonymize-map without --anonymize does not make sense" -msgstr "--anonymize-map utan --anonymize ger ingen mening" - -#: builtin/fast-export.c:1271 -msgid "Cannot pass both --import-marks and --import-marks-if-exists" -msgstr "Kan inte ange både --import-marks och --import-marks-if-exists" - -#: builtin/fast-import.c:3088 +#: builtin/fast-import.c:3090 #, c-format msgid "Missing from marks for submodule '%s'" msgstr "Saknar från-märken för undermodulen \"%s\"" -#: builtin/fast-import.c:3090 +#: builtin/fast-import.c:3092 #, c-format msgid "Missing to marks for submodule '%s'" msgstr "Saknar till-märken för undermodulen \"%s\"" -#: builtin/fast-import.c:3225 +#: builtin/fast-import.c:3227 #, c-format msgid "Expected 'mark' command, got %s" msgstr "Förväntade \"mark\"-kommando, fick %s" -#: builtin/fast-import.c:3230 +#: builtin/fast-import.c:3232 #, c-format msgid "Expected 'to' command, got %s" msgstr "Förväntade \"to\"-kommando, fick %s" -#: builtin/fast-import.c:3322 +#: builtin/fast-import.c:3324 msgid "Expected format name:filename for submodule rewrite option" msgstr "Förvändae formatet namn:filnamn för undermodul-omskrivningsflaggan" -#: builtin/fast-import.c:3377 +#: builtin/fast-import.c:3379 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "funktionen \"%s\" förbjuden i indata utan --allow-unsafe-features" @@ -14781,119 +15022,119 @@ msgstr "funktionen \"%s\" förbjuden i indata utan --allow-unsafe-features" msgid "Lockfile created but not reported: %s" msgstr "Låsfil skapad men inte rapporterad: %s" -#: builtin/fetch.c:35 +#: builtin/fetch.c:36 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/fetch.c:36 +#: builtin/fetch.c:37 msgid "git fetch [<options>] <group>" msgstr "git fetch [<flaggor>] <grupp>" -#: builtin/fetch.c:37 +#: builtin/fetch.c:38 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" -#: builtin/fetch.c:38 +#: builtin/fetch.c:39 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:122 +#: builtin/fetch.c:123 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel kan inte vara negativt" -#: builtin/fetch.c:145 builtin/pull.c:185 +#: builtin/fetch.c:146 builtin/pull.c:189 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:147 builtin/pull.c:245 +#: builtin/fetch.c:148 builtin/pull.c:249 msgid "set upstream for git pull/fetch" msgstr "ställ in uppström för git pull/fetch" -#: builtin/fetch.c:149 builtin/pull.c:188 +#: builtin/fetch.c:150 builtin/pull.c:192 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över" -#: builtin/fetch.c:151 +#: builtin/fetch.c:152 msgid "use atomic transaction to update references" msgstr "använd atomiska transaktioner för att uppdatera referenser" -#: builtin/fetch.c:153 builtin/pull.c:191 +#: builtin/fetch.c:154 builtin/pull.c:195 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:154 +#: builtin/fetch.c:155 msgid "force overwrite of local reference" msgstr "tvinga överskrivning av lokal referens" -#: builtin/fetch.c:156 +#: builtin/fetch.c:157 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:158 builtin/pull.c:195 +#: builtin/fetch.c:159 builtin/pull.c:199 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:160 +#: builtin/fetch.c:161 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:162 +#: builtin/fetch.c:163 msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:164 +#: builtin/fetch.c:165 msgid "modify the refspec to place all refs within refs/prefetch/" msgstr "" "modifiera referensspecifikationen så att alla referenser hamnar i refs/" "prefetch/" -#: builtin/fetch.c:166 builtin/pull.c:198 +#: builtin/fetch.c:167 builtin/pull.c:202 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:168 +#: builtin/fetch.c:169 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:169 builtin/fetch.c:194 builtin/pull.c:122 +#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:170 +#: builtin/fetch.c:171 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:175 +#: builtin/fetch.c:176 msgid "write fetched references to the FETCH_HEAD file" msgstr "skriv hämtade referenser till FETCH_HEAD-filen" -#: builtin/fetch.c:176 builtin/pull.c:206 +#: builtin/fetch.c:177 builtin/pull.c:210 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:178 +#: builtin/fetch.c:179 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209 -#: builtin/pull.c:218 +#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213 +#: builtin/pull.c:222 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:183 builtin/pull.c:212 +#: builtin/fetch.c:184 builtin/pull.c:216 msgid "deepen history of shallow repository based on time" msgstr "fördjupa historik för grund klon baserad på tid" -#: builtin/fetch.c:189 builtin/pull.c:221 +#: builtin/fetch.c:190 builtin/pull.c:225 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:192 +#: builtin/fetch.c:193 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:195 +#: builtin/fetch.c:196 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -14901,141 +15142,145 @@ msgstr "" "standard för rekursiv hämtning av undermoduler (lägre prioritet än " "konfigurationsfiler)" -#: builtin/fetch.c:199 builtin/pull.c:224 +#: builtin/fetch.c:200 builtin/pull.c:228 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:200 builtin/pull.c:226 +#: builtin/fetch.c:201 builtin/pull.c:230 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:201 builtin/pull.c:227 +#: builtin/fetch.c:202 builtin/pull.c:231 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:208 builtin/pull.c:240 +#: builtin/fetch.c:209 builtin/pull.c:244 msgid "report that we have only objects reachable from this object" msgstr "rapportera att vi bara har objekt nåbara från detta objektet" -#: builtin/fetch.c:210 +#: builtin/fetch.c:211 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "hämta inte paketfil; skriv istället förfäder till förhandlingstips" -#: builtin/fetch.c:213 builtin/fetch.c:215 +#: builtin/fetch.c:214 builtin/fetch.c:216 msgid "run 'maintenance --auto' after fetching" msgstr "kör \"maintenance --auto\" efter hämtning" -#: builtin/fetch.c:217 builtin/pull.c:243 +#: builtin/fetch.c:218 builtin/pull.c:247 msgid "check for forced-updates on all updated branches" msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar" -#: builtin/fetch.c:219 +#: builtin/fetch.c:220 msgid "write the commit-graph after fetching" msgstr "skriv incheckingsgrafen efter hämtning" -#: builtin/fetch.c:221 +#: builtin/fetch.c:222 msgid "accept refspecs from stdin" msgstr "ta emot referenser från standard in" -#: builtin/fetch.c:586 -msgid "Couldn't find remote ref HEAD" -msgstr "Kunde inte hitta fjärr-referensen HEAD" +#: builtin/fetch.c:592 +msgid "couldn't find remote ref HEAD" +msgstr "kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:757 +#: builtin/fetch.c:766 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s" -#: builtin/fetch.c:856 +#: builtin/fetch.c:867 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:860 +#: builtin/fetch.c:871 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961 +#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:874 +#: builtin/fetch.c:885 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:884 +#: builtin/fetch.c:886 +msgid "checked out in another worktree" +msgstr "utcheckat i en annan arbetskatalog" + +#: builtin/fetch.c:896 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944 -#: builtin/fetch.c:956 +#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956 +#: builtin/fetch.c:968 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:889 +#: builtin/fetch.c:901 msgid "would clobber existing tag" msgstr "skulle skriva över befintlig tagg" -#: builtin/fetch.c:911 +#: builtin/fetch.c:923 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:914 +#: builtin/fetch.c:926 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:917 +#: builtin/fetch.c:929 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:956 +#: builtin/fetch.c:968 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:961 +#: builtin/fetch.c:973 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:1065 +#: builtin/fetch.c:1076 msgid "" -"Fetch normally indicates which branches had a forced update,\n" -"but that check has been disabled. To re-enable, use '--show-forced-updates'\n" -"flag or run 'git config fetch.showForcedUpdates true'." +"fetch normally indicates which branches had a forced update,\n" +"but that check has been disabled; to re-enable, use '--show-forced-updates'\n" +"flag or run 'git config fetch.showForcedUpdates true'" msgstr "" -"Fetch visar normalt vilka grenar som tvångsuppdaterats, men testet har " +"fetch visar normalt vilka grenar som tvångsuppdaterats, men testet har " "slagits\n" -"av. För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n" -"\"git config fetch.showForcedUpdates true\"." +"av; för att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n" +"\"git config fetch.showForcedUpdates true\"" -#: builtin/fetch.c:1069 +#: builtin/fetch.c:1080 #, c-format msgid "" -"It took %.2f seconds to check forced updates. You can use\n" +"it took %.2f seconds to check forced updates; you can use\n" "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " "false'\n" -" to avoid this check.\n" +"to avoid this check\n" msgstr "" -"Det tog %.2f sekunder att se efter tvångsuppdateringar. Du kan använda\n" +"det tog %.2f sekunder att se efter tvångsuppdateringar; Du kan använda\n" "\"--no-show-forced-updates\" eller köra \"git config fetch." "showForcedUpdates\n" -"false\" för att undvika testet.\n" +"false\" för att undvika testet\n" -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1112 #, 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:1129 +#: builtin/fetch.c:1141 #, c-format -msgid "reject %s because shallow roots are not allowed to be updated" -msgstr "avvisa %s då grunda rötter inte kan uppdateras" +msgid "rejected %s because shallow roots are not allowed to be updated" +msgstr "avvisade %s då grunda rötter inte tillåts uppdateras" -#: builtin/fetch.c:1206 builtin/fetch.c:1357 +#: builtin/fetch.c:1231 builtin/fetch.c:1379 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:1228 +#: builtin/fetch.c:1252 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -15044,132 +15289,142 @@ 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:1327 +#: builtin/fetch.c:1349 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:1328 +#: builtin/fetch.c:1350 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:1360 +#: builtin/fetch.c:1382 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:1361 builtin/remote.c:1118 +#: builtin/fetch.c:1383 builtin/remote.c:1128 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:1384 +#: builtin/fetch.c:1405 #, 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" +msgid "refusing to fetch into branch '%s' checked out at '%s'" +msgstr "vägrar hämta till grenen \"%s\" som är utcheckad på \"%s\"" -#: builtin/fetch.c:1403 +#: builtin/fetch.c:1425 #, 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" +msgid "option \"%s\" value \"%s\" is not valid for %s" +msgstr "flaggan \"%s\" med värdet \"%s\" är inte giltigt för %s" -#: builtin/fetch.c:1406 +#: builtin/fetch.c:1428 #, c-format -msgid "Option \"%s\" is ignored for %s\n" -msgstr "Flaggan \"%s\" ignoreras för %s\n" +msgid "option \"%s\" is ignored for %s\n" +msgstr "flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1618 +#: builtin/fetch.c:1455 +#, c-format +msgid "the object %s does not exist" +msgstr "objektet %s finns inte" + +#: builtin/fetch.c:1643 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream" -#: builtin/fetch.c:1633 +#: builtin/fetch.c:1655 +#, c-format +msgid "" +"could not set upstream of HEAD to '%s' from '%s' when it does not point to " +"any branch." +msgstr "" +"kunde inte sätta uppström för HEAD till \"%s\" från \"%s\" när det inte " +"pekar mot någon gren." + +#: builtin/fetch.c:1668 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:1635 +#: builtin/fetch.c:1670 msgid "not setting upstream for a remote tag" msgstr "ställer inte in uppström för en fjärrtag" -#: builtin/fetch.c:1637 +#: builtin/fetch.c:1672 msgid "unknown branch type" msgstr "okänd grentyp" -#: builtin/fetch.c:1639 +#: builtin/fetch.c:1674 msgid "" -"no source branch found.\n" -"you need to specify exactly one branch with the --set-upstream option." +"no source branch found;\n" +"you need to specify exactly one branch with the --set-upstream option" msgstr "" -"hittade ingen källgren.\n" -"du måste ange exakt en gren med flaggan --set-upstream." +"hittade ingen källgren;\n" +"du måste ange exakt en gren med flaggan --set-upstream" -#: builtin/fetch.c:1768 builtin/fetch.c:1831 +#: builtin/fetch.c:1804 builtin/fetch.c:1867 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101 +#: builtin/fetch.c:1814 builtin/fetch.c:1869 #, c-format -msgid "Could not fetch %s" -msgstr "Kunde inte hämta %s" +msgid "could not fetch %s" +msgstr "kunde inte hämta %s" -#: builtin/fetch.c:1790 +#: builtin/fetch.c:1826 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "kunde inte hämta \"%s\" (felkod: %d)\n" -#: builtin/fetch.c:1894 +#: builtin/fetch.c:1930 msgid "" -"No remote repository specified. Please, specify either a URL or a\n" -"remote name from which new revisions should be fetched." +"no remote repository specified; please specify either a URL or a\n" +"remote name from which new revisions should be fetched" msgstr "" -"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" -"fjärrarkiv som nya incheckningar ska hämtas från." +"inget fjärrarkiv angavs; ange antingen en URL eller namnet på ett\n" +"fjärrarkiv som nya incheckningar ska hämtas från" -#: builtin/fetch.c:1930 -msgid "You need to specify a tag name." -msgstr "Du måste ange namnet på en tagg." - -#: builtin/fetch.c:1995 -msgid "Negative depth in --deepen is not supported" -msgstr "Negativa djup stöds inte i --deepen" +#: builtin/fetch.c:1966 +msgid "you need to specify a tag name" +msgstr "du måste ange namnet på en tagg" -#: builtin/fetch.c:1997 -msgid "--deepen and --depth are mutually exclusive" -msgstr "--deepen och --depth är ömsesidigt uteslutande" +#: builtin/fetch.c:2032 +msgid "--negotiate-only needs one or more --negotiate-tip=*" +msgstr "--negotiate-only behöver en eller flera --negotiate-tip=*" -#: builtin/fetch.c:2002 -msgid "--depth and --unshallow cannot be used together" -msgstr "--depth och --unshallow kan inte användas samtidigt" +#: builtin/fetch.c:2036 +msgid "negative depth in --deepen is not supported" +msgstr "negativa djup stöds inte i --deepen" -#: builtin/fetch.c:2004 +#: builtin/fetch.c:2045 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:2021 +#: builtin/fetch.c:2062 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:2023 +#: builtin/fetch.c:2064 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:2032 +#: builtin/fetch.c:2073 #, c-format -msgid "No such remote or remote group: %s" -msgstr "Fjärren eller fjärrgruppen finns inte: %s" +msgid "no such remote or remote group: %s" +msgstr "fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:2039 -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:2081 +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:2055 +#: builtin/fetch.c:2097 msgid "must supply remote when using --negotiate-only" msgstr "måste ange fjärr när --negotiate-only anges" -#: builtin/fetch.c:2060 -msgid "Protocol does not support --negotiate-only, exiting." -msgstr "Protokollet stöder inte --negotiate-only, avslutar." +#: builtin/fetch.c:2102 +msgid "protocol does not support --negotiate-only, exiting" +msgstr "protokollet stöder inte --negotiate-only, avslutar" -#: builtin/fetch.c:2079 +#: builtin/fetch.c:2121 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -15177,11 +15432,11 @@ msgstr "" "--filter kan endast användas med fjärren konfigurerad i extensions." "partialclone" -#: builtin/fetch.c:2083 +#: builtin/fetch.c:2125 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic kan bara användas vid hämtning från en fjärr" -#: builtin/fetch.c:2087 +#: builtin/fetch.c:2129 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin kan bara användas vid hämtning fårn en fjärr" @@ -15191,23 +15446,27 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fmt-merge-msg.c:19 msgid "populate log with at most <n> entries from shortlog" msgstr "fyll i loggen med som mest <n> poster från shortlog" -#: builtin/fmt-merge-msg.c:21 +#: builtin/fmt-merge-msg.c:22 msgid "alias for --log (deprecated)" msgstr "alias för --log (avråds)" -#: builtin/fmt-merge-msg.c:24 +#: builtin/fmt-merge-msg.c:25 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:25 +#: builtin/fmt-merge-msg.c:26 msgid "use <text> as start of message" msgstr "inled meddelande med <text>" -#: builtin/fmt-merge-msg.c:26 +#: builtin/fmt-merge-msg.c:28 +msgid "use <name> instead of the real target branch" +msgstr "använd <namn> istället för den verkliga målgrenen" + +#: builtin/fmt-merge-msg.c:29 msgid "file to read from" msgstr "fil att läsa från" @@ -15229,47 +15488,47 @@ msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "" "git for-each-ref [--contains [<incheckning>]] [--no-contains [<incheckning>]]" -#: builtin/for-each-ref.c:30 +#: builtin/for-each-ref.c:31 msgid "quote placeholders suitably for shells" msgstr "citera platshållare passande för skal" -#: builtin/for-each-ref.c:32 +#: builtin/for-each-ref.c:33 msgid "quote placeholders suitably for perl" msgstr "citera platshållare passande för perl" -#: builtin/for-each-ref.c:34 +#: builtin/for-each-ref.c:35 msgid "quote placeholders suitably for python" msgstr "citera platshållare passande för python" -#: builtin/for-each-ref.c:36 +#: builtin/for-each-ref.c:37 msgid "quote placeholders suitably for Tcl" msgstr "citera platshållare passande för Tcl" -#: builtin/for-each-ref.c:39 +#: builtin/for-each-ref.c:40 msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:41 builtin/tag.c:483 +#: builtin/for-each-ref.c:42 builtin/tag.c:481 msgid "respect format colors" msgstr "använd formatfärger" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:45 msgid "print only refs which points at the given object" msgstr "visa endast referenser som pekar på objektet" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:47 msgid "print only refs that are merged" msgstr "visa endast referenser som slagits samman" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:48 msgid "print only refs that are not merged" msgstr "visa endast referenser som ej slagits samman" -#: builtin/for-each-ref.c:48 +#: builtin/for-each-ref.c:49 msgid "print only refs which contain the commit" msgstr "visa endast referenser som innehåller incheckningen" -#: builtin/for-each-ref.c:49 +#: builtin/for-each-ref.c:50 msgid "print only refs which don't contain the commit" msgstr "visa endast referenser som inte innehåller incheckningen" @@ -15277,19 +15536,19 @@ msgstr "visa endast referenser som inte innehåller incheckningen" msgid "git for-each-repo --config=<config> <command-args>" msgstr "git for-each-repo --config=<konfig> <kommandoargument>" -#: builtin/for-each-repo.c:37 +#: builtin/for-each-repo.c:34 msgid "config" msgstr "konfig" -#: builtin/for-each-repo.c:38 +#: builtin/for-each-repo.c:35 msgid "config key storing a list of repository paths" msgstr "konfigurationsnyckel som innehåller en lista över arkivsökvägar" -#: builtin/for-each-repo.c:46 +#: builtin/for-each-repo.c:43 msgid "missing --config=<config>" msgstr "saknar --config=<konfig>" -#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128 +#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129 msgid "unknown" msgstr "okänd" @@ -15305,16 +15564,16 @@ msgstr "fel i %s %s: %s" msgid "warning in %s %s: %s" msgstr "varning i %s %s: %s" -#: builtin/fsck.c:123 builtin/fsck.c:126 +#: builtin/fsck.c:124 builtin/fsck.c:127 #, c-format msgid "broken link from %7s %s" msgstr "trasig länk från %7s %s" -#: builtin/fsck.c:135 +#: builtin/fsck.c:136 msgid "wrong object type in link" msgstr "fel objekttyp i länk" -#: builtin/fsck.c:151 +#: builtin/fsck.c:152 #, c-format msgid "" "broken link from %7s %s\n" @@ -15323,215 +15582,225 @@ msgstr "" "trasig länk från %7s %s\n" " till %7s %s" -#: builtin/fsck.c:263 +#: builtin/fsck.c:264 #, c-format msgid "missing %s %s" msgstr "saknat %s %s" -#: builtin/fsck.c:290 +#: builtin/fsck.c:291 #, c-format msgid "unreachable %s %s" msgstr "onåbart %s %s" -#: builtin/fsck.c:310 +#: builtin/fsck.c:311 #, c-format msgid "dangling %s %s" msgstr "hängande %s %s" -#: builtin/fsck.c:320 +#: builtin/fsck.c:321 msgid "could not create lost-found" msgstr "kunde inte skapa lost-found" -#: builtin/fsck.c:331 +#: builtin/fsck.c:332 #, c-format msgid "could not finish '%s'" msgstr "kunde inte avsluta \"%s\"" -#: builtin/fsck.c:348 +#: builtin/fsck.c:349 #, c-format msgid "Checking %s" msgstr "Kontrollerar %s" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:386 +#: builtin/fsck.c:387 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Kontrollerar konnektivitet (%d objekt)" -#: builtin/fsck.c:405 +#: builtin/fsck.c:406 #, c-format msgid "Checking %s %s" msgstr "Kontrollerar %s %s" -#: builtin/fsck.c:410 +#: builtin/fsck.c:411 msgid "broken links" msgstr "trasiga länkar" -#: builtin/fsck.c:419 +#: builtin/fsck.c:420 #, c-format msgid "root %s" msgstr "roten %s" -#: builtin/fsck.c:427 +#: builtin/fsck.c:428 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "taggad %s %s (%s) i %s" -#: builtin/fsck.c:456 +#: builtin/fsck.c:457 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: objekt trasigt eller saknas" -#: builtin/fsck.c:481 +#: builtin/fsck.c:482 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: ogiltig reflog-post %s" -#: builtin/fsck.c:495 +#: builtin/fsck.c:496 #, c-format msgid "Checking reflog %s->%s" msgstr "Kontrollerar reflog %s->%s" -#: builtin/fsck.c:529 +#: builtin/fsck.c:530 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: ogiltig sha1-pekare %s" -#: builtin/fsck.c:536 +#: builtin/fsck.c:537 #, c-format msgid "%s: not a commit" msgstr "%s: inte en incheckning!" -#: builtin/fsck.c:590 +#: builtin/fsck.c:591 msgid "notice: No default references" msgstr "obs: Inga förvalda referenser" -#: builtin/fsck.c:605 +#: builtin/fsck.c:621 +#, c-format +msgid "%s: hash-path mismatch, found at: %s" +msgstr "%s: hashsökväg stämmer inte överens, hittad vid: %s" + +#: builtin/fsck.c:624 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: objektet trasigt eller saknas: %s" -#: builtin/fsck.c:618 +#: builtin/fsck.c:628 +#, c-format +msgid "%s: object is of unknown type '%s': %s" +msgstr "%s: objektet har okänd typ \"%s\": %s" + +#: builtin/fsck.c:645 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: objektet kunde inte tolkas: %s" -#: builtin/fsck.c:638 +#: builtin/fsck.c:665 #, c-format msgid "bad sha1 file: %s" msgstr "ogiltig sha1-fil: %s" -#: builtin/fsck.c:653 +#: builtin/fsck.c:686 msgid "Checking object directory" msgstr "Kontrollerar objektkatalog" -#: builtin/fsck.c:656 +#: builtin/fsck.c:689 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:671 +#: builtin/fsck.c:705 #, c-format msgid "Checking %s link" msgstr "Kontrollerar %s-länk" -#: builtin/fsck.c:676 builtin/index-pack.c:866 +#: builtin/fsck.c:710 builtin/index-pack.c:859 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/fsck.c:683 +#: builtin/fsck.c:717 #, c-format msgid "%s points to something strange (%s)" msgstr "%s pekar på något konstigt (%s)" -#: builtin/fsck.c:689 +#: builtin/fsck.c:723 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: frånkopplat HEAD pekar på ingenting" -#: builtin/fsck.c:693 +#: builtin/fsck.c:727 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "obs: %s pekar på en ofödd gren (%s)" -#: builtin/fsck.c:705 +#: builtin/fsck.c:739 msgid "Checking cache tree" msgstr "Kontrollerar cacheträd" -#: builtin/fsck.c:710 +#: builtin/fsck.c:744 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: ogiltig sha1-pekare i cacheträd" -#: builtin/fsck.c:719 +#: builtin/fsck.c:753 msgid "non-tree in cache-tree" msgstr "icke-träd i cacheträd" -#: builtin/fsck.c:750 +#: builtin/fsck.c:784 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:756 +#: builtin/fsck.c:790 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:757 +#: builtin/fsck.c:791 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:758 +#: builtin/fsck.c:792 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:759 +#: builtin/fsck.c:793 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:760 +#: builtin/fsck.c:794 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:761 +#: builtin/fsck.c:795 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:762 +#: builtin/fsck.c:796 msgid "also consider packs and alternate objects" msgstr "ta även hänsyn till paket och supplerande objekt" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:763 +#: builtin/fsck.c:797 msgid "check only connectivity" msgstr "kontrollera endast konnektivitet" -#: builtin/fsck.c:764 builtin/mktag.c:75 +#: builtin/fsck.c:798 builtin/mktag.c:76 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:766 +#: builtin/fsck.c:800 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:767 builtin/prune.c:134 +#: builtin/fsck.c:801 builtin/prune.c:146 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:768 +#: builtin/fsck.c:802 msgid "show verbose names for reachable objects" msgstr "visa ordrika namn för nåbara objekt" -#: builtin/fsck.c:827 builtin/index-pack.c:262 +#: builtin/fsck.c:862 builtin/index-pack.c:261 msgid "Checking objects" msgstr "Kontrollerar objekt" -#: builtin/fsck.c:855 +#: builtin/fsck.c:890 #, c-format msgid "%s: object missing" msgstr "%s: objekt saknas" -#: builtin/fsck.c:866 +#: builtin/fsck.c:901 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "ogiltig parameter: förväntade sha1, fick \"%s\"" @@ -15550,77 +15819,72 @@ msgstr "Misslyckades ta status (fstat) på %s: %s" msgid "failed to parse '%s' value '%s'" msgstr "misslyckades tolka \"%s\" värde \"%s\"" -#: builtin/gc.c:487 builtin/init-db.c:57 +#: builtin/gc.c:488 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573 -#, c-format -msgid "cannot read '%s'" -msgstr "kunde inte läsa \"%s\"" - -#: builtin/gc.c:503 +#: builtin/gc.c:504 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" -"and remove %s.\n" +"and remove %s\n" "Automatic cleanup will not be performed until the file is removed.\n" "\n" "%s" msgstr "" "Senaste körningen av git gc rapporterade följande. Fixa grundproblemet\n" -"och ta bort %s.\n" +"och ta bort %s\n" "Automatisk städning kommer inte utföras förrän filen tas bort.\n" "\n" "%s" -#: builtin/gc.c:551 +#: builtin/gc.c:552 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:553 +#: builtin/gc.c:554 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:554 +#: builtin/gc.c:555 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:557 +#: builtin/gc.c:558 msgid "force running gc even if there may be another gc running" msgstr "tvinga gc-körning även om en annan gc kanske körs" -#: builtin/gc.c:560 +#: builtin/gc.c:561 msgid "repack all other packs except the largest pack" msgstr "packa om alla paket förutom det största paketet" -#: builtin/gc.c:576 +#: builtin/gc.c:577 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "kunde inte tolka värdet %s för gc.logexpiry" -#: builtin/gc.c:587 +#: builtin/gc.c:588 #, c-format msgid "failed to parse prune expiry value %s" msgstr "kunde inte tolka värdet %s för prune expiry" -#: builtin/gc.c:607 +#: builtin/gc.c:608 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n" -#: builtin/gc.c:609 +#: builtin/gc.c:610 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:610 +#: builtin/gc.c:611 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Se \"git help gc\" för manuell hushållning.\n" -#: builtin/gc.c:650 +#: builtin/gc.c:652 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -15628,33 +15892,33 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:705 +#: builtin/gc.c:707 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort " "dem." -#: builtin/gc.c:715 +#: builtin/gc.c:717 msgid "" "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" msgstr "" "git maintenance run [--auto] [--[no-]quiet] [--task=<uppgift>] [--schedule]" -#: builtin/gc.c:745 +#: builtin/gc.c:747 msgid "--no-schedule is not allowed" msgstr "--no-schedule tillåts inte" -#: builtin/gc.c:750 +#: builtin/gc.c:752 #, c-format msgid "unrecognized --schedule argument '%s'" msgstr "okänt argument för --schedule, %s" -#: builtin/gc.c:869 +#: builtin/gc.c:870 msgid "failed to write commit-graph" msgstr "kunde inte skriva incheckningsgraf" -#: builtin/gc.c:905 +#: builtin/gc.c:906 msgid "failed to prefetch remotes" msgstr "kunde inte förhämta fjärrar" @@ -15666,134 +15930,174 @@ msgstr "kunde inte starta \"git pack-objects\"-process" msgid "failed to finish 'git pack-objects' process" msgstr "kunde inte avsluta \"git pack-objects\"-process" -#: builtin/gc.c:1091 +#: builtin/gc.c:1090 msgid "failed to write multi-pack-index" msgstr "kunde inte skriva multi-pack-index" -#: builtin/gc.c:1109 +#: builtin/gc.c:1106 msgid "'git multi-pack-index expire' failed" msgstr "\"git multi-pack-index expire\" misslyckades" -#: builtin/gc.c:1170 +#: builtin/gc.c:1165 msgid "'git multi-pack-index repack' failed" msgstr "\"git multi-pack-index repack\" misslyckades" -#: builtin/gc.c:1179 +#: builtin/gc.c:1174 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "" "hoppar över \"incremental-repack\"-uppgift eftersom core.multiPackIndex är " "inaktiverat" -#: builtin/gc.c:1283 +#: builtin/gc.c:1278 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "låsfilen \"%s\" finns, hoppar över underhåll" -#: builtin/gc.c:1313 +#: builtin/gc.c:1308 #, c-format msgid "task '%s' failed" msgstr "uppgiften \"%s\" misslyckades" -#: builtin/gc.c:1395 +#: builtin/gc.c:1390 #, c-format msgid "'%s' is not a valid task" msgstr "\"%s\" är inte en giltig uppgift" -#: builtin/gc.c:1400 +#: builtin/gc.c:1395 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "uppgiften \"%s\" kan inte väljas flera gånger" -#: builtin/gc.c:1415 +#: builtin/gc.c:1410 msgid "run tasks based on the state of the repository" msgstr "kör uppgifter baserad på arkivets tillstånd" -#: builtin/gc.c:1416 +#: builtin/gc.c:1411 msgid "frequency" msgstr "frekvens" -#: builtin/gc.c:1417 +#: builtin/gc.c:1412 msgid "run tasks based on frequency" msgstr "kör uppgifter baserat på frekvens" -#: builtin/gc.c:1420 +#: builtin/gc.c:1415 msgid "do not report progress or other information over stderr" msgstr "rapportera inte framgång eller annan information över standard fel" -#: builtin/gc.c:1421 +#: builtin/gc.c:1416 msgid "task" msgstr "uppgift" -#: builtin/gc.c:1422 +#: builtin/gc.c:1417 msgid "run a specific task" msgstr "utför en specifik uppgift" -#: builtin/gc.c:1439 +#: builtin/gc.c:1434 msgid "use at most one of --auto and --schedule=<frequency>" msgstr "använd som mest en av --auto och --schedule=<frekvens>" -#: builtin/gc.c:1482 +#: builtin/gc.c:1477 msgid "failed to run 'git config'" msgstr "misslyckades köra \"git config\"" -#: builtin/gc.c:1547 +#: builtin/gc.c:1629 #, c-format msgid "failed to expand path '%s'" msgstr "misslyckades expandera sökvägen \"%s\"" -#: builtin/gc.c:1576 +#: builtin/gc.c:1656 builtin/gc.c:1694 msgid "failed to start launchctl" msgstr "misslyckades starta launchctl" -#: builtin/gc.c:1613 +#: builtin/gc.c:1769 builtin/gc.c:2237 #, c-format msgid "failed to create directories for '%s'" msgstr "misslyckades skapa kataloger för \"%s\"" -#: builtin/gc.c:1674 +#: builtin/gc.c:1796 #, c-format msgid "failed to bootstrap service %s" msgstr "misslyckades starta tjänsten %s" -#: builtin/gc.c:1745 +#: builtin/gc.c:1889 msgid "failed to create temp xml file" msgstr "misslyckades skapa temporär xml-fil" -#: builtin/gc.c:1835 +#: builtin/gc.c:1979 msgid "failed to start schtasks" msgstr "misslyckades starta schtasks" -#: builtin/gc.c:1879 +#: builtin/gc.c:2063 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" "kunde inte köra \"crontab -l\"; ditt system kanske inte stöder \"cron\"" -#: builtin/gc.c:1896 +#: builtin/gc.c:2080 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "kunde inte köra \"crontab\"; ditt system kanske inte stöder \"cron\"" -#: builtin/gc.c:1900 +#: builtin/gc.c:2084 msgid "failed to open stdin of 'crontab'" msgstr "misslyckades öppna standard in för \"crontab\"" -#: builtin/gc.c:1942 +#: builtin/gc.c:2126 msgid "'crontab' died" msgstr "\"crontab\" dog" -#: builtin/gc.c:1976 +#: builtin/gc.c:2191 +msgid "failed to start systemctl" +msgstr "misslyckades starta systemctl" + +#: builtin/gc.c:2201 +msgid "failed to run systemctl" +msgstr "misslyckades att köra systemctl" + +#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62 +#: builtin/worktree.c:944 +#, c-format +msgid "failed to delete '%s'" +msgstr "misslyckades ta bort \"%s\"" + +#: builtin/gc.c:2395 +#, c-format +msgid "unrecognized --scheduler argument '%s'" +msgstr "okänt argument för --scheduler, \"%s\"" + +#: builtin/gc.c:2420 +msgid "neither systemd timers nor crontab are available" +msgstr "varken systemd-timer eller crontab är tillgänglig" + +#: builtin/gc.c:2435 +#, c-format +msgid "%s scheduler is not available" +msgstr "%s-schemaläggare är inte tillgänglig" + +#: builtin/gc.c:2449 msgid "another process is scheduling background maintenance" msgstr "en annan process schemalägger bakgrundsunderhåll" -#: builtin/gc.c:2000 +#: builtin/gc.c:2471 +msgid "git maintenance start [--scheduler=<scheduler>]" +msgstr "git maintenance start [--scheduler=<schemaläggare>]" + +#: builtin/gc.c:2480 +msgid "scheduler" +msgstr "schemaläggare" + +#: builtin/gc.c:2481 +msgid "scheduler to trigger git maintenance run" +msgstr "schemaläggare som utlöser \"git maintenance\"-körning" + +#: builtin/gc.c:2495 msgid "failed to add repo to global config" msgstr "misslyckades lägga till arkiv till global konfiguration" -#: builtin/gc.c:2010 +#: builtin/gc.c:2504 msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <underkommando> [<flaggor>]" -#: builtin/gc.c:2029 +#: builtin/gc.c:2523 #, c-format msgid "invalid subcommand: %s" msgstr "felaktigt underkommando: %s" @@ -15802,12 +16106,12 @@ msgstr "felaktigt underkommando: %s" msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]" -#: builtin/grep.c:223 +#: builtin/grep.c:239 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: misslyckades skapa tråd. %s" -#: builtin/grep.c:277 +#: builtin/grep.c:293 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "felaktigt antal trådar angivet (%d) för %s" @@ -15816,262 +16120,262 @@ msgstr "felaktigt antal trådar angivet (%d) för %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793 -#: builtin/pack-objects.c:2969 +#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785 +#: builtin/pack-objects.c:3142 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643 +#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:658 +#: builtin/grep.c:672 #, c-format msgid "unable to grep from object of type %s" msgstr "kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:739 +#: builtin/grep.c:752 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:838 +#: builtin/grep.c:851 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:840 +#: builtin/grep.c:853 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:842 +#: builtin/grep.c:855 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:844 +#: builtin/grep.c:857 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:846 +#: builtin/grep.c:859 msgid "recursively search in each submodule" msgstr "sök varje undermodul rekursivt" -#: builtin/grep.c:849 +#: builtin/grep.c:862 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:851 +#: builtin/grep.c:864 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:853 +#: builtin/grep.c:866 msgid "match patterns only at word boundaries" msgstr "träffa endast mönster vid ordgränser" -#: builtin/grep.c:855 +#: builtin/grep.c:868 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:857 +#: builtin/grep.c:870 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:860 +#: builtin/grep.c:873 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:862 +#: builtin/grep.c:875 msgid "search in subdirectories (default)" msgstr "sök i underkataloger (standard)" -#: builtin/grep.c:864 +#: builtin/grep.c:877 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:868 +#: builtin/grep.c:881 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:871 +#: builtin/grep.c:884 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:874 +#: builtin/grep.c:887 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:877 +#: builtin/grep.c:890 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:880 +#: builtin/grep.c:893 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:881 +#: builtin/grep.c:894 msgid "show column number of first match" msgstr "visa kolumnnummer för första träff" -#: builtin/grep.c:882 +#: builtin/grep.c:895 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:883 +#: builtin/grep.c:896 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:885 +#: builtin/grep.c:898 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:887 +#: builtin/grep.c:900 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:889 +#: builtin/grep.c:902 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:892 +#: builtin/grep.c:905 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:894 +#: builtin/grep.c:907 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:897 +#: builtin/grep.c:910 msgid "show only matching parts of a line" msgstr "visa endast träffade delar av rader" -#: builtin/grep.c:899 +#: builtin/grep.c:912 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:900 +#: builtin/grep.c:913 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:902 +#: builtin/grep.c:915 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:904 +#: builtin/grep.c:917 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:907 +#: builtin/grep.c:920 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:910 +#: builtin/grep.c:923 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:912 +#: builtin/grep.c:925 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:914 +#: builtin/grep.c:927 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:915 +#: builtin/grep.c:928 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:918 +#: builtin/grep.c:931 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:920 +#: builtin/grep.c:933 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:923 +#: builtin/grep.c:936 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:925 +#: builtin/grep.c:938 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:927 +#: builtin/grep.c:940 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:939 +#: builtin/grep.c:952 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:941 +#: builtin/grep.c:954 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:944 +#: builtin/grep.c:957 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:944 +#: builtin/grep.c:957 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:948 +#: builtin/grep.c:961 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:1014 +#: builtin/grep.c:1027 msgid "no pattern given" msgstr "inget mönster angavs" -#: builtin/grep.c:1050 +#: builtin/grep.c:1063 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index och --untracked kan inte användas med revisioner" -#: builtin/grep.c:1058 +#: builtin/grep.c:1071 #, c-format msgid "unable to resolve revision: %s" msgstr "kan inte slå upp revision: %s" -#: builtin/grep.c:1088 +#: builtin/grep.c:1101 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked stöds inte med --recurse-submodules" -#: builtin/grep.c:1092 +#: builtin/grep.c:1105 msgid "invalid option combination, ignoring --threads" msgstr "ogiltig kombination av flaggor, ignorerar --threads" -#: builtin/grep.c:1095 builtin/pack-objects.c:3930 +#: builtin/grep.c:1108 builtin/pack-objects.c:4059 msgid "no threads support, ignoring --threads" msgstr "trådstöd saknas, ignorerar --threads" -#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966 +#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:1132 +#: builtin/grep.c:1145 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1158 +#: builtin/grep.c:1171 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached och --untracked kan inte användas med --no-index" -#: builtin/grep.c:1161 +#: builtin/grep.c:1174 msgid "--untracked cannot be used with --cached" msgstr "--untracked kan inte användas med --cached" -#: builtin/grep.c:1167 +#: builtin/grep.c:1180 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:1175 +#: builtin/grep.c:1188 msgid "both --cached and trees are given" msgstr "både --cached och träd angavs" -#: builtin/hash-object.c:85 +#: builtin/hash-object.c:83 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -16079,96 +16383,108 @@ msgstr "" "git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] " "<fil>..." -#: builtin/hash-object.c:86 +#: builtin/hash-object.c:84 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:96 msgid "object type" msgstr "objekttyp" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:97 msgid "write the object into the object database" msgstr "skriv objektet till objektdatabasen" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:99 msgid "read the object from stdin" msgstr "läs objektet från standard in" -#: builtin/hash-object.c:103 +#: builtin/hash-object.c:101 msgid "store file as is without filters" msgstr "spara filen som den är utan filer" -#: builtin/hash-object.c:104 +#: builtin/hash-object.c:102 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "hasha slumpmässigt skräp för att skapa korrupta objekt för felsökning av Git" -#: builtin/hash-object.c:105 +#: builtin/hash-object.c:103 msgid "process file as it were from this path" msgstr "hantera filen som om den kom från sökvägen" -#: builtin/help.c:47 +#: builtin/help.c:55 msgid "print all available commands" msgstr "visa alla tillgängliga kommandon" -#: builtin/help.c:48 +#: builtin/help.c:57 msgid "exclude guides" msgstr "uteslut vägledningar" -#: builtin/help.c:49 -msgid "print list of useful guides" -msgstr "lista användbara vägledningar" - -#: builtin/help.c:50 -msgid "print all configuration variable names" -msgstr "visa namn på alla konfigurationsvariabler" - -#: builtin/help.c:52 +#: builtin/help.c:58 msgid "show man page" msgstr "visa manualsida" -#: builtin/help.c:53 +#: builtin/help.c:59 msgid "show manual in web browser" msgstr "visa manual i webbläsare" -#: builtin/help.c:55 +#: builtin/help.c:61 msgid "show info page" msgstr "visa info-sida" -#: builtin/help.c:57 +#: builtin/help.c:63 msgid "print command description" msgstr "visa kommandobeskrivning" -#: builtin/help.c:62 -msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" -msgstr "git help [--all] [--guides] [--man | --web | --info] [<kommando>]" +#: builtin/help.c:65 +msgid "print list of useful guides" +msgstr "lista användbara vägledningar" + +#: builtin/help.c:67 +msgid "print all configuration variable names" +msgstr "visa namn på alla konfigurationsvariabler" + +#: builtin/help.c:78 +msgid "" +"git help [-a|--all] [--[no-]verbose]]\n" +" [[-i|--info] [-m|--man] [-w|--web]] [<command>]" +msgstr "" +"git help [-a|--all] [--[no-]verbose]]\n" +" [[-i|--info] [-m|--man] [-w|--web]] [<kommando>]" + +#: builtin/help.c:80 +msgid "git help [-g|--guides]" +msgstr "git help [-g|--guides]" + +#: builtin/help.c:81 +msgid "git help [-c|--config]" +msgstr "git help [-c|--config]" -#: builtin/help.c:163 +#: builtin/help.c:196 #, c-format msgid "unrecognized help format '%s'" msgstr "okänt hjälpformat: \"%s\"" -#: builtin/help.c:190 +#: builtin/help.c:222 msgid "Failed to start emacsclient." msgstr "Misslyckades starta emacsclient." -#: builtin/help.c:203 +#: builtin/help.c:235 msgid "Failed to parse emacsclient version." msgstr "Kunde inte tolka emacsclient-version." -#: builtin/help.c:211 +#: builtin/help.c:243 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient version \"%d\" för gammal (< 22)." -#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 +#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301 #, c-format msgid "failed to exec '%s'" msgstr "exec misslyckades för \"%s\"" -#: builtin/help.c:307 +#: builtin/help.c:339 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -16177,7 +16493,7 @@ msgstr "" "\"%s\": sökväg för man-visare som ej stöds.\n" "Använd \"man.<verktyg>.cmd\" istället." -#: builtin/help.c:319 +#: builtin/help.c:351 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -16186,331 +16502,314 @@ msgstr "" "\"%s\": kommando för man-visare som stöds.\n" "Använd \"man.<verktyg>.path\" istället." -#: builtin/help.c:436 +#: builtin/help.c:466 #, c-format msgid "'%s': unknown man viewer." msgstr "\"%s\": okänd man-visare." -#: builtin/help.c:453 +#: builtin/help.c:482 msgid "no man viewer handled the request" msgstr "ingen man-visare hanterade förfrågan" -#: builtin/help.c:461 +#: builtin/help.c:489 msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:520 builtin/help.c:531 git.c:348 +#: builtin/help.c:550 builtin/help.c:561 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "\"%s\" är ett alias för \"%s\"" -#: builtin/help.c:534 git.c:380 +#: builtin/help.c:564 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "felaktig alias.%s-sträng: %s" -#: builtin/help.c:563 builtin/help.c:593 +#: builtin/help.c:580 +msgid "this option doesn't take any other arguments" +msgstr "flaggan tar inte några andra argument" + +#: builtin/help.c:601 builtin/help.c:628 #, c-format msgid "usage: %s%s" msgstr "användning: %s%s" -#: builtin/help.c:577 +#: builtin/help.c:623 msgid "'git help config' for more information" msgstr "\"git help config\" för mer information" -#: builtin/index-pack.c:222 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "objekttyp stämmer inte överens vid %s" -#: builtin/index-pack.c:242 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "emottog inte det förväntade objektet %s" -#: builtin/index-pack.c:245 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objektet %s: förväntad typ %s, såg %s" -#: builtin/index-pack.c:295 +#: builtin/index-pack.c:294 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "kan inte fylla %d byte" msgstr[1] "kan inte fylla %d byte" -#: builtin/index-pack.c:305 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "tidigt filslut" -#: builtin/index-pack.c:306 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "indataläsfel" -#: builtin/index-pack.c:318 +#: builtin/index-pack.c:317 msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:325 builtin/pack-objects.c:624 +#: builtin/index-pack.c:324 builtin/pack-objects.c:756 msgid "pack too large for current definition of off_t" msgstr "paket för stort för nuvarande definition av off_t" -#: builtin/index-pack.c:328 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "paket är större än tillåten maximal storlek" -#: builtin/index-pack.c:343 -#, c-format -msgid "unable to create '%s'" -msgstr "kunde inte skapa \"%s\"" - -#: builtin/index-pack.c:349 -#, c-format -msgid "cannot open packfile '%s'" -msgstr "kan inte öppna paketfilen \"%s\"" - -#: builtin/index-pack.c:363 +#: builtin/index-pack.c:358 msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" -#: builtin/index-pack.c:365 +#: builtin/index-pack.c:360 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stöds ej" -#: builtin/index-pack.c:383 +#: builtin/index-pack.c:376 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s" -#: builtin/index-pack.c:489 +#: builtin/index-pack.c:482 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:531 msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" -#: builtin/index-pack.c:546 +#: builtin/index-pack.c:539 msgid "delta base offset is out of bound" msgstr "deltabasindex utanför gränsen" -#: builtin/index-pack.c:554 +#: builtin/index-pack.c:547 #, c-format msgid "unknown object type %d" msgstr "okänd objekttyp %d" -#: builtin/index-pack.c:585 +#: builtin/index-pack.c:578 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: builtin/index-pack.c:587 +#: builtin/index-pack.c:580 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" -#: builtin/index-pack.c:613 +#: builtin/index-pack.c:606 msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788 -#: builtin/index-pack.c:827 builtin/index-pack.c:836 +#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781 +#: builtin/index-pack.c:820 builtin/index-pack.c:829 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:761 builtin/pack-objects.c:171 -#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 +#: builtin/index-pack.c:754 builtin/pack-objects.c:292 +#: builtin/pack-objects.c:352 builtin/pack-objects.c:458 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:825 +#: builtin/index-pack.c:818 #, c-format msgid "cannot read existing object info %s" msgstr "kan inte läsa information om befintligt objekt %s" -#: builtin/index-pack.c:833 +#: builtin/index-pack.c:826 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:840 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:850 builtin/index-pack.c:869 +#: builtin/index-pack.c:843 builtin/index-pack.c:862 msgid "fsck error in packed object" msgstr "fsck-fel i packat objekt" -#: builtin/index-pack.c:871 +#: builtin/index-pack.c:864 #, 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:932 builtin/index-pack.c:979 +#: builtin/index-pack.c:925 builtin/index-pack.c:972 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1156 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1156 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1196 +#: builtin/index-pack.c:1190 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1201 +#: builtin/index-pack.c:1195 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1204 +#: builtin/index-pack.c:1198 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1216 +#: builtin/index-pack.c:1210 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1239 +#: builtin/index-pack.c:1233 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732 +#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1277 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1289 +#: builtin/index-pack.c:1283 #, 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:1301 +#: builtin/index-pack.c:1295 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" -msgstr "Oväntad svanschecksumma för %s (trasig disk?)" +msgstr "Oväntad svanskontrollsumma för %s (trasig disk?)" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c:1299 #, 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:1329 +#: builtin/index-pack.c:1323 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1419 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1446 +#: builtin/index-pack.c:1440 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "paketfilnamnet \"%s\" slutar inte med \".%s\"" -#: builtin/index-pack.c:1470 +#: builtin/index-pack.c:1464 #, c-format msgid "cannot write %s file '%s'" msgstr "kan inte ta skriva %s-fil \"%s\"" -#: builtin/index-pack.c:1478 +#: builtin/index-pack.c:1472 #, c-format msgid "cannot close written %s file '%s'" msgstr "kan inte stänga skriven %s-fil \"%s\"" -#: builtin/index-pack.c:1504 +#: builtin/index-pack.c:1489 +#, c-format +msgid "unable to rename temporary '*.%s' file to '%s'" +msgstr "kunde inte byta namn på temporär \"*.%s\"-fil till \"%s\"" + +#: builtin/index-pack.c:1514 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1518 -msgid "cannot store pack file" -msgstr "kan inte spara paketfil" - -#: builtin/index-pack.c:1526 -msgid "cannot store index file" -msgstr "kan inte spara indexfil" - -#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977 +#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1651 +#: builtin/index-pack.c:1643 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1653 +#: builtin/index-pack.c:1645 #, 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:1701 +#: builtin/index-pack.c:1693 #, 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:1708 +#: builtin/index-pack.c:1700 #, 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:1750 +#: builtin/index-pack.c:1742 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1804 builtin/index-pack.c:1807 -#: builtin/index-pack.c:1823 builtin/index-pack.c:1827 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1799 +#: builtin/index-pack.c:1819 builtin/index-pack.c:1823 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613 +#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614 #, c-format msgid "unknown hash algorithm '%s'" msgstr "okänd hashningsalgoritm \"%s\"" -#: builtin/index-pack.c:1852 -msgid "--fix-thin cannot be used without --stdin" -msgstr "--fix-thin kan inte användas med --stdin" - -#: builtin/index-pack.c:1854 +#: builtin/index-pack.c:1850 msgid "--stdin requires a git repository" msgstr "--stdin kräver ett git-arkiv" -#: builtin/index-pack.c:1856 -msgid "--object-format cannot be used with --stdin" -msgstr "--object-format kan inte användas med --stdin" - -#: builtin/index-pack.c:1871 +#: builtin/index-pack.c:1867 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" -#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584 +#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "fsck-fel i packat objekt" @@ -16554,56 +16853,56 @@ msgstr "mallarna hittades inte i %s" msgid "not copying templates from '%s': %s" msgstr "kopierade inte mallar från \"%s\": %s" -#: builtin/init-db.c:262 +#: builtin/init-db.c:263 #, c-format msgid "invalid initial branch name: '%s'" msgstr "ogiltigt namn på första gren: \"%s\"" -#: builtin/init-db.c:353 +#: builtin/init-db.c:354 #, c-format msgid "unable to handle file type %d" msgstr "kan inte hantera filtyp %d" -#: builtin/init-db.c:356 +#: builtin/init-db.c:357 #, c-format msgid "unable to move %s to %s" msgstr "kan inte flytta %s till %s" -#: builtin/init-db.c:372 +#: builtin/init-db.c:373 msgid "attempt to reinitialize repository with different hash" msgstr "försöker initiera arkivet på nytt med annan hash" -#: builtin/init-db.c:396 builtin/init-db.c:399 +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "%s finns redan" -#: builtin/init-db.c:431 +#: builtin/init-db.c:432 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init: ignorerade --initial-branch=%s" -#: builtin/init-db.c:462 +#: builtin/init-db.c:463 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Ominitierade befintligt delat Git-arkiv i %s%s\n" -#: builtin/init-db.c:463 +#: builtin/init-db.c:464 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Ominitierade befintligt Git-arkiv i %s%s\n" -#: builtin/init-db.c:467 +#: builtin/init-db.c:468 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Initierade tomt delat Git-arkiv i %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:469 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Initierade tomt Git-arkiv i %s%s\n" -#: builtin/init-db.c:517 +#: builtin/init-db.c:518 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -16611,41 +16910,37 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" "shared[=<behörigheter>]] [<katalog>]" -#: builtin/init-db.c:543 +#: builtin/init-db.c:544 msgid "permissions" msgstr "behörigheter" -#: builtin/init-db.c:544 +#: builtin/init-db.c:545 msgid "specify that the git repository is to be shared amongst several users" msgstr "ange att git-arkivet ska delas bland flera användare" -#: builtin/init-db.c:550 +#: builtin/init-db.c:551 msgid "override the name of the initial branch" msgstr "överstyr namnet på första gren" -#: builtin/init-db.c:551 builtin/verify-pack.c:74 +#: builtin/init-db.c:552 builtin/verify-pack.c:74 msgid "hash" msgstr "hash" -#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "ange hashningsalgoritm att använda" -#: builtin/init-db.c:559 -msgid "--separate-git-dir and --bare are mutually exclusive" -msgstr "--separate-git-dir och --bare är ömsesidigt uteslutande" - -#: builtin/init-db.c:590 builtin/init-db.c:595 +#: builtin/init-db.c:591 builtin/init-db.c:596 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:599 builtin/init-db.c:654 +#: builtin/init-db.c:600 builtin/init-db.c:655 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:626 +#: builtin/init-db.c:627 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -16654,14 +16949,14 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:678 +#: builtin/init-db.c:679 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" -#: builtin/init-db.c:683 +#: builtin/init-db.c:684 msgid "--separate-git-dir incompatible with bare repository" -msgstr "--separatebgit-dir är inkompatibelt med naket arkiv" +msgstr "--separate-git-dir är inkompatibelt med naket arkiv" #: builtin/interpret-trailers.c:16 msgid "" @@ -16768,85 +17063,85 @@ msgstr "" msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<intervall>:<fil> kan inte användas med sökvägsspecifikation" -#: builtin/log.c:303 +#: builtin/log.c:321 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:568 +#: builtin/log.c:586 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:583 builtin/log.c:673 +#: builtin/log.c:601 builtin/log.c:691 #, c-format msgid "could not read object %s" msgstr "kunde inte läsa objektet %s" -#: builtin/log.c:698 +#: builtin/log.c:716 #, c-format msgid "unknown type: %d" msgstr "okänd typ: %d" -#: builtin/log.c:843 +#: builtin/log.c:861 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s: ogiltigt omslag från beskrivningsläge" -#: builtin/log.c:850 +#: builtin/log.c:868 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:979 +#: builtin/log.c:997 #, c-format msgid "cannot open patch file %s" msgstr "kan inte öppna patchfilen %s" -#: builtin/log.c:996 +#: builtin/log.c:1014 msgid "need exactly one range" msgstr "behöver precis ett intervall" -#: builtin/log.c:1006 +#: builtin/log.c:1024 msgid "not a range" msgstr "inte ett intervall" -#: builtin/log.c:1170 +#: builtin/log.c:1188 msgid "cover letter needs email format" msgstr "omslagsbrevet behöver e-postformat" -#: builtin/log.c:1176 +#: builtin/log.c:1194 msgid "failed to create cover-letter file" msgstr "misslyckades skapa fil för omslagsbrev" -#: builtin/log.c:1263 +#: builtin/log.c:1281 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1290 +#: builtin/log.c:1308 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1348 +#: builtin/log.c:1366 msgid "two output directories?" msgstr "två utdatakataloger?" -#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340 +#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358 #, c-format msgid "unknown commit %s" msgstr "okänd incheckning %s" -#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "misslyckades slå upp \"%s\" som en giltig referens" -#: builtin/log.c:1519 +#: builtin/log.c:1537 msgid "could not find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1529 +#: builtin/log.c:1547 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -16856,416 +17151,408 @@ msgstr "" "använd git branch --set-upstream-to för att spåra en fjärrgren.\n" "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> manuellt" -#: builtin/log.c:1552 +#: builtin/log.c:1570 msgid "failed to find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1569 +#: builtin/log.c:1587 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1579 +#: builtin/log.c:1597 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1637 +#: builtin/log.c:1655 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1700 +#: builtin/log.c:1718 msgid "failed to infer range-diff origin of current series" msgstr "misslyckades räkna ut intervalldiff-ursprung för aktuell serie" -#: builtin/log.c:1702 +#: builtin/log.c:1720 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "använd \"%s\" som intervalldiff-ursprung för aktuell serie" -#: builtin/log.c:1746 +#: builtin/log.c:1764 msgid "use [PATCH n/m] even with a single patch" msgstr "använd [PATCH n/m] även för en ensam patch" -#: builtin/log.c:1749 +#: builtin/log.c:1767 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1753 +#: builtin/log.c:1771 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1755 +#: builtin/log.c:1773 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1757 +#: builtin/log.c:1775 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1758 +#: builtin/log.c:1776 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1759 +#: builtin/log.c:1777 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1761 +#: builtin/log.c:1779 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1762 +#: builtin/log.c:1780 msgid "reroll-count" msgstr "antal iterationer" -#: builtin/log.c:1763 +#: builtin/log.c:1781 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1765 +#: builtin/log.c:1783 msgid "max length of output filename" msgstr "maximal längd för utdatafilnamn" -#: builtin/log.c:1767 +#: builtin/log.c:1785 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "använd [RFC PATCH] istället för [PATCH]" -#: builtin/log.c:1770 +#: builtin/log.c:1788 msgid "cover-from-description-mode" msgstr "cover-from-description-läge" -#: builtin/log.c:1771 +#: builtin/log.c:1789 msgid "generate parts of a cover letter based on a branch's description" msgstr "skapa delar av omslagsbrevet baserat på grenbeskrivelsen" -#: builtin/log.c:1773 +#: builtin/log.c:1791 msgid "use [<prefix>] instead of [PATCH]" msgstr "använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1776 +#: builtin/log.c:1794 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1779 +#: builtin/log.c:1797 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1782 +#: builtin/log.c:1800 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1784 +#: builtin/log.c:1802 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1786 +#: builtin/log.c:1804 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1788 +#: builtin/log.c:1806 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1790 +#: builtin/log.c:1808 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1791 +#: builtin/log.c:1809 msgid "header" msgstr "huvud" -#: builtin/log.c:1792 +#: builtin/log.c:1810 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1793 builtin/log.c:1794 +#: builtin/log.c:1811 builtin/log.c:1812 msgid "email" msgstr "epost" -#: builtin/log.c:1793 +#: builtin/log.c:1811 msgid "add To: header" msgstr "lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1794 +#: builtin/log.c:1812 msgid "add Cc: header" msgstr "lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1795 +#: builtin/log.c:1813 msgid "ident" msgstr "ident" -#: builtin/log.c:1796 +#: builtin/log.c:1814 msgid "set From address to <ident> (or committer ident if absent)" msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)" -#: builtin/log.c:1798 +#: builtin/log.c:1816 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1799 +#: builtin/log.c:1817 msgid "make first mail a reply to <message-id>" msgstr "gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1800 builtin/log.c:1803 +#: builtin/log.c:1818 builtin/log.c:1821 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1801 +#: builtin/log.c:1819 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1804 +#: builtin/log.c:1822 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1808 +#: builtin/log.c:1826 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1810 +#: builtin/log.c:1828 msgid "signature" msgstr "signatur" -#: builtin/log.c:1811 +#: builtin/log.c:1829 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1812 +#: builtin/log.c:1830 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1813 +#: builtin/log.c:1831 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1816 +#: builtin/log.c:1834 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1817 +#: builtin/log.c:1835 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1819 +#: builtin/log.c:1837 msgid "show progress while generating patches" msgstr "visa förloppsindikator medan patchar skapas" -#: builtin/log.c:1821 +#: builtin/log.c:1839 msgid "show changes against <rev> in cover letter or single patch" msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch" -#: builtin/log.c:1824 +#: builtin/log.c:1842 msgid "show changes against <refspec> in cover letter or single patch" msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch" -#: builtin/log.c:1826 builtin/range-diff.c:28 +#: builtin/log.c:1844 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "procent som skapelse vägs med" -#: builtin/log.c:1913 +#: builtin/log.c:1931 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1928 -msgid "-n and -k are mutually exclusive" -msgstr "-n och -k kan inte användas samtidigt" - -#: builtin/log.c:1930 -msgid "--subject-prefix/--rfc and -k are mutually exclusive" -msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt" - -#: builtin/log.c:1938 +#: builtin/log.c:1956 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1940 +#: builtin/log.c:1958 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1942 +#: builtin/log.c:1960 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1964 -msgid "--stdout, --output, and --output-directory are mutually exclusive" -msgstr "--stdout, --output, och --output-directory är ömsesidigt uteslutande" - -#: builtin/log.c:2087 +#: builtin/log.c:2104 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff kräver --cover-letter eller ensam patch" -#: builtin/log.c:2091 +#: builtin/log.c:2108 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:2092 +#: builtin/log.c:2109 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff mot v%d:" -#: builtin/log.c:2098 -msgid "--creation-factor requires --range-diff" -msgstr "--creation-factor kräver --range-diff" - -#: builtin/log.c:2102 +#: builtin/log.c:2119 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff kräver --cover-letter eller ensam patch" -#: builtin/log.c:2110 +#: builtin/log.c:2127 msgid "Range-diff:" msgstr "Intervall-diff:" -#: builtin/log.c:2111 +#: builtin/log.c:2128 #, c-format msgid "Range-diff against v%d:" msgstr "Intervall-diff mot v%d:" -#: builtin/log.c:2122 +#: builtin/log.c:2139 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:2158 +#: builtin/log.c:2175 msgid "Generating patches" msgstr "Skapar patchar" -#: builtin/log.c:2202 +#: builtin/log.c:2219 msgid "failed to create output files" msgstr "misslyckades skapa utdatafiler" -#: builtin/log.c:2261 +#: builtin/log.c:2279 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:2315 +#: builtin/log.c:2333 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:564 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<flaggor>] [<fil>...]" -#: builtin/ls-files.c:619 +#: builtin/ls-files.c:618 +msgid "separate paths with the NUL character" +msgstr "sökvägar avdelas med NUL-tecken" + +#: builtin/ls-files.c:620 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:621 +#: builtin/ls-files.c:622 msgid "use lowercase letters for 'assume unchanged' files" msgstr "använd små bokstäver för \"anta oförändrade\"-filer" -#: builtin/ls-files.c:623 +#: builtin/ls-files.c:624 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "använd små bokstäver för \"fsmonitor clean\"-filer" -#: builtin/ls-files.c:625 +#: builtin/ls-files.c:626 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:627 +#: builtin/ls-files.c:628 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:629 +#: builtin/ls-files.c:630 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:631 +#: builtin/ls-files.c:632 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:633 +#: builtin/ls-files.c:634 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:636 +#: builtin/ls-files.c:637 msgid "show staged contents' object name in the output" msgstr "visa köat innehålls objektnamn i utdata" -#: builtin/ls-files.c:638 +#: builtin/ls-files.c:639 msgid "show files on the filesystem that need to be removed" msgstr "visa filer i filsystemet som behöver tas bort" -#: builtin/ls-files.c:640 +#: builtin/ls-files.c:641 msgid "show 'other' directories' names only" msgstr "visa endast namn för \"andra\" kataloger" -#: builtin/ls-files.c:642 +#: builtin/ls-files.c:643 msgid "show line endings of files" msgstr "visa radslut i filer" -#: builtin/ls-files.c:644 +#: builtin/ls-files.c:645 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:647 +#: builtin/ls-files.c:648 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:649 +#: builtin/ls-files.c:650 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:651 +#: builtin/ls-files.c:652 msgid "skip files matching pattern" msgstr "hoppa över filer som motsvarar mönster" -#: builtin/ls-files.c:654 -msgid "exclude patterns are read from <file>" -msgstr "exkludera mönster som läses från <fil>" +#: builtin/ls-files.c:655 +msgid "read exclude patterns from <file>" +msgstr "läs exkluderingsmönster från <fil>" -#: builtin/ls-files.c:657 +#: builtin/ls-files.c:658 msgid "read additional per-directory exclude patterns in <file>" msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" -#: builtin/ls-files.c:659 +#: builtin/ls-files.c:660 msgid "add the standard git exclusions" msgstr "lägg till git:s standardexkluderingar" -#: builtin/ls-files.c:663 +#: builtin/ls-files.c:664 msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:666 +#: builtin/ls-files.c:667 msgid "recurse through submodules" msgstr "rekursera ner i undermoduler" -#: builtin/ls-files.c:668 +#: builtin/ls-files.c:669 msgid "if any <file> is not in the index, treat this as an error" msgstr "om en <fil> inte är indexet, betrakta det som ett fel" -#: builtin/ls-files.c:669 +#: builtin/ls-files.c:670 msgid "tree-ish" msgstr "träd-igt" -#: builtin/ls-files.c:670 +#: builtin/ls-files.c:671 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns" -#: builtin/ls-files.c:672 +#: builtin/ls-files.c:673 msgid "show debugging data" msgstr "visa felsökningsutdata" -#: builtin/ls-files.c:674 +#: builtin/ls-files.c:675 msgid "suppress duplicate entries" msgstr "undertyck dublettposter" +#: builtin/ls-files.c:677 +msgid "show sparse directories in the presence of a sparse index" +msgstr "visa glesa kataloger när et glest index existerar" + #: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" -" [--symref] [<repository> [<refs>...]]" +" [-q | --quiet] [--exit-code] [--get-url]\n" +" [--symref] [<repository> [<refs>...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" -" [--symref] [<arkiv> [<referenser>...]]" +" [-q | --quiet] [--exit-code] [--get-url]\n" +" [--symref] [<arkiv> [<referenser>...]]" #: builtin/ls-remote.c:60 msgid "do not print remote URL" msgstr "visa inte fjärr-URL" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103 msgid "exec" msgstr "exec" @@ -17319,7 +17606,7 @@ msgstr "terminera poster med NUL-byte" #: builtin/ls-tree.c:136 msgid "include object size" -msgstr "inkludera objektstorlek" +msgstr "ta med objektstorlek" #: builtin/ls-tree.c:138 builtin/ls-tree.c:140 msgid "list only filenames" @@ -17352,7 +17639,7 @@ msgstr "kopiera Message-ID till slutet av incheckningsmeddelandet" #: builtin/mailinfo.c:64 msgid "re-code metadata to i18n.commitEncoding" -msgstr "koda om metadata till i18n.commmitEncoding" +msgstr "koda om metadata till i18n.commitEncoding" #: builtin/mailinfo.c:67 msgid "disable charset re-coding of metadata" @@ -17382,7 +17669,7 @@ msgstr "åtgärd när citerad vagnretur hittas" msgid "use headers in message's body" msgstr "använd huvuden i brevkroppen" -#: builtin/mailsplit.c:241 +#: builtin/mailsplit.c:239 #, c-format msgid "empty mbox: '%s'" msgstr "tom mbox: \"%s\"" @@ -17444,26 +17731,30 @@ msgid "use a diff3 based merge" msgstr "använd diff3-baserad sammanslagning" #: builtin/merge-file.c:37 +msgid "use a zealous diff3 based merge" +msgstr "använd nitisk diff3-baserad sammanslagning" + +#: builtin/merge-file.c:39 msgid "for conflicts, use our version" msgstr "för konflikter, använd vår version" -#: builtin/merge-file.c:39 +#: builtin/merge-file.c:41 msgid "for conflicts, use their version" msgstr "för konflikter, använd deras version" -#: builtin/merge-file.c:41 +#: builtin/merge-file.c:43 msgid "for conflicts, use a union version" msgstr "för konflikter, använd en förenad version" -#: builtin/merge-file.c:44 +#: builtin/merge-file.c:46 msgid "for conflicts, use this marker size" msgstr "för konflikter, använd denna markörstorlek" -#: builtin/merge-file.c:45 +#: builtin/merge-file.c:47 msgid "do not warn about conflicts" msgstr "varna inte om konflikter" -#: builtin/merge-file.c:47 +#: builtin/merge-file.c:49 msgid "set labels for file1/orig-file/file2" msgstr "sätt etiketter för fil1/origfil/fil2" @@ -17498,192 +17789,188 @@ msgstr "kunde inte bestämma referensen \"%s\"" msgid "Merging %s with %s\n" msgstr "Slår ihop %s med %s\n" -#: builtin/merge.c:58 +#: builtin/merge.c:59 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<flaggor>] [<incheckning>...]" -#: builtin/merge.c:59 -msgid "git merge --abort" -msgstr "git merge --abort" - -#: builtin/merge.c:60 -msgid "git merge --continue" -msgstr "git merge --continue" - -#: builtin/merge.c:123 +#: builtin/merge.c:125 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:146 +#: builtin/merge.c:148 #, c-format msgid "option `%s' requires a value" msgstr "flaggan \"%s\" behöver ett värde" -#: builtin/merge.c:199 +#: builtin/merge.c:201 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:200 +#: builtin/merge.c:202 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:205 +#: builtin/merge.c:207 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:256 builtin/pull.c:133 +#: builtin/merge.c:258 builtin/pull.c:134 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:259 builtin/pull.c:136 +#: builtin/merge.c:261 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:260 builtin/pull.c:139 +#: builtin/merge.c:262 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:262 builtin/pull.c:142 +#: builtin/merge.c:264 builtin/pull.c:143 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet" -#: builtin/merge.c:265 builtin/pull.c:148 +#: builtin/merge.c:267 builtin/pull.c:149 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:267 builtin/pull.c:151 +#: builtin/merge.c:269 builtin/pull.c:152 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:269 builtin/pull.c:154 +#: builtin/merge.c:271 builtin/pull.c:155 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:271 +#: builtin/merge.c:273 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:273 builtin/pull.c:161 +#: builtin/merge.c:275 builtin/pull.c:162 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:277 builtin/pull.c:164 +#: builtin/merge.c:279 builtin/pull.c:168 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:278 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114 +#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172 +#: builtin/rebase.c:1117 builtin/revert.c:114 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:279 builtin/pull.c:169 +#: builtin/merge.c:281 builtin/pull.c:173 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:280 builtin/pull.c:172 +#: builtin/merge.c:282 builtin/pull.c:176 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:281 builtin/pull.c:173 +#: builtin/merge.c:283 builtin/pull.c:177 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:283 +#: builtin/merge.c:285 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:290 +#: builtin/merge.c:291 +msgid "use <name> instead of the real target" +msgstr "använd <namn> istället för det verkliga målet" + +#: builtin/merge.c:294 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:292 +#: builtin/merge.c:296 msgid "--abort but leave index and working tree alone" msgstr "--abort men lämna index och arbetskatalog ensamma" -#: builtin/merge.c:294 +#: builtin/merge.c:298 msgid "continue the current in-progress merge" msgstr "fortsätt den pågående sammanslagningen" -#: builtin/merge.c:296 builtin/pull.c:180 +#: builtin/merge.c:300 builtin/pull.c:184 msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" -#: builtin/merge.c:303 +#: builtin/merge.c:307 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "förbigå pre-merge-commit- och commit-msg-krokar" -#: builtin/merge.c:320 +#: builtin/merge.c:323 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:325 +#: builtin/merge.c:328 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:330 +#: builtin/merge.c:333 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:352 builtin/merge.c:369 +#: builtin/merge.c:355 builtin/merge.c:372 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:400 +#: builtin/merge.c:403 msgid "Already up to date. (nothing to squash)" msgstr "Redan à jour. (inget att platta till)" -#: builtin/merge.c:414 +#: builtin/merge.c:417 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:464 +#: builtin/merge.c:467 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:515 +#: builtin/merge.c:517 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:602 +#: builtin/merge.c:605 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:728 +#: builtin/merge.c:732 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:741 +#: builtin/merge.c:745 #, c-format -msgid "Unknown option for merge-recursive: -X%s" -msgstr "Felaktig flagga för merge-recursive: -X%s" +msgid "unknown strategy option: -X%s" +msgstr "okänd strategiflagga: -X%s" -#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:812 +#: builtin/merge.c:816 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:821 +#: builtin/merge.c:825 #, 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:827 +#: builtin/merge.c:831 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" @@ -17694,11 +17981,11 @@ msgstr "" "temagren.\n" "\n" -#: builtin/merge.c:832 +#: builtin/merge.c:836 msgid "An empty message aborts the commit.\n" msgstr "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/merge.c:835 +#: builtin/merge.c:839 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -17707,73 +17994,73 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:888 +#: builtin/merge.c:894 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:903 +#: builtin/merge.c:909 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:964 +#: builtin/merge.c:970 #, 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:1003 +#: builtin/merge.c:1009 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:1005 +#: builtin/merge.c:1011 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:1007 +#: builtin/merge.c:1013 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:1012 +#: builtin/merge.c:1018 #, 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:1069 +#: builtin/merge.c:1075 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1172 +#: builtin/merge.c:1177 #, 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:1206 +#: builtin/merge.c:1211 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1316 +#: builtin/merge.c:1324 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1320 +#: builtin/merge.c:1328 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1338 +#: builtin/merge.c:1346 msgid "--quit expects no arguments" msgstr "--quit tar inga argument" -#: builtin/merge.c:1351 +#: builtin/merge.c:1359 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1355 +#: builtin/merge.c:1363 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1371 +#: builtin/merge.c:1379 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17781,7 +18068,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1378 +#: builtin/merge.c:1386 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17789,88 +18076,76 @@ 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:1381 +#: builtin/merge.c:1389 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:1395 -msgid "You cannot combine --squash with --no-ff." -msgstr "Du kan inte kombinera --squash med --no-ff." - -#: builtin/merge.c:1397 -msgid "You cannot combine --squash with --commit." -msgstr "Du kan inte kombinera --squash med --commit." - -#: builtin/merge.c:1413 +#: builtin/merge.c:1421 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1430 +#: builtin/merge.c:1438 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1432 +#: builtin/merge.c:1440 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:1437 +#: builtin/merge.c:1445 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1439 +#: builtin/merge.c:1447 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:1520 +#: builtin/merge.c:1534 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1539 +#: builtin/merge.c:1553 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1601 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1608 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1623 -msgid "Not possible to fast-forward, aborting." -msgstr "Kan inte snabbspola, avbryter." - -#: builtin/merge.c:1651 builtin/merge.c:1716 +#: builtin/merge.c:1667 builtin/merge.c:1733 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1655 +#: builtin/merge.c:1671 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1707 +#: builtin/merge.c:1723 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1709 +#: builtin/merge.c:1725 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1718 +#: builtin/merge.c:1735 #, 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" +msgid "Using the %s strategy to prepare resolving by hand.\n" +msgstr "Använder strategin %s för att förbereda lösning för hand.\n" -#: builtin/merge.c:1732 +#: builtin/merge.c:1749 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -17905,15 +18180,15 @@ msgstr "kunde inte läsa det taggade objektet \"%s\"" msgid "object '%s' tagged as '%s', but is a '%s' type" msgstr "objektet \"%s\" taggat som \"%s\", men är av typen \"%s\"" -#: builtin/mktag.c:97 +#: builtin/mktag.c:98 msgid "tag on stdin did not pass our strict fsck check" msgstr "tagg på stdin godkänns inte av vår strikta fsck-kontroll" -#: builtin/mktag.c:100 +#: builtin/mktag.c:101 msgid "tag on stdin did not refer to a valid object" msgstr "taggen på stdin pekar inte på ett giltigt objekt" -#: builtin/mktag.c:103 builtin/tag.c:243 +#: builtin/mktag.c:104 builtin/tag.c:242 msgid "unable to write tag file" msgstr "kunde inte skriva tagg-filen" @@ -17934,34 +18209,50 @@ msgid "allow creation of more than one tree" msgstr "tillåt skapa mer än ett träd" #: builtin/multi-pack-index.c:10 -msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]" -msgstr "git multi-pack-index [<flaggor>] write [--preferred-pack=<paket>]" +msgid "" +"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-" +"snapshot=<path>]" +msgstr "" +"git multi-pack-index [<flaggor>] write [--preferred-pack=<paket>] [--refs-" +"snapshot=<sökväg>]" -#: builtin/multi-pack-index.c:13 +#: builtin/multi-pack-index.c:14 msgid "git multi-pack-index [<options>] verify" msgstr "git multi-pack-index [<flaggor>] verify" -#: builtin/multi-pack-index.c:16 +#: builtin/multi-pack-index.c:17 msgid "git multi-pack-index [<options>] expire" msgstr "git multi-pack-index [<flaggor>] expire" -#: builtin/multi-pack-index.c:19 +#: builtin/multi-pack-index.c:20 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]" msgstr "git multi-pack-index [<flaggor>] repack [--batch-size=<storlek>]" -#: builtin/multi-pack-index.c:54 +#: builtin/multi-pack-index.c:57 msgid "object directory containing set of packfile and pack-index pairs" msgstr "objektkatalog med uppsättning av par med paketfiler och pack-index" -#: builtin/multi-pack-index.c:69 +#: builtin/multi-pack-index.c:98 msgid "preferred-pack" msgstr "föredraget paket" -#: builtin/multi-pack-index.c:70 +#: builtin/multi-pack-index.c:99 msgid "pack for reuse when computing a multi-pack bitmap" msgstr "paket att återanvända vid beräkning av multipaketsbitkarta" -#: builtin/multi-pack-index.c:128 +#: builtin/multi-pack-index.c:100 +msgid "write multi-pack bitmap" +msgstr "skriv flerpaketsbitkarta" + +#: builtin/multi-pack-index.c:105 +msgid "write multi-pack index containing only given indexes" +msgstr "skriv flerpaketsindex som endast innehåller angivna index" + +#: builtin/multi-pack-index.c:107 +msgid "refs snapshot for selecting bitmap commits" +msgstr "refs-ögonblicksbild för att välja bitkarte-incheckningar" + +#: builtin/multi-pack-index.c:206 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -17969,11 +18260,6 @@ msgstr "" "vid ompackning, samla mindre paketfiler i en bunt som är större än denna " "storlek" -#: builtin/multi-pack-index.c:180 -#, c-format -msgid "unrecognized subcommand: %s" -msgstr "okänt underkommando: %s" - #: builtin/mv.c:18 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<flaggor>] <källa>... <mål>" @@ -18001,117 +18287,117 @@ msgstr "tvinga flytta/ändra namn även om målet finns" msgid "skip move/rename errors" msgstr "hoppa över fel vid flytt/namnändring" -#: builtin/mv.c:170 +#: builtin/mv.c:172 #, c-format msgid "destination '%s' is not a directory" msgstr "destinationen \"%s\" är ingen katalog" -#: builtin/mv.c:181 +#: builtin/mv.c:184 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n" -#: builtin/mv.c:185 +#: builtin/mv.c:190 msgid "bad source" msgstr "felaktig källa" -#: builtin/mv.c:188 +#: builtin/mv.c:193 msgid "can not move directory into itself" msgstr "kan inte flytta katalog till sig själv" -#: builtin/mv.c:191 +#: builtin/mv.c:196 msgid "cannot move directory over file" msgstr "kan inte flytta katalog över fil" -#: builtin/mv.c:200 +#: builtin/mv.c:205 msgid "source directory is empty" msgstr "källkatalogen är tom" -#: builtin/mv.c:225 +#: builtin/mv.c:231 msgid "not under version control" msgstr "inte versionshanterad" -#: builtin/mv.c:227 +#: builtin/mv.c:233 msgid "conflicted" msgstr "i konflikt" -#: builtin/mv.c:230 +#: builtin/mv.c:236 msgid "destination exists" msgstr "destinationen finns" -#: builtin/mv.c:238 +#: builtin/mv.c:244 #, c-format msgid "overwriting '%s'" msgstr "skriver över \"%s\"" -#: builtin/mv.c:241 +#: builtin/mv.c:247 msgid "Cannot overwrite" msgstr "Kan inte skriva över" -#: builtin/mv.c:244 +#: builtin/mv.c:250 msgid "multiple sources for the same target" msgstr "flera källor för samma mål" -#: builtin/mv.c:246 +#: builtin/mv.c:252 msgid "destination directory does not exist" msgstr "destinationskatalogen finns inte" -#: builtin/mv.c:253 +#: builtin/mv.c:280 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, källa=%s, mål=%s" -#: builtin/mv.c:274 +#: builtin/mv.c:308 #, c-format msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667 +#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:474 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<flaggor>] <incheckning>..." -#: builtin/name-rev.c:466 +#: builtin/name-rev.c:475 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<flaggor>] --all" -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:476 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<flaggor>] --stdin" -#: builtin/name-rev.c:524 +#: builtin/name-rev.c:533 msgid "print only ref-based names (no object names)" msgstr "skriv endast referensbaserade namn (inga objektnamn)" -#: builtin/name-rev.c:525 +#: builtin/name-rev.c:534 msgid "only use tags to name the commits" msgstr "använd endast taggar för att namnge incheckningar" -#: builtin/name-rev.c:527 +#: builtin/name-rev.c:536 msgid "only use refs matching <pattern>" msgstr "använd endast referenser som motsvarar <mönster>" -#: builtin/name-rev.c:529 +#: builtin/name-rev.c:538 msgid "ignore refs matching <pattern>" msgstr "ignorera referenser som motsvarar <mönster>" -#: builtin/name-rev.c:531 +#: builtin/name-rev.c:540 msgid "list all commits reachable from all refs" msgstr "lista alla incheckningar som kan nås alla referenser" -#: builtin/name-rev.c:532 +#: builtin/name-rev.c:541 msgid "read from stdin" msgstr "läs från standard in" -#: builtin/name-rev.c:533 +#: builtin/name-rev.c:542 msgid "allow to print `undefined` names (default)" msgstr "tillåt att skriva \"odefinierade\" namn (standard)" -#: builtin/name-rev.c:539 +#: builtin/name-rev.c:548 msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" @@ -18231,61 +18517,61 @@ msgstr "git notes get-ref" msgid "Write/edit the notes for the following object:" msgstr "Skriv/redigera anteckningar för följande objekt:" -#: builtin/notes.c:150 +#: builtin/notes.c:149 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "kunde inte starta \"show\" för objektet \"%s\"" -#: builtin/notes.c:154 +#: builtin/notes.c:153 msgid "could not read 'show' output" msgstr "kunde inte läsa utdata från \"show\"" -#: builtin/notes.c:162 +#: builtin/notes.c:161 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "kunde inte avsluta \"show\" för objektet \"%s\"" -#: builtin/notes.c:197 +#: builtin/notes.c:194 msgid "please supply the note contents using either -m or -F option" msgstr "ange innehåll för anteckningen med antingen -m eller -F" -#: builtin/notes.c:206 +#: builtin/notes.c:203 msgid "unable to write note object" msgstr "kunde inte skriva anteckningsobjekt" -#: builtin/notes.c:208 +#: builtin/notes.c:206 #, c-format msgid "the note contents have been left in %s" msgstr "anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:242 builtin/tag.c:576 +#: builtin/notes.c:240 builtin/tag.c:581 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" -#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 -#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526 -#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672 +#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313 +#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524 +#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/notes.c:265 +#: builtin/notes.c:263 #, c-format msgid "failed to read object '%s'." msgstr "kunde inte läsa objektet \"%s\"." -#: builtin/notes.c:268 +#: builtin/notes.c:266 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "kan inte läsa anteckningsdata från icke-blob-objektet \"%s\"." -#: builtin/notes.c:309 +#: builtin/notes.c:307 #, c-format msgid "malformed input line: '%s'." msgstr "felaktig indatarad: \"%s\"." -#: builtin/notes.c:324 +#: builtin/notes.c:322 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\"" @@ -18293,48 +18579,48 @@ msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\"" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c:356 +#: builtin/notes.c:354 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "vägrar utföra \"%s\" på anteckningar i %s (utanför refs/notes/)" -#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 -#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 -#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 -#: builtin/prune-packed.c:25 builtin/tag.c:586 +#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507 +#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663 +#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987 +#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591 msgid "too many arguments" msgstr "för många argument" -#: builtin/notes.c:389 builtin/notes.c:678 +#: builtin/notes.c:387 builtin/notes.c:676 #, c-format msgid "no note found for object %s." msgstr "inga anteckningar hittades för objektet %s." -#: builtin/notes.c:410 builtin/notes.c:576 +#: builtin/notes.c:408 builtin/notes.c:574 msgid "note contents as a string" msgstr "anteckningsinnehåll som sträng" -#: builtin/notes.c:413 builtin/notes.c:579 +#: builtin/notes.c:411 builtin/notes.c:577 msgid "note contents in a file" msgstr "anteckningsinnehåll i en fil" -#: builtin/notes.c:416 builtin/notes.c:582 +#: builtin/notes.c:414 builtin/notes.c:580 msgid "reuse and edit specified note object" msgstr "återanvänd och redigera angivet anteckningsobjekt" -#: builtin/notes.c:419 builtin/notes.c:585 +#: builtin/notes.c:417 builtin/notes.c:583 msgid "reuse specified note object" msgstr "återanvänd angivet anteckningsobjekt" -#: builtin/notes.c:422 builtin/notes.c:588 +#: builtin/notes.c:420 builtin/notes.c:586 msgid "allow storing empty note" msgstr "tillåt lagra tom anteckning" -#: builtin/notes.c:423 builtin/notes.c:496 +#: builtin/notes.c:421 builtin/notes.c:494 msgid "replace existing notes" msgstr "ersätt befintliga anteckningar" -#: builtin/notes.c:448 +#: builtin/notes.c:446 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -18343,29 +18629,29 @@ msgstr "" "Kan inte lägga till anteckningar. Hittade befintliga anteckningar för " "objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:463 builtin/notes.c:544 +#: builtin/notes.c:461 builtin/notes.c:542 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Skriver över befintliga anteckningar för objektet %s\n" -#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902 +#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904 #, c-format msgid "Removing note for object %s\n" msgstr "Tar bort anteckning för objektet %s\n" -#: builtin/notes.c:497 +#: builtin/notes.c:495 msgid "read objects from stdin" msgstr "läs objekt från standard in" -#: builtin/notes.c:499 +#: builtin/notes.c:497 msgid "load rewriting config for <command> (implies --stdin)" msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)" -#: builtin/notes.c:517 +#: builtin/notes.c:515 msgid "too few arguments" msgstr "för få argument" -#: builtin/notes.c:538 +#: builtin/notes.c:536 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -18374,12 +18660,12 @@ msgstr "" "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet " "%s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:550 +#: builtin/notes.c:548 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "anteckningar på källobjektet %s saknas. Kan inte kopiera." -#: builtin/notes.c:603 +#: builtin/notes.c:601 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -18388,52 +18674,52 @@ msgstr "" "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n" "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n" -#: builtin/notes.c:698 +#: builtin/notes.c:696 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "misslyckades ta bort referensen NOTES_MERGE_PARTIAL" -#: builtin/notes.c:700 +#: builtin/notes.c:698 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "misslyckades ta bort referensen NOTES_MERGE_REF" -#: builtin/notes.c:702 +#: builtin/notes.c:700 msgid "failed to remove 'git notes merge' worktree" msgstr "misslyckades ta bort arbetskatalogen för \"git notes merge\"" -#: builtin/notes.c:722 +#: builtin/notes.c:720 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "misslyckades läsa references NOTES_MERGE_PARTIAL" -#: builtin/notes.c:724 +#: builtin/notes.c:722 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "kunde inte hitta incheckning från NOTES_MERGE_PARTIAL." -#: builtin/notes.c:726 +#: builtin/notes.c:724 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "kunde inte tolka incheckning från NOTES_MERGE_PARTIAL." -#: builtin/notes.c:739 +#: builtin/notes.c:737 msgid "failed to resolve NOTES_MERGE_REF" msgstr "misslyckades bestämma NOTES_MERGE_REF" -#: builtin/notes.c:742 +#: builtin/notes.c:740 msgid "failed to finalize notes merge" msgstr "misslyckades färdigställa sammanslagning av anteckningar" -#: builtin/notes.c:768 +#: builtin/notes.c:766 #, c-format msgid "unknown notes merge strategy %s" msgstr "okänd sammanslagningsstrategi för anteckningar: %s" -#: builtin/notes.c:784 +#: builtin/notes.c:782 msgid "General options" msgstr "Allmänna flaggor" -#: builtin/notes.c:786 +#: builtin/notes.c:784 msgid "Merge options" msgstr "Flaggor för sammanslagning" -#: builtin/notes.c:788 +#: builtin/notes.c:786 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -18441,48 +18727,48 @@ msgstr "" "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:790 +#: builtin/notes.c:788 msgid "Committing unmerged notes" msgstr "Checkar in ej sammanslagna anteckningar" -#: builtin/notes.c:792 +#: builtin/notes.c:790 msgid "finalize notes merge by committing unmerged notes" msgstr "" "färdigställ sammanslagning av anteckningar genom att checka in ej " "sammanslagna anteckningar" -#: builtin/notes.c:794 +#: builtin/notes.c:792 msgid "Aborting notes merge resolution" msgstr "Avbryt lösning av sammanslagning av anteckningar" -#: builtin/notes.c:796 +#: builtin/notes.c:794 msgid "abort notes merge" msgstr "avbryt sammanslagning av anteckningar" -#: builtin/notes.c:807 +#: builtin/notes.c:805 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "kan inte blanda --commit, --abort eller -s/--strategy" -#: builtin/notes.c:812 +#: builtin/notes.c:810 msgid "must specify a notes ref to merge" msgstr "måste ange en antecknings-referens att slå ihop" -#: builtin/notes.c:836 +#: builtin/notes.c:834 #, c-format msgid "unknown -s/--strategy: %s" msgstr "okänd -s/--strategy: %s" -#: builtin/notes.c:873 +#: builtin/notes.c:874 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "sammanslagning av anteckningar till %s är redan igångsatt på %s" -#: builtin/notes.c:876 +#: builtin/notes.c:878 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "misslyckades lagra länk till aktuell anteckningsreferens (%s)" -#: builtin/notes.c:878 +#: builtin/notes.c:880 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -18493,58 +18779,58 @@ msgstr "" "%s och checka in resultatet med \"git notes merge --commit\", eller avbryt " "sammanslagningen med \"git notes merge --abort\".\n" -#: builtin/notes.c:897 builtin/tag.c:589 +#: builtin/notes.c:899 builtin/tag.c:594 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/notes.c:900 +#: builtin/notes.c:902 #, c-format msgid "Object %s has no note\n" msgstr "Objektet %s har ingen anteckning\n" -#: builtin/notes.c:912 +#: builtin/notes.c:914 msgid "attempt to remove non-existent note is not an error" msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel" -#: builtin/notes.c:915 +#: builtin/notes.c:917 msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148 +#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" -#: builtin/notes.c:955 +#: builtin/notes.c:957 msgid "report pruned notes" msgstr "rapportera borttagna anteckningar" -#: builtin/notes.c:998 +#: builtin/notes.c:1000 msgid "notes-ref" msgstr "anteckningar-ref" -#: builtin/notes.c:999 +#: builtin/notes.c:1001 msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1034 builtin/stash.c:1739 +#: builtin/notes.c:1036 builtin/stash.c:1818 #, c-format msgid "unknown subcommand: %s" msgstr "okänt underkommando: %s" -#: builtin/pack-objects.c:54 +#: builtin/pack-objects.c:182 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:55 +#: builtin/pack-objects.c:183 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:440 +#: builtin/pack-objects.c:572 #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " @@ -18553,107 +18839,111 @@ msgstr "" "write_reuse_object: kunde inte hitta %s, förväntat på position %<PRIuMAX> i " "paketet %s" -#: builtin/pack-objects.c:448 +#: builtin/pack-objects.c:580 #, c-format msgid "bad packed object CRC for %s" msgstr "felaktig CRC för packat objekt %s" -#: builtin/pack-objects.c:459 +#: builtin/pack-objects.c:591 #, c-format msgid "corrupt packed object for %s" msgstr "trasigt packat objekt för %s" -#: builtin/pack-objects.c:590 +#: builtin/pack-objects.c:722 #, c-format msgid "recursive delta detected for object %s" msgstr "rekursivt delta upptäcktes för objektet %s" -#: builtin/pack-objects.c:801 +#: builtin/pack-objects.c:941 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "ordnade %u objekt, förväntade %<PRIu32>" -#: builtin/pack-objects.c:896 +#: builtin/pack-objects.c:1036 #, c-format msgid "expected object at offset %<PRIuMAX> in pack %s" msgstr "förväntade objekt på position %<PRIuMAX> i paketet %s" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1160 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:1028 +#: builtin/pack-objects.c:1173 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1089 builtin/update-index.c:90 +#: builtin/pack-objects.c:1235 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "misslyckades ta status på %s" -#: builtin/pack-objects.c:1141 +#: builtin/pack-objects.c:1268 +msgid "failed to write bitmap index" +msgstr "misslyckade skriva bitkarteindex" + +#: builtin/pack-objects.c:1294 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades" -#: builtin/pack-objects.c:1383 +#: builtin/pack-objects.c:1536 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:1831 +#: builtin/pack-objects.c:1984 #, 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:1840 +#: builtin/pack-objects.c:1993 #, 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:2121 +#: builtin/pack-objects.c:2274 msgid "Counting objects" msgstr "Räknar objekt" -#: builtin/pack-objects.c:2266 +#: builtin/pack-objects.c:2439 #, c-format msgid "unable to parse object header of %s" msgstr "kunde inte tolka objekthuvud för %s" -#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352 -#: builtin/pack-objects.c:2362 +#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525 +#: builtin/pack-objects.c:2535 #, c-format msgid "object %s cannot be read" msgstr "objektet %s kunde inte läsas" -#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366 +#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "objektet %s har inkonsistent objektlängd (%<PRIuMAX> mot %<PRIuMAX>)" -#: builtin/pack-objects.c:2376 +#: builtin/pack-objects.c:2549 msgid "suboptimal pack - out of memory" msgstr "icke-optimalt pack - minnet slut" -#: builtin/pack-objects.c:2691 +#: builtin/pack-objects.c:2864 #, c-format msgid "Delta compression using up to %d threads" msgstr "Deltakomprimering använder upp till %d trådar" -#: builtin/pack-objects.c:2830 +#: builtin/pack-objects.c:3003 #, 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:2916 +#: builtin/pack-objects.c:3089 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:3095 msgid "inconsistency with delta count" msgstr "deltaräknaren är inkonsekvent" -#: builtin/pack-objects.c:3001 +#: builtin/pack-objects.c:3174 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -18662,24 +18952,25 @@ msgstr "" "värdet på uploadpack.blobpackfileuri måste vara på formen '<objekt-hash> " "<paket-hash> <uri>' (fick '%s')" -#: builtin/pack-objects.c:3004 +#: builtin/pack-objects.c:3177 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "" "objektet redan konfigurerat i et annat uploadpack.blobpackfileuri (fick '%s)" -#: builtin/pack-objects.c:3039 +#: builtin/pack-objects.c:3212 #, c-format msgid "could not get type of object %s in pack %s" msgstr "kunde inte hämta typ för objektet %s i paketet %s" -#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175 +#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351 +#: builtin/pack-objects.c:3365 #, c-format msgid "could not find pack '%s'" msgstr "kunde inte hitta paketet \"%s\"" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3408 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -18688,7 +18979,7 @@ msgstr "" "förväntade kant-objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:3224 +#: builtin/pack-objects.c:3414 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -18697,248 +18988,244 @@ msgstr "" "förväntade objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:3322 +#: builtin/pack-objects.c:3507 msgid "invalid value for --missing" msgstr "ogiltigt värde för --missing" -#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490 +#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619 msgid "cannot open pack index" msgstr "kan inte öppna paketfilen" -#: builtin/pack-objects.c:3412 +#: builtin/pack-objects.c:3541 #, 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:3498 +#: builtin/pack-objects.c:3627 msgid "unable to force loose object" msgstr "kan inte tvinga lösa objekt" -#: builtin/pack-objects.c:3628 +#: builtin/pack-objects.c:3757 #, c-format msgid "not a rev '%s'" msgstr "inte en referens \"%s\"" -#: builtin/pack-objects.c:3631 +#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061 #, c-format msgid "bad revision '%s'" msgstr "felaktig revision \"%s\"" -#: builtin/pack-objects.c:3659 +#: builtin/pack-objects.c:3788 msgid "unable to add recent objects" msgstr "kan inte lägga till nya objekt" -#: builtin/pack-objects.c:3712 +#: builtin/pack-objects.c:3841 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:3716 +#: builtin/pack-objects.c:3845 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:3755 +#: builtin/pack-objects.c:3884 msgid "<version>[,<offset>]" msgstr "<version>[,<offset>]" -#: builtin/pack-objects.c:3756 +#: builtin/pack-objects.c:3885 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:3759 +#: builtin/pack-objects.c:3888 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:3761 +#: builtin/pack-objects.c:3890 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från supplerande objektlager" -#: builtin/pack-objects.c:3763 +#: builtin/pack-objects.c:3892 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:3765 +#: builtin/pack-objects.c:3894 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:3767 +#: builtin/pack-objects.c:3896 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:3769 +#: builtin/pack-objects.c:3898 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:3771 +#: builtin/pack-objects.c:3900 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:3773 +#: builtin/pack-objects.c:3902 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:3775 +#: builtin/pack-objects.c:3904 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:3777 +#: builtin/pack-objects.c:3906 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:3779 +#: builtin/pack-objects.c:3908 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:3781 +#: builtin/pack-objects.c:3910 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:3783 +#: builtin/pack-objects.c:3912 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:3786 +#: builtin/pack-objects.c:3915 msgid "include objects reachable from any reference" -msgstr "inkludera objekt som kan nås från någon referens" +msgstr "ta med objekt som kan nås från någon referens" -#: builtin/pack-objects.c:3789 +#: builtin/pack-objects.c:3918 msgid "include objects referred by reflog entries" -msgstr "inkludera objekt som refereras från referensloggposter" +msgstr "ta med objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:3792 +#: builtin/pack-objects.c:3921 msgid "include objects referred to by the index" -msgstr "inkludera objekt som refereras från indexet" +msgstr "ta med objekt som refereras från indexet" -#: builtin/pack-objects.c:3795 +#: builtin/pack-objects.c:3924 msgid "read packs from stdin" msgstr "läs paket från standard in" -#: builtin/pack-objects.c:3797 +#: builtin/pack-objects.c:3926 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:3799 +#: builtin/pack-objects.c:3928 msgid "include tag objects that refer to objects to be packed" -msgstr "inkludera taggobjekt som refererar objekt som ska packas" +msgstr "ta med taggobjekt som refererar objekt som ska packas" -#: builtin/pack-objects.c:3801 +#: builtin/pack-objects.c:3930 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:3803 +#: builtin/pack-objects.c:3932 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:3805 +#: builtin/pack-objects.c:3934 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:3808 +#: builtin/pack-objects.c:3937 msgid "use the sparse reachability algorithm" msgstr "använd gles-nåbarhetsalgoritmen" -#: builtin/pack-objects.c:3810 +#: builtin/pack-objects.c:3939 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:3812 +#: builtin/pack-objects.c:3941 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:3814 +#: builtin/pack-objects.c:3943 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:3816 +#: builtin/pack-objects.c:3945 msgid "ignore this pack" msgstr "ignorera detta paket" -#: builtin/pack-objects.c:3818 +#: builtin/pack-objects.c:3947 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:3820 +#: builtin/pack-objects.c:3949 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:3822 +#: builtin/pack-objects.c:3951 msgid "use a bitmap index if available to speed up counting objects" msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare" -#: builtin/pack-objects.c:3824 +#: builtin/pack-objects.c:3953 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:3828 +#: builtin/pack-objects.c:3957 msgid "write a bitmap index if possible" msgstr "skriv bitkartindex om möjligt" -#: builtin/pack-objects.c:3832 +#: builtin/pack-objects.c:3961 msgid "handling for missing objects" msgstr "hantering av saknade objekt" -#: builtin/pack-objects.c:3835 +#: builtin/pack-objects.c:3964 msgid "do not pack objects in promisor packfiles" msgstr "packa inte objekt i kontraktspackfiler" -#: builtin/pack-objects.c:3837 +#: builtin/pack-objects.c:3966 msgid "respect islands during delta compression" msgstr "respektera öar under deltakomprimering" -#: builtin/pack-objects.c:3839 +#: builtin/pack-objects.c:3968 msgid "protocol" msgstr "protokoll" -#: builtin/pack-objects.c:3840 +#: builtin/pack-objects.c:3969 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" "uteslut redan konfigurerade uploadpack.blobpackfileuri med detta protokoll" -#: builtin/pack-objects.c:3873 +#: builtin/pack-objects.c:4002 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "deltakedjedjupet %d är för djupt, påtvingar %d" -#: builtin/pack-objects.c:3878 +#: builtin/pack-objects.c:4007 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit är för högt, påtvingar %d" -#: builtin/pack-objects.c:3934 +#: builtin/pack-objects.c:4063 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size kan inte användas för att bygga ett paket som ska överföras" -#: builtin/pack-objects.c:3936 +#: builtin/pack-objects.c:4065 msgid "minimum pack size limit is 1 MiB" msgstr "minsta packstorlek är 1 MiB" -#: builtin/pack-objects.c:3941 +#: builtin/pack-objects.c:4070 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin kan inte användas för att bygga ett indexerbart paket" -#: builtin/pack-objects.c:3944 -msgid "--keep-unreachable and --unpack-unreachable are incompatible" -msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt" - -#: builtin/pack-objects.c:3950 +#: builtin/pack-objects.c:4079 msgid "cannot use --filter without --stdout" msgstr "kan inte använda --filter utan --stdout" -#: builtin/pack-objects.c:3952 +#: builtin/pack-objects.c:4081 msgid "cannot use --filter with --stdin-packs" msgstr "kan inte använda --filter med --stdin-packs" -#: builtin/pack-objects.c:3956 +#: builtin/pack-objects.c:4085 msgid "cannot use internal rev list with --stdin-packs" msgstr "kan inte använda intern revisionslista med --stdin-packs" -#: builtin/pack-objects.c:4015 +#: builtin/pack-objects.c:4144 msgid "Enumerating objects" msgstr "Räknar upp objekt" -#: builtin/pack-objects.c:4052 +#: builtin/pack-objects.c:4180 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -18981,19 +19268,19 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]" -#: builtin/prune.c:133 +#: builtin/prune.c:145 msgid "report pruned objects" msgstr "rapportera borttagna objekt" -#: builtin/prune.c:136 +#: builtin/prune.c:148 msgid "expire objects older than <time>" msgstr "låt tid gå ut för objekt äldre än <tid>" -#: builtin/prune.c:138 +#: builtin/prune.c:150 msgid "limit traversal to objects outside promisor packfiles" msgstr "begränsa vandring av objekt utanför kontraktspackfiler." -#: builtin/prune.c:152 +#: builtin/prune.c:163 msgid "cannot prune in a precious-objects repo" msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv" @@ -19006,44 +19293,48 @@ msgstr "Felaktigt värde för %s: %s" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/pull.c:123 +#: builtin/pull.c:124 msgid "control for recursive fetching of submodules" msgstr "styrning för rekursiv hämtning av undermoduler" -#: builtin/pull.c:127 +#: builtin/pull.c:128 msgid "Options related to merging" msgstr "Alternativ gällande sammanslagning" -#: builtin/pull.c:130 +#: builtin/pull.c:131 msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" -#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126 +#: builtin/pull.c:159 builtin/revert.c:126 msgid "allow fast-forward" msgstr "tillåt snabbspolning" -#: builtin/pull.c:167 parse-options.h:340 +#: builtin/pull.c:165 +msgid "control use of pre-merge-commit and commit-msg hooks" +msgstr "styr användning av pre-merge-commit- och commit-msg-krokar" + +#: builtin/pull.c:171 parse-options.h:340 msgid "automatically stash/stash pop before and after" msgstr "utför automatiskt stash/stash pop före och efter" -#: builtin/pull.c:183 +#: builtin/pull.c:187 msgid "Options related to fetching" msgstr "Alternativ gällande hämtningar" -#: builtin/pull.c:193 +#: builtin/pull.c:197 msgid "force overwrite of local branch" msgstr "tvinga överskrivning av lokal gren" -#: builtin/pull.c:201 +#: builtin/pull.c:205 msgid "number of submodules pulled in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/pull.c:317 +#: builtin/pull.c:321 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Felaktigt värde för pull.ff: %s" -#: builtin/pull.c:445 +#: builtin/pull.c:449 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -19051,14 +19342,14 @@ msgstr "" "Det finns ingen kandidat för ombasering bland referenserna du precis har " "hämtat." -#: builtin/pull.c:447 +#: builtin/pull.c:451 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Det finns ingen kandidat för sammanslagning bland referenserna du precis har " "hämtat." -#: builtin/pull.c:448 +#: builtin/pull.c:452 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -19066,7 +19357,7 @@ msgstr "" "Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n" "motsvarade något i fjärränden." -#: builtin/pull.c:451 +#: builtin/pull.c:455 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -19077,41 +19368,42 @@ msgstr "" "gren. Eftersom det inte är den fjärr som är konfigurerad som\n" "standard för aktuell gren måste du ange en gren på kommandoraden." -#: builtin/pull.c:456 builtin/rebase.c:1248 +#: builtin/pull.c:460 builtin/rebase.c:951 msgid "You are not currently on a branch." msgstr "Du är inte på någon gren för närvarande." -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:462 builtin/pull.c:477 msgid "Please specify which branch you want to rebase against." msgstr "Ange vilken gren du vill ombasera mot." -#: builtin/pull.c:460 builtin/pull.c:475 +#: builtin/pull.c:464 builtin/pull.c:479 msgid "Please specify which branch you want to merge with." msgstr "Ange vilken gren du vill slå samman med." -#: builtin/pull.c:461 builtin/pull.c:476 +#: builtin/pull.c:465 builtin/pull.c:480 msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." -#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 -#: builtin/rebase.c:1254 +#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482 +#: builtin/rebase.c:957 msgid "<remote>" msgstr "<fjärr>" -#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483 +#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487 +#: contrib/scalar/scalar.c:375 msgid "<branch>" msgstr "<gren>" -#: builtin/pull.c:471 builtin/rebase.c:1246 +#: builtin/pull.c:475 builtin/rebase.c:949 msgid "There is no tracking information for the current branch." msgstr "Det finns ingen spårningsinformation för aktuell gren." -#: builtin/pull.c:480 +#: builtin/pull.c:484 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:" -#: builtin/pull.c:485 +#: builtin/pull.c:489 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -19120,22 +19412,22 @@ msgstr "" "Dina inställningar anger sammanslagning med referensen \"%s\"\n" "från fjärren, men någon sådan referens togs inte emot." -#: builtin/pull.c:596 +#: builtin/pull.c:600 #, c-format msgid "unable to access commit %s" msgstr "kunde inte komma åt incheckningen %s" -#: builtin/pull.c:902 +#: builtin/pull.c:908 msgid "ignoring --verify-signatures for rebase" msgstr "ignorera --verify-signatures för ombasering" -#: builtin/pull.c:930 +#: builtin/pull.c:969 msgid "" -"Pulling without specifying how to reconcile divergent branches is\n" -"discouraged. You can squelch this message by running one of the following\n" -"commands sometime before your next pull:\n" +"You have divergent branches and need to specify how to reconcile them.\n" +"You can do so by running one of the following commands sometime before\n" +"your next pull:\n" "\n" -" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase false # merge\n" " git config pull.rebase true # rebase\n" " git config pull.ff only # fast-forward only\n" "\n" @@ -19145,11 +19437,11 @@ msgid "" "or --ff-only on the command line to override the configured default per\n" "invocation.\n" msgstr "" -"Det avråds från att göra \"pull\" utan att ange hur avvikande grenar\n" -"ska förlikas. Du kan ta bort det här meddelandet genom att köra ett av\n" -"följande kommandon innan du gör \"pull\" nästa gång: \n" +"Du har avvikande grenar och måste ange hur de skall förlikas.\n" +"Du kan göra detta genom att köra ett av följande kommando innan du\n" +"gör \"pull\" nästa gång: \n" "\n" -" git config pull.rebase false # sammanslagning (förvald strategi)\n" +" git config pull.rebase false # sammanslagning\n" " git config pull.rebase true # ombasering\n" " git config pull.ff only # endast snabbspolning\n" "\n" @@ -19158,19 +19450,19 @@ msgstr "" "eller --ff-only på kommandoraden för att överstyra det konfigurerade\n" "förvalet vid körning.\n" -#: builtin/pull.c:991 +#: builtin/pull.c:1046 msgid "Updating an unborn branch with changes added to the index." msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet." -#: builtin/pull.c:995 +#: builtin/pull.c:1050 msgid "pull with rebase" msgstr "pull med ombasering" -#: builtin/pull.c:996 +#: builtin/pull.c:1051 msgid "please commit or stash them." msgstr "checka in eller använd \"stash\" på dem." -#: builtin/pull.c:1021 +#: builtin/pull.c:1076 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -19181,7 +19473,7 @@ msgstr "" "snabbspolar din arbetskatalog från\n" "incheckningen %s." -#: builtin/pull.c:1027 +#: builtin/pull.c:1082 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -19198,15 +19490,23 @@ msgstr "" "$ git reset --hard\n" "för att återgå." -#: builtin/pull.c:1042 +#: builtin/pull.c:1097 msgid "Cannot merge multiple branches into empty head." msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: builtin/pull.c:1046 +#: builtin/pull.c:1102 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpå flera grenar." -#: builtin/pull.c:1067 +#: builtin/pull.c:1104 +msgid "Cannot fast-forward to multiple branches." +msgstr "Kan inte snabbspola till flera grenar." + +#: builtin/pull.c:1119 +msgid "Need to specify how to reconcile divergent branches." +msgstr "Måste ange hur avvikande grenar skall förlikas." + +#: builtin/pull.c:1133 msgid "cannot rebase with locally recorded submodule modifications" msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" @@ -19271,7 +19571,7 @@ msgstr "" "\n" " git push %s HEAD:<namn-på-fjärrgren>\n" -#: builtin/push.c:194 +#: builtin/push.c:191 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -19284,12 +19584,19 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:202 +#: builtin/push.c:199 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända." -#: builtin/push.c:205 +#: builtin/push.c:217 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" +"Du angav inga referensspecifikationer att sända, och push.default är " +"\"nothing\"." + +#: builtin/push.c:243 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -19300,14 +19607,7 @@ msgstr "" "aktuella grenen \"%s\", utan att tala om för mig vad som\n" "ska sändas för att uppdatera fjärrgrenen." -#: builtin/push.c:260 -msgid "" -"You didn't specify any refspecs to push, and push.default is \"nothing\"." -msgstr "" -"Du angav inga referensspecifikationer att sända, och push.default är " -"\"nothing\"." - -#: builtin/push.c:267 +#: builtin/push.c:258 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -19319,7 +19619,7 @@ msgstr "" "\"git pull ....\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:273 +#: builtin/push.c:264 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -19331,7 +19631,7 @@ msgstr "" "\"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:279 +#: builtin/push.c:270 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -19345,11 +19645,11 @@ msgstr "" "(t.ex. \"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer." -#: builtin/push.c:286 +#: builtin/push.c:277 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren." -#: builtin/push.c:289 +#: builtin/push.c:280 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -19360,7 +19660,7 @@ msgstr "" "pekar på något som inte är en incheckning, utan att använda flaggan\n" "\"--force\".\n" -#: builtin/push.c:294 +#: builtin/push.c:285 msgid "" "Updates were rejected because the tip of the remote-tracking\n" "branch has been updated since the last checkout. You may want\n" @@ -19372,103 +19672,99 @@ msgstr "" "fjärrändringarna lokalt (t.ex \"git pull ....\") innan du\n" "tvingar en uppdatering.\n" -#: builtin/push.c:364 +#: builtin/push.c:355 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:371 +#: builtin/push.c:362 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:553 +#: builtin/push.c:544 builtin/submodule--helper.c:3259 msgid "repository" msgstr "arkiv" -#: builtin/push.c:554 builtin/send-pack.c:189 +#: builtin/push.c:545 builtin/send-pack.c:193 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:555 builtin/send-pack.c:191 +#: builtin/push.c:546 builtin/send-pack.c:195 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:557 +#: builtin/push.c:548 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:558 +#: builtin/push.c:549 msgid "push tags (can't be used with --all or --mirror)" msgstr "sänd taggar (kan inte användas med --all eller --mirror)" -#: builtin/push.c:561 builtin/send-pack.c:192 +#: builtin/push.c:552 builtin/send-pack.c:196 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:562 builtin/send-pack.c:204 +#: builtin/push.c:553 builtin/send-pack.c:208 msgid "<refname>:<expect>" msgstr "<refnamn>:<förvänta>" -#: builtin/push.c:563 builtin/send-pack.c:205 +#: builtin/push.c:554 builtin/send-pack.c:209 msgid "require old value of ref to be at this value" msgstr "kräv att ref:s tidigare värde är detta" -#: builtin/push.c:566 builtin/send-pack.c:208 +#: builtin/push.c:557 builtin/send-pack.c:212 msgid "require remote updates to be integrated locally" msgstr "kräv att fjärruppdateringar har integrerats lokalt" -#: builtin/push.c:569 +#: builtin/push.c:560 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:570 builtin/send-pack.c:199 +#: builtin/push.c:561 builtin/send-pack.c:203 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 -#: builtin/send-pack.c:187 +#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190 +#: builtin/send-pack.c:191 msgid "receive pack program" msgstr "program för att ta emot paket" -#: builtin/push.c:573 +#: builtin/push.c:564 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:576 +#: builtin/push.c:567 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:578 +#: builtin/push.c:569 msgid "bypass pre-push hook" msgstr "förbigå pre-push-krok" -#: builtin/push.c:579 +#: builtin/push.c:570 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:581 builtin/send-pack.c:193 +#: builtin/push.c:572 builtin/send-pack.c:197 msgid "GPG sign the push" msgstr "GPG-signera insändningen" -#: builtin/push.c:583 builtin/send-pack.c:200 +#: builtin/push.c:574 builtin/send-pack.c:204 msgid "request atomic transaction on remote side" msgstr "begär atomiska transaktioner på fjärrsidan" -#: builtin/push.c:601 -msgid "--delete is incompatible with --all, --mirror and --tags" -msgstr "--delete är inkompatibel med --all, --mirror och --tags" - -#: builtin/push.c:603 +#: builtin/push.c:594 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" -#: builtin/push.c:623 +#: builtin/push.c:614 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:624 +#: builtin/push.c:615 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -19489,27 +19785,15 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:639 -msgid "--all and --tags are incompatible" -msgstr "--all och --tags är inkompatibla" - -#: builtin/push.c:641 +#: builtin/push.c:632 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:645 -msgid "--mirror and --tags are incompatible" -msgstr "--mirror och --tags är inkompatibla" - -#: builtin/push.c:647 +#: builtin/push.c:638 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:650 -msgid "--all and --mirror are incompatible" -msgstr "--all och --mirror är inkompatibla" - -#: builtin/push.c:657 +#: builtin/push.c:648 msgid "push options must not have new line characters" msgstr "push-flaggor kan inte innehålla radbrytning" @@ -19562,82 +19846,82 @@ msgstr "behöver två incheckningsintervall" #: builtin/read-tree.c:41 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " -"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" -"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" +"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-" +"ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " -"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" -"index-output=<fil>] (--empty | <träd-igt1> [<träd-igt2> [<träd-igt3>]])" +"[-u | -i]] [--no-sparse-checkout] [--index-output=<fil>] (--empty | <träd-" +"igt1> [<träd-igt2> [<träd-igt3>]])" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:116 msgid "write resulting index to <file>" msgstr "skriv resulterande index till <fil>" -#: builtin/read-tree.c:127 +#: builtin/read-tree.c:119 msgid "only empty the index" msgstr "töm bara indexet" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c:121 msgid "Merging" msgstr "Sammanslagning" -#: builtin/read-tree.c:131 +#: builtin/read-tree.c:123 msgid "perform a merge in addition to a read" msgstr "utför en sammanslagning i tillägg till en läsning" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:125 msgid "3-way merge if no file level merging required" msgstr "3-vägssammanslagning om sammanslagning på filnivå ej krävs" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:127 msgid "3-way merge in presence of adds and removes" msgstr "3-vägssammanslagning när det finns tillägg och borttagningar" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:129 msgid "same as -m, but discard unmerged entries" msgstr "som -m, men kasta bort ej sammanslagna poster" -#: builtin/read-tree.c:138 +#: builtin/read-tree.c:130 msgid "<subdirectory>/" msgstr "<underkatalog>/" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:131 msgid "read the tree into the index under <subdirectory>/" msgstr "läs in trädet i indexet under <underkatalog>/" -#: builtin/read-tree.c:142 +#: builtin/read-tree.c:134 msgid "update working tree with merge result" msgstr "uppdatera arbetskatalogen med resultatet från sammanslagningen" -#: builtin/read-tree.c:144 +#: builtin/read-tree.c:136 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:145 +#: builtin/read-tree.c:137 msgid "allow explicitly ignored files to be overwritten" msgstr "tillåt explicit ignorerade filer att skrivas över" -#: builtin/read-tree.c:148 +#: builtin/read-tree.c:140 msgid "don't check the working tree after merging" msgstr "kontrollera inte arbetskatalogen efter sammanslagning" -#: builtin/read-tree.c:149 +#: builtin/read-tree.c:141 msgid "don't update the index or the work tree" msgstr "uppdatera inte indexet eller arbetskatalogen" -#: builtin/read-tree.c:151 +#: builtin/read-tree.c:143 msgid "skip applying sparse checkout filter" msgstr "hoppa över att applicera filter för gles utcheckning" -#: builtin/read-tree.c:153 +#: builtin/read-tree.c:145 msgid "debug unpack-trees" msgstr "felsök unpack-trees" -#: builtin/read-tree.c:157 +#: builtin/read-tree.c:149 msgid "suppress feedback messages" msgstr "undertryck återkopplingsmeddelanden" -#: builtin/read-tree.c:188 +#: builtin/read-tree.c:183 msgid "You need to resolve your current index first" msgstr "Du måste lösa ditt befintliga index först" @@ -19659,193 +19943,44 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245 -#, c-format -msgid "unusable todo list: '%s'" -msgstr "oanvändbar todo-lista: %s" - -#: builtin/rebase.c:311 +#: builtin/rebase.c:230 #, c-format msgid "could not create temporary %s" msgstr "kunde inte skapa temporär %s" -#: builtin/rebase.c:317 +#: builtin/rebase.c:236 msgid "could not mark as interactive" msgstr "kunde inte markera som interaktiv" -#: builtin/rebase.c:370 +#: builtin/rebase.c:289 msgid "could not generate todo list" msgstr "Kunde inte skapa attgöra-lista" -#: builtin/rebase.c:412 +#: builtin/rebase.c:331 msgid "a base commit must be provided with --upstream or --onto" msgstr "en basincheckning måste anges med --upstream eller --onto" -#: builtin/rebase.c:481 -msgid "git rebase--interactive [<options>]" -msgstr "git rebase--interactive [<flaggor>]" - -#: builtin/rebase.c:494 builtin/rebase.c:1389 -msgid "keep commits which start empty" -msgstr "behåller incheckningar som är tomma från början" - -#: builtin/rebase.c:498 builtin/revert.c:128 -msgid "allow commits with empty messages" -msgstr "tillåt incheckningar med tomt meddelande" - -#: builtin/rebase.c:500 -msgid "rebase merge commits" -msgstr "ombasera sammanslagningar" - -#: builtin/rebase.c:502 -msgid "keep original branch points of cousins" -msgstr "behåll ursprungliga förgreningspunkter för kusiner" - -#: builtin/rebase.c:504 -msgid "move commits that begin with squash!/fixup!" -msgstr "flytta incheckningar som inleds med squash!/fixup!" - -#: builtin/rebase.c:505 -msgid "sign commits" -msgstr "signera incheckningar" - -#: builtin/rebase.c:507 builtin/rebase.c:1328 -msgid "display a diffstat of what changed upstream" -msgstr "vis diffstat för vad som ändrats uppströms" - -#: builtin/rebase.c:509 -msgid "continue rebase" -msgstr "fortsätt ombasering" - -#: builtin/rebase.c:511 -msgid "skip commit" -msgstr "hoppa över incheckning" - -#: builtin/rebase.c:512 -msgid "edit the todo list" -msgstr "redigera attgöra-listan" - -#: builtin/rebase.c:514 -msgid "show the current patch" -msgstr "visa nuvarande patch" - -#: builtin/rebase.c:517 -msgid "shorten commit ids in the todo list" -msgstr "förkorta inchecknings-id i todo-listan" - -#: builtin/rebase.c:519 -msgid "expand commit ids in the todo list" -msgstr "utöka inchecknings-id i todo-listan" - -#: builtin/rebase.c:521 -msgid "check the todo list" -msgstr "kontrollera todo-listan" - -#: builtin/rebase.c:523 -msgid "rearrange fixup/squash lines" -msgstr "ordna om fixup-/squash-rader" - -#: builtin/rebase.c:525 -msgid "insert exec commands in todo list" -msgstr "lägg in exec-kommandon i todo-listan" - -#: builtin/rebase.c:526 -msgid "onto" -msgstr "ovanpå" - -#: builtin/rebase.c:529 -msgid "restrict-revision" -msgstr "restrict-revision" - -#: builtin/rebase.c:529 -msgid "restrict revision" -msgstr "begränsa revision" - -#: builtin/rebase.c:531 -msgid "squash-onto" -msgstr "squash-onto" - -#: builtin/rebase.c:532 -msgid "squash onto" -msgstr "tryck ihop ovanpå" - -#: builtin/rebase.c:534 -msgid "the upstream commit" -msgstr "uppströmsincheckningen" - -#: builtin/rebase.c:536 -msgid "head-name" -msgstr "head-name" - -#: builtin/rebase.c:536 -msgid "head name" -msgstr "namn på huvud" - -#: builtin/rebase.c:541 -msgid "rebase strategy" -msgstr "sammanslagningsstrategi" - -#: builtin/rebase.c:542 -msgid "strategy-opts" -msgstr "strategy-opts" - -#: builtin/rebase.c:543 -msgid "strategy options" -msgstr "strategiflaggor" - -#: builtin/rebase.c:544 -msgid "switch-to" -msgstr "switch-to" - -#: builtin/rebase.c:545 -msgid "the branch or commit to checkout" -msgstr "gren eller inchecking att checka ut" - -#: builtin/rebase.c:546 -msgid "onto-name" -msgstr "onto-name" - -#: builtin/rebase.c:546 -msgid "onto name" -msgstr "på-namn" - -#: builtin/rebase.c:547 -msgid "cmd" -msgstr "kmd" - -#: builtin/rebase.c:547 -msgid "the command to run" -msgstr "kommando att köra" - -#: builtin/rebase.c:550 builtin/rebase.c:1422 -msgid "automatically re-schedule any `exec` that fails" -msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt" - -#: builtin/rebase.c:566 -msgid "--[no-]rebase-cousins has no effect without --rebase-merges" -msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges" - -#: builtin/rebase.c:582 +#: builtin/rebase.c:390 #, c-format msgid "%s requires the merge backend" msgstr "%s kräver \"merge\"-bakändan" -#: builtin/rebase.c:625 +#: builtin/rebase.c:432 #, c-format msgid "could not get 'onto': '%s'" msgstr "kunde inte hämta \"onto\": \"%s\"" -#: builtin/rebase.c:642 +#: builtin/rebase.c:449 #, c-format msgid "invalid orig-head: '%s'" msgstr "ogiltigt orig-head: \"%s\"" -#: builtin/rebase.c:667 +#: builtin/rebase.c:474 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\"" -#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:597 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -19859,7 +19994,7 @@ msgstr "" "För att avbryta och återgå till där du var före ombaseringen, kör \"git " "rebase --abort\"." -#: builtin/rebase.c:896 +#: builtin/rebase.c:680 #, c-format msgid "" "\n" @@ -19878,7 +20013,7 @@ msgstr "" "\n" "Därför kan inte git ombasera dessa." -#: builtin/rebase.c:1222 +#: builtin/rebase.c:925 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" @@ -19886,7 +20021,7 @@ msgid "" msgstr "" "okänd tom-typ \"%s\"; giltiga värden är \"drop\", \"keep\" och \"ask\"." -#: builtin/rebase.c:1240 +#: builtin/rebase.c:943 #, c-format msgid "" "%s\n" @@ -19903,7 +20038,7 @@ msgstr "" " git rebase '<gren>'\n" "\n" -#: builtin/rebase.c:1256 +#: builtin/rebase.c:959 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -19916,182 +20051,180 @@ msgstr "" " git branch --set-upstream-to=%s/<gren> %s\n" "\n" -#: builtin/rebase.c:1286 +#: builtin/rebase.c:989 msgid "exec commands cannot contain newlines" msgstr "exec-kommandon kan inte innehålla nyradstecken" -#: builtin/rebase.c:1290 +#: builtin/rebase.c:993 msgid "empty exec command" msgstr "tomt exec-kommando" -#: builtin/rebase.c:1319 +#: builtin/rebase.c:1023 msgid "rebase onto given branch instead of upstream" msgstr "ombasera mot given grenen istället för uppström" -#: builtin/rebase.c:1321 +#: builtin/rebase.c:1025 msgid "use the merge-base of upstream and branch as the current base" msgstr "använd sammanslagningsbasen mellan uppströms och gren som aktuell bas" -#: builtin/rebase.c:1323 +#: builtin/rebase.c:1027 msgid "allow pre-rebase hook to run" msgstr "tillåt pre-rebase-krok att köra" -#: builtin/rebase.c:1325 +#: builtin/rebase.c:1029 msgid "be quiet. implies --no-stat" msgstr "var tyst. implicerar --no-stat" -#: builtin/rebase.c:1331 +#: builtin/rebase.c:1032 +msgid "display a diffstat of what changed upstream" +msgstr "vis diffstat för vad som ändrats uppströms" + +#: builtin/rebase.c:1035 msgid "do not show diffstat of what changed upstream" msgstr "visa inte en diffstat för vad som ändrats uppströms" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1038 msgid "add a Signed-off-by trailer to each commit" msgstr "lägg \"Signed-off-by:\"-släprad till varje incheckning" -#: builtin/rebase.c:1337 +#: builtin/rebase.c:1041 msgid "make committer date match author date" msgstr "sätt incheckningsdatum till författardatum" -#: builtin/rebase.c:1339 +#: builtin/rebase.c:1043 msgid "ignore author date and use current date" msgstr "ignorera författardatum och använd nuvarande" -#: builtin/rebase.c:1341 +#: builtin/rebase.c:1045 msgid "synonym of --reset-author-date" msgstr "synonym för --reset-author-date" -#: builtin/rebase.c:1343 builtin/rebase.c:1347 +#: builtin/rebase.c:1047 builtin/rebase.c:1051 msgid "passed to 'git apply'" msgstr "sänds till \"git apply\"" -#: builtin/rebase.c:1345 +#: builtin/rebase.c:1049 msgid "ignore changes in whitespace" msgstr "ignorera ändringar i blanksteg" -#: builtin/rebase.c:1349 builtin/rebase.c:1352 +#: builtin/rebase.c:1053 builtin/rebase.c:1056 msgid "cherry-pick all commits, even if unchanged" msgstr "utför cherry-pick på alla incheckningar, även om oändrad" -#: builtin/rebase.c:1354 +#: builtin/rebase.c:1058 msgid "continue" msgstr "fortsätt" -#: builtin/rebase.c:1357 +#: builtin/rebase.c:1061 msgid "skip current patch and continue" msgstr "hoppa över nuvarande patch och fortsätt" -#: builtin/rebase.c:1359 +#: builtin/rebase.c:1063 msgid "abort and check out the original branch" msgstr "avbryt och checka ut ursprungsgrenen" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1066 msgid "abort but keep HEAD where it is" msgstr "avbryt men behåll HEAD där det är" -#: builtin/rebase.c:1363 +#: builtin/rebase.c:1067 msgid "edit the todo list during an interactive rebase" msgstr "redigera attgöra-listan under interaktiv ombasering." -#: builtin/rebase.c:1366 +#: builtin/rebase.c:1070 msgid "show the patch file being applied or merged" msgstr "visa patchen som tillämpas eller slås samman" -#: builtin/rebase.c:1369 +#: builtin/rebase.c:1073 msgid "use apply strategies to rebase" msgstr "använd appliceringstrategier för ombasering" -#: builtin/rebase.c:1373 +#: builtin/rebase.c:1077 msgid "use merging strategies to rebase" msgstr "använd sammanslagningsstrategier för ombasering" -#: builtin/rebase.c:1377 +#: builtin/rebase.c:1081 msgid "let the user edit the list of commits to rebase" msgstr "låt användaren redigera listan över incheckningar att ombasera" -#: builtin/rebase.c:1381 +#: builtin/rebase.c:1085 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" "(AVRÅDS) försök återskapa sammanslagningar istället för att ignorera dem" -#: builtin/rebase.c:1386 +#: builtin/rebase.c:1090 msgid "how to handle commits that become empty" msgstr "hur incheckningar som blir tomma ska hanteras" -#: builtin/rebase.c:1393 +#: builtin/rebase.c:1093 +msgid "keep commits which start empty" +msgstr "behåller incheckningar som är tomma från början" + +#: builtin/rebase.c:1097 msgid "move commits that begin with squash!/fixup! under -i" msgstr "flytta incheckningar som börjar med squash!/fixup! under -i" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1104 msgid "add exec lines after each commit of the editable list" msgstr "lägg till exec-rader efter varje incheckning i den redigerbara listan" -#: builtin/rebase.c:1404 +#: builtin/rebase.c:1108 msgid "allow rebasing commits with empty messages" msgstr "tillåt ombasering av incheckningar med tomt meddelande" -#: builtin/rebase.c:1408 +#: builtin/rebase.c:1112 msgid "try to rebase merges instead of skipping them" msgstr "försök ombasera sammanslagningar istället för att ignorera dem" -#: builtin/rebase.c:1411 +#: builtin/rebase.c:1115 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "använd \"merge-base --fork-point\" för att förfina uppström" -#: builtin/rebase.c:1413 +#: builtin/rebase.c:1117 msgid "use the given merge strategy" msgstr "använd angiven sammanslagningsstrategi" -#: builtin/rebase.c:1415 builtin/revert.c:115 +#: builtin/rebase.c:1119 builtin/revert.c:115 msgid "option" msgstr "alternativ" -#: builtin/rebase.c:1416 +#: builtin/rebase.c:1120 msgid "pass the argument through to the merge strategy" msgstr "sänd flaggan till sammanslagningsstrategin" -#: builtin/rebase.c:1419 +#: builtin/rebase.c:1123 msgid "rebase all reachable commits up to the root(s)" msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna" -#: builtin/rebase.c:1424 +#: builtin/rebase.c:1126 +msgid "automatically re-schedule any `exec` that fails" +msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt" + +#: builtin/rebase.c:1128 msgid "apply all changes, even those already present upstream" msgstr "applicera alla ändringar, även de som redan finns uppströms" -#: builtin/rebase.c:1442 +#: builtin/rebase.c:1149 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera." -#: builtin/rebase.c:1483 -msgid "" -"git rebase --preserve-merges is deprecated. Use --rebase-merges instead." -msgstr "" -"git rebase --preserve-merges avråds från. Använd --rebase-merges istället." - -#: builtin/rebase.c:1488 -msgid "cannot combine '--keep-base' with '--onto'" -msgstr "kan inte kombinera \"--keep-base\" med \"--onto\"" +#: builtin/rebase.c:1180 +msgid "--preserve-merges was replaced by --rebase-merges" +msgstr "--preserve-merges har ersatts av --rebase-merges" -#: builtin/rebase.c:1490 -msgid "cannot combine '--keep-base' with '--root'" -msgstr "kan inte kombinera \"--keep-base\" med \"--root\"" - -#: builtin/rebase.c:1494 -msgid "cannot combine '--root' with '--fork-point'" -msgstr "kan inte kombinera \"--root\" med \"--fork-point\"" - -#: builtin/rebase.c:1497 +#: builtin/rebase.c:1202 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: builtin/rebase.c:1501 +#: builtin/rebase.c:1206 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering." -#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: builtin/rebase.c:1536 +#: builtin/rebase.c:1241 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -20099,16 +20232,16 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1260 msgid "could not discard worktree changes" msgstr "kunde inte kasta ändringar i arbetskatalogen" -#: builtin/rebase.c:1574 +#: builtin/rebase.c:1279 #, c-format msgid "could not move back to %s" msgstr "kunde inte flytta tillbaka till %s" -#: builtin/rebase.c:1620 +#: builtin/rebase.c:1325 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -20129,143 +20262,133 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där.\n" -#: builtin/rebase.c:1648 +#: builtin/rebase.c:1353 msgid "switch `C' expects a numerical value" msgstr "flaggan \"C\" förväntar ett numeriskt värde" -#: builtin/rebase.c:1690 +#: builtin/rebase.c:1395 #, c-format msgid "Unknown mode: %s" msgstr "Okänt läge: %s" -#: builtin/rebase.c:1729 +#: builtin/rebase.c:1434 msgid "--strategy requires --merge or --interactive" msgstr "--strategy kräver --merge eller --interactive" -#: builtin/rebase.c:1759 -msgid "cannot combine apply options with merge options" -msgstr "kan inte kombinera apply-flaggor med merge-flaggor" +#: builtin/rebase.c:1463 +msgid "apply options and merge options cannot be used together" +msgstr "" +"appliceringsflaggor och sammanslagningsflaggor kan inte användas tillsammans" -#: builtin/rebase.c:1772 +#: builtin/rebase.c:1476 #, c-format msgid "Unknown rebase backend: %s" msgstr "Okänd rebase-bakända: %s" -#: builtin/rebase.c:1802 +#: builtin/rebase.c:1505 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec kräver --exec eller --interactive" -#: builtin/rebase.c:1822 -msgid "cannot combine '--preserve-merges' with '--rebase-merges'" -msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\"" - -#: builtin/rebase.c:1826 -msgid "" -"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" -msgstr "" -"fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec" -"\"" - -#: builtin/rebase.c:1850 +#: builtin/rebase.c:1536 #, c-format msgid "invalid upstream '%s'" msgstr "felaktig uppström \"%s\"" -#: builtin/rebase.c:1856 +#: builtin/rebase.c:1542 msgid "Could not create new root commit" msgstr "kunde inte skapa ny rotincheckning" -#: builtin/rebase.c:1882 +#: builtin/rebase.c:1568 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "\"%s\": behöver precis en sammanslagningsbas med gren" -#: builtin/rebase.c:1885 +#: builtin/rebase.c:1571 #, c-format msgid "'%s': need exactly one merge base" msgstr "\"%s\": behöver precis en sammanslagningsbas" -#: builtin/rebase.c:1893 +#: builtin/rebase.c:1580 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "Pekar inte på en giltig incheckning: \"%s\"" -#: builtin/rebase.c:1921 +#: builtin/rebase.c:1607 #, c-format -msgid "fatal: no such branch/commit '%s'" -msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\"" +msgid "no such branch/commit '%s'" +msgstr "ingen sådan gren/incheckning: \"%s\"" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:2415 +#: builtin/rebase.c:1618 builtin/submodule--helper.c:39 +#: builtin/submodule--helper.c:2659 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:1629 msgid "Could not resolve HEAD to a revision" msgstr "Kunde inte bestämma HEAD:s incheckning" -#: builtin/rebase.c:1961 +#: builtin/rebase.c:1650 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: builtin/rebase.c:1997 +#: builtin/rebase.c:1686 #, c-format msgid "could not switch to %s" msgstr "kunde inte växla till %s" -#: builtin/rebase.c:2008 +#: builtin/rebase.c:1697 msgid "HEAD is up to date." msgstr "HEAD är à jour." -#: builtin/rebase.c:2010 +#: builtin/rebase.c:1699 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Aktuell gren %s är à jour.\n" -#: builtin/rebase.c:2018 +#: builtin/rebase.c:1707 msgid "HEAD is up to date, rebase forced." msgstr "HEAD är à jour, ombasering framtvingad." -#: builtin/rebase.c:2020 +#: builtin/rebase.c:1709 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Aktuell gren %s är à jour, ombasering framtvingad.\n" -#: builtin/rebase.c:2028 +#: builtin/rebase.c:1717 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: builtin/rebase.c:2035 +#: builtin/rebase.c:1724 #, c-format msgid "Changes to %s:\n" msgstr "Ändringar till %s:\n" -#: builtin/rebase.c:2038 +#: builtin/rebase.c:1727 #, c-format msgid "Changes from %s to %s:\n" msgstr "Ändringar från %s till %s:\n" -#: builtin/rebase.c:2063 +#: builtin/rebase.c:1752 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det...\n" -#: builtin/rebase.c:2072 +#: builtin/rebase.c:1761 msgid "Could not detach HEAD" msgstr "Kunde inte koppla från HEAD" -#: builtin/rebase.c:2081 +#: builtin/rebase.c:1770 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Snabbspolade %s till %s.\n" -#: builtin/receive-pack.c:34 +#: builtin/receive-pack.c:35 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-katalog>" -#: builtin/receive-pack.c:1276 +#: builtin/receive-pack.c:1275 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -20295,7 +20418,7 @@ msgstr "" "För att undvika detta meddelande och fortfarande behålla det\n" "normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"." -#: builtin/receive-pack.c:1296 +#: builtin/receive-pack.c:1295 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -20316,13 +20439,13 @@ msgstr "" "\n" "För att undvika detta meddelande kan du sätta det till \"refuse\"." -#: builtin/receive-pack.c:2479 +#: builtin/receive-pack.c:2474 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:2493 -msgid "You must specify a directory." -msgstr "Du måste ange en katalog." +#: builtin/receive-pack.c:2489 +msgid "you must specify a directory" +msgstr "du måste ange en katalog" #: builtin/reflog.c:17 msgid "" @@ -20346,41 +20469,41 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <referens>" -#: builtin/reflog.c:568 builtin/reflog.c:573 +#: builtin/reflog.c:585 builtin/reflog.c:590 #, c-format msgid "'%s' is not a valid timestamp" msgstr "\"%s\" är inte en giltig tidsstämpel" -#: builtin/reflog.c:609 +#: builtin/reflog.c:631 #, c-format msgid "Marking reachable objects..." msgstr "Markerar nåbara objekt..." -#: builtin/reflog.c:647 +#: builtin/reflog.c:675 #, c-format msgid "%s points nowhere!" msgstr "%s pekar ingenstans!" -#: builtin/reflog.c:699 +#: builtin/reflog.c:731 msgid "no reflog specified to delete" msgstr "ingen referenslogg att ta bort angavs" -#: builtin/reflog.c:708 +#: builtin/reflog.c:742 #, c-format msgid "not a reflog: %s" msgstr "inte en referenslogg: %s" -#: builtin/reflog.c:713 +#: builtin/reflog.c:747 #, c-format msgid "no reflog for '%s'" msgstr "ingen referenslogg för \"%s\"" -#: builtin/reflog.c:759 +#: builtin/reflog.c:794 #, c-format msgid "invalid ref format: %s" msgstr "felaktigt referensformat: %s" -#: builtin/reflog.c:768 +#: builtin/reflog.c:803 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" @@ -20471,6 +20594,11 @@ msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..." msgid "Updating %s" msgstr "Uppdaterar %s" +#: builtin/remote.c:101 +#, c-format +msgid "Could not fetch %s" +msgstr "Kunde inte hämta %s" + #: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" @@ -20516,7 +20644,7 @@ msgstr "att ange en master-gren ger ingen mening med --mirror" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar" -#: builtin/remote.c:195 builtin/remote.c:700 +#: builtin/remote.c:195 builtin/remote.c:705 #, c-format msgid "remote %s already exists." msgstr "fjärrarkivet %s finns redan." @@ -20526,25 +20654,30 @@ msgstr "fjärrarkivet %s finns redan." msgid "Could not setup master '%s'" msgstr "Kunde inte skapa master \"%s\"" -#: builtin/remote.c:355 +#: builtin/remote.c:322 +#, c-format +msgid "unhandled branch.%s.rebase=%s; assuming 'true'" +msgstr "ohanterad branch.%s.rebase=%s; antar \"true\"" + +#: builtin/remote.c:366 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Kunde inte hämta mappning för referensspecifikation %s" -#: builtin/remote.c:454 builtin/remote.c:462 +#: builtin/remote.c:460 builtin/remote.c:468 msgid "(matching)" msgstr "(träffande)" -#: builtin/remote.c:466 +#: builtin/remote.c:472 msgid "(delete)" msgstr "(ta bort)" -#: builtin/remote.c:655 +#: builtin/remote.c:660 #, c-format msgid "could not set '%s'" msgstr "kunde inte ställa in \"%s\"" -#: builtin/remote.c:660 +#: builtin/remote.c:665 #, c-format msgid "" "The %s configuration remote.pushDefault in:\n" @@ -20555,17 +20688,17 @@ msgstr "" "\t%s:%d\n" "anger nu den icke-existerande fjärren \"%s\"" -#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943 +#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948 #, c-format msgid "No such remote: '%s'" msgstr "Ingen sådan fjärr: \"%s\"" -#: builtin/remote.c:710 +#: builtin/remote.c:715 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\"" -#: builtin/remote.c:730 +#: builtin/remote.c:735 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -20576,17 +20709,17 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nödvändigt." -#: builtin/remote.c:770 +#: builtin/remote.c:775 #, c-format msgid "deleting '%s' failed" msgstr "misslyckades ta bort \"%s\"" -#: builtin/remote.c:804 +#: builtin/remote.c:809 #, c-format msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:882 +#: builtin/remote.c:887 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -20600,118 +20733,118 @@ msgstr[1] "" "Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n" "för att ta bort dem, använd:" -#: builtin/remote.c:896 +#: builtin/remote.c:901 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:999 +#: builtin/remote.c:1009 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ny (nästa hämtning sparar i remotes/%s)" -#: builtin/remote.c:1002 +#: builtin/remote.c:1012 msgid " tracked" msgstr " spårad" -#: builtin/remote.c:1004 +#: builtin/remote.c:1014 msgid " stale (use 'git remote prune' to remove)" msgstr " förlegad (använd \"git remote prune\" för att ta bort)" -#: builtin/remote.c:1006 +#: builtin/remote.c:1016 msgid " ???" msgstr " ???" -#: builtin/remote.c:1047 +#: builtin/remote.c:1057 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren" -#: builtin/remote.c:1056 +#: builtin/remote.c:1066 #, c-format msgid "rebases interactively onto remote %s" msgstr "ombaseras interaktivt på fjärren %s" -#: builtin/remote.c:1058 +#: builtin/remote.c:1068 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "ombaseras interaktivt (med sammanslagningar) på fjärren %s" -#: builtin/remote.c:1061 +#: builtin/remote.c:1071 #, c-format msgid "rebases onto remote %s" msgstr "ombaseras på fjärren %s" -#: builtin/remote.c:1065 +#: builtin/remote.c:1075 #, c-format msgid " merges with remote %s" msgstr " sammanslås med fjärren %s" -#: builtin/remote.c:1068 +#: builtin/remote.c:1078 #, c-format msgid "merges with remote %s" msgstr "sammanslås med fjärren %s" -#: builtin/remote.c:1071 +#: builtin/remote.c:1081 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s och med fjärren %s\n" -#: builtin/remote.c:1114 +#: builtin/remote.c:1124 msgid "create" msgstr "skapa" -#: builtin/remote.c:1117 +#: builtin/remote.c:1127 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1121 +#: builtin/remote.c:1131 msgid "up to date" msgstr "àjour" -#: builtin/remote.c:1124 +#: builtin/remote.c:1134 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1127 +#: builtin/remote.c:1137 msgid "local out of date" msgstr "lokal föråldrad" -#: builtin/remote.c:1134 +#: builtin/remote.c:1144 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1137 +#: builtin/remote.c:1147 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sänder till %-*s (%s)" -#: builtin/remote.c:1141 +#: builtin/remote.c:1151 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1144 +#: builtin/remote.c:1154 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" -#: builtin/remote.c:1212 +#: builtin/remote.c:1222 msgid "do not query remotes" msgstr "fråga inte fjärrar" -#: builtin/remote.c:1239 +#: builtin/remote.c:1243 #, c-format msgid "* remote %s" msgstr "* fjärr %s" -#: builtin/remote.c:1240 +#: builtin/remote.c:1244 #, c-format msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396 +#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398 msgid "(no URL)" msgstr "(ingen URL)" @@ -20719,184 +20852,188 @@ msgstr "(ingen URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1255 builtin/remote.c:1257 +#: builtin/remote.c:1259 builtin/remote.c:1261 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263 +#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1259 +#: builtin/remote.c:1263 msgid "(not queried)" msgstr "(inte förfrågad)" -#: builtin/remote.c:1261 +#: builtin/remote.c:1265 msgid "(unknown)" msgstr "(okänd)" -#: builtin/remote.c:1265 +#: builtin/remote.c:1269 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n" -#: builtin/remote.c:1277 +#: builtin/remote.c:1281 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Fjärrgren:%s" msgstr[1] " Fjärrgrenar:%s" -#: builtin/remote.c:1280 builtin/remote.c:1306 +#: builtin/remote.c:1284 builtin/remote.c:1310 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1289 +#: builtin/remote.c:1293 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Lokal gren konfigurerad för \"git pull\":" msgstr[1] " Lokala grenar konfigurerade för \"git pull\":" -#: builtin/remote.c:1297 +#: builtin/remote.c:1301 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1303 +#: builtin/remote.c:1307 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:" msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:" -#: builtin/remote.c:1324 +#: builtin/remote.c:1328 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" -#: builtin/remote.c:1326 +#: builtin/remote.c:1330 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1341 +#: builtin/remote.c:1344 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1343 +#: builtin/remote.c:1346 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:" -#: builtin/remote.c:1353 +#: builtin/remote.c:1356 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1361 +#: builtin/remote.c:1364 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1363 +#: builtin/remote.c:1366 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1381 +#: builtin/remote.c:1384 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1382 +#: builtin/remote.c:1385 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1392 +#: builtin/remote.c:1394 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1393 +#: builtin/remote.c:1395 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1409 +#: builtin/remote.c:1411 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1412 +#: builtin/remote.c:1414 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1457 +#: builtin/remote.c:1459 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647 +#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" -#: builtin/remote.c:1539 +#: builtin/remote.c:1541 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1546 +#: builtin/remote.c:1548 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1563 +#: builtin/remote.c:1565 msgid "query push URLs rather than fetch URLs" msgstr "fråga sänd-URL:er istället för hämta-URL:er" -#: builtin/remote.c:1565 +#: builtin/remote.c:1567 msgid "return all URLs" msgstr "returnera alla URL:er" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 #, c-format msgid "no URLs configured for remote '%s'" msgstr "ingen URL:er angivna för fjärren \"%s\"" -#: builtin/remote.c:1621 +#: builtin/remote.c:1623 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1623 +#: builtin/remote.c:1625 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1625 +#: builtin/remote.c:1627 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1632 +#: builtin/remote.c:1634 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1673 +#: builtin/remote.c:1675 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1681 +#: builtin/remote.c:1683 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1683 +#: builtin/remote.c:1685 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" -#: builtin/repack.c:26 +#: builtin/remote.c:1702 +msgid "be verbose; must be placed before a subcommand" +msgstr "var pratsam; måste skrivas före ett underkommando" + +#: builtin/repack.c:28 msgid "git repack [<options>]" msgstr "git repack [<flaggor>]" -#: builtin/repack.c:31 +#: builtin/repack.c:33 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -20905,140 +21042,145 @@ msgstr "" "Använd --no-write-bitmap-index eller inaktivera inställningen\n" "pack.writebitmaps" -#: builtin/repack.c:198 +#: builtin/repack.c:201 msgid "could not start pack-objects to repack promisor objects" msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt" -#: builtin/repack.c:270 builtin/repack.c:630 +#: builtin/repack.c:275 builtin/repack.c:820 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Förväntar kompletta hex-objekt-id-rader endast från pack-objects." -#: builtin/repack.c:294 +#: builtin/repack.c:299 msgid "could not finish pack-objects to repack promisor objects" msgstr "kunde inte avsluta pack-objects för att packa om kontraktsobjekt" -#: builtin/repack.c:309 +#: builtin/repack.c:314 #, c-format msgid "cannot open index for %s" msgstr "kunde inte öppna indexet för %s" -#: builtin/repack.c:368 +#: builtin/repack.c:373 #, c-format msgid "pack %s too large to consider in geometric progression" msgstr "paketet %s för stort för att tas med i geometriskt förlopp" -#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413 +#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418 #, c-format msgid "pack %s too large to roll up" msgstr "paketet %s för stort att rulla upp" -#: builtin/repack.c:460 +#: builtin/repack.c:498 +#, c-format +msgid "could not open tempfile %s for writing" +msgstr "kunde inte öppna temporär fil %s för skrivning" + +#: builtin/repack.c:516 +msgid "could not close refs snapshot tempfile" +msgstr "kunde inte stänga temporär fil för refs-ögonblicksbild" + +#: builtin/repack.c:630 msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" -#: builtin/repack.c:462 +#: builtin/repack.c:632 msgid "same as -a, and turn unreachable objects loose" msgstr "samma som -a, och gör onåbara objekt lösa" -#: builtin/repack.c:465 +#: builtin/repack.c:635 msgid "remove redundant packs, and run git-prune-packed" msgstr "ta bort överflödiga paket, och kör git-prune-packed" -#: builtin/repack.c:467 +#: builtin/repack.c:637 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "sänd --no-reuse-delta till git-pack-objects" -#: builtin/repack.c:469 +#: builtin/repack.c:639 msgid "pass --no-reuse-object to git-pack-objects" msgstr "sänd --no-reuse-object till git-pack-objects" -#: builtin/repack.c:471 +#: builtin/repack.c:641 msgid "do not run git-update-server-info" msgstr "kör inte git-update-server-info" -#: builtin/repack.c:474 +#: builtin/repack.c:644 msgid "pass --local to git-pack-objects" msgstr "sänd --local till git-pack-objects" -#: builtin/repack.c:476 +#: builtin/repack.c:646 msgid "write bitmap index" msgstr "skriv bitkartindex" -#: builtin/repack.c:478 +#: builtin/repack.c:648 msgid "pass --delta-islands to git-pack-objects" msgstr "sänd --delta-islands till git-pack-objects" -#: builtin/repack.c:479 +#: builtin/repack.c:649 msgid "approxidate" msgstr "cirkadatum" -#: builtin/repack.c:480 +#: builtin/repack.c:650 msgid "with -A, do not loosen objects older than this" msgstr "med -A, lös inte upp objekt äldre än detta" -#: builtin/repack.c:482 +#: builtin/repack.c:652 msgid "with -a, repack unreachable objects" msgstr "med -a, packa om onåbara objekt" -#: builtin/repack.c:484 +#: builtin/repack.c:654 msgid "size of the window used for delta compression" msgstr "storlek på fönster använt för deltakomprimering" -#: builtin/repack.c:485 builtin/repack.c:491 +#: builtin/repack.c:655 builtin/repack.c:661 msgid "bytes" msgstr "byte" -#: builtin/repack.c:486 +#: builtin/repack.c:656 msgid "same as the above, but limit memory size instead of entries count" msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal" -#: builtin/repack.c:488 +#: builtin/repack.c:658 msgid "limits the maximum delta depth" msgstr "begränsa maximalt deltadjup" -#: builtin/repack.c:490 +#: builtin/repack.c:660 msgid "limits the maximum number of threads" msgstr "begränsar maximalt antal trådar" -#: builtin/repack.c:492 +#: builtin/repack.c:662 msgid "maximum size of each packfile" msgstr "maximal storlek på varje paketfil" -#: builtin/repack.c:494 +#: builtin/repack.c:664 msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:496 +#: builtin/repack.c:666 msgid "do not repack this pack" msgstr "packa inte om detta paket" -#: builtin/repack.c:498 +#: builtin/repack.c:668 msgid "find a geometric progression with factor <N>" msgstr "hitta ett geometrisk förlopp med faktor <N>" -#: builtin/repack.c:508 +#: builtin/repack.c:670 +msgid "write a multi-pack index of the resulting packs" +msgstr "skriv ett flerpaketsindex för de skapade paketen" + +#: builtin/repack.c:680 msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" -#: builtin/repack.c:512 -msgid "--keep-unreachable and -A are incompatible" -msgstr "--keep-unreachable och -A kan inte användas samtidigt" - -#: builtin/repack.c:527 -msgid "--geometric is incompatible with -A, -a" -msgstr "--geometric är inkompatibel med -A, -a" - -#: builtin/repack.c:639 +#: builtin/repack.c:829 msgid "Nothing new to pack." msgstr "Inget nytt att packa." -#: builtin/repack.c:669 +#: builtin/repack.c:859 #, c-format msgid "missing required file: %s" msgstr "nödvändig fil saknas: %s" -#: builtin/repack.c:671 +#: builtin/repack.c:861 #, c-format msgid "could not unlink: %s" msgstr "kunde inte ta bort: \"%s\"" @@ -21121,67 +21263,61 @@ msgstr "cat-file rapporterade misslyckande" msgid "unable to open %s for reading" msgstr "kan inte öppna %s för läsning" -#: builtin/replace.c:272 +#: builtin/replace.c:271 msgid "unable to spawn mktree" msgstr "kan inte starta mktree" -#: builtin/replace.c:276 +#: builtin/replace.c:275 msgid "unable to read from mktree" msgstr "kan inte läsa från mktree" -#: builtin/replace.c:285 +#: builtin/replace.c:284 msgid "mktree reported failure" msgstr "mktree rapporterade misslyckande" -#: builtin/replace.c:289 +#: builtin/replace.c:288 msgid "mktree did not return an object name" msgstr "mktree returnerade inte ett objektnamn" -#: builtin/replace.c:298 +#: builtin/replace.c:297 #, c-format msgid "unable to fstat %s" msgstr "kan inte utföra \"fstat\" på %s" -#: builtin/replace.c:303 +#: builtin/replace.c:302 msgid "unable to write object to database" msgstr "kan inte skriva objektet till databasen" -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 -#: builtin/replace.c:454 -#, c-format -msgid "not a valid object name: '%s'" -msgstr "objektnamnet är inte giltigt: \"%s\"" - -#: builtin/replace.c:326 +#: builtin/replace.c:325 #, c-format msgid "unable to get object type for %s" msgstr "kan inte läsa objekttyp för %s" -#: builtin/replace.c:342 +#: builtin/replace.c:341 msgid "editing object file failed" msgstr "misslyckades redigera objektfilen" -#: builtin/replace.c:351 +#: builtin/replace.c:350 #, c-format msgid "new object is the same as the old one: '%s'" msgstr "nytt objekt är samma som det gamla: \"%s\"" -#: builtin/replace.c:384 +#: builtin/replace.c:383 #, c-format msgid "could not parse %s as a commit" msgstr "kunde inte tolka %s som incheckning" -#: builtin/replace.c:416 +#: builtin/replace.c:415 #, c-format msgid "bad mergetag in commit '%s'" msgstr "felaktig sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:418 +#: builtin/replace.c:417 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "felformad sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:430 +#: builtin/replace.c:429 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -21190,31 +21326,31 @@ msgstr "" "den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s" "\" som har förkastats; använd --edit istället för --graft" -#: builtin/replace.c:469 +#: builtin/replace.c:468 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur" -#: builtin/replace.c:470 +#: builtin/replace.c:469 msgid "the signature will be removed in the replacement commit!" msgstr "signaturen kommer att tas bort i ersättningsincheckningen!" -#: builtin/replace.c:480 +#: builtin/replace.c:479 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "kunde inte skriva ersättningsincheckning för: \"%s\"" -#: builtin/replace.c:488 +#: builtin/replace.c:487 #, c-format msgid "graft for '%s' unnecessary" msgstr "ympning för \"%s\" behövs inte" -#: builtin/replace.c:492 +#: builtin/replace.c:491 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "ny incheckning är samma som den gamla: \"%s\"" -#: builtin/replace.c:527 +#: builtin/replace.c:526 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -21223,71 +21359,71 @@ msgstr "" "kunde inte konvertera följande ympning(ar):\n" "%s" -#: builtin/replace.c:548 +#: builtin/replace.c:547 msgid "list replace refs" msgstr "visa ersättningsreferenser" -#: builtin/replace.c:549 +#: builtin/replace.c:548 msgid "delete replace refs" msgstr "ta bort ersättningsreferenser" -#: builtin/replace.c:550 +#: builtin/replace.c:549 msgid "edit existing object" msgstr "redigera befintligt objekt" -#: builtin/replace.c:551 +#: builtin/replace.c:550 msgid "change a commit's parents" msgstr "ändra en inchecknings föräldrar" -#: builtin/replace.c:552 +#: builtin/replace.c:551 msgid "convert existing graft file" msgstr "konvertera befintlig ympningsfil" -#: builtin/replace.c:553 +#: builtin/replace.c:552 msgid "replace the ref if it exists" msgstr "ersätt referensen om den finns" -#: builtin/replace.c:555 +#: builtin/replace.c:554 msgid "do not pretty-print contents for --edit" msgstr "använd inte snygg visning av innehåll för --edit" -#: builtin/replace.c:556 +#: builtin/replace.c:555 msgid "use this format" msgstr "använd detta format" -#: builtin/replace.c:569 +#: builtin/replace.c:568 msgid "--format cannot be used when not listing" msgstr "--format kan inte användas utanför listning" -#: builtin/replace.c:577 +#: builtin/replace.c:576 msgid "-f only makes sense when writing a replacement" msgstr "-f kan endast användas vid skrivning av ersättning" -#: builtin/replace.c:581 +#: builtin/replace.c:580 msgid "--raw only makes sense with --edit" msgstr "--raw kan bara användas med --edit" -#: builtin/replace.c:587 +#: builtin/replace.c:586 msgid "-d needs at least one argument" msgstr "-d behöver minst ett argument" -#: builtin/replace.c:593 +#: builtin/replace.c:592 msgid "bad number of arguments" msgstr "fel antal argument" -#: builtin/replace.c:599 +#: builtin/replace.c:598 msgid "-e needs exactly one argument" msgstr "-e tar exakt ett argument" -#: builtin/replace.c:605 +#: builtin/replace.c:604 msgid "-g needs at least one argument" msgstr "-g tar minst ett argument" -#: builtin/replace.c:611 +#: builtin/replace.c:610 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file tar inga argument" -#: builtin/replace.c:617 +#: builtin/replace.c:616 msgid "only one pattern can be given with -l" msgstr "endast ett mönster kan anges med -l" @@ -21295,145 +21431,137 @@ msgstr "endast ett mönster kan anges med -l" msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget <path>... | status | remaining | diff | gc]" -#: builtin/rerere.c:60 +#: builtin/rerere.c:58 msgid "register clean resolutions in index" msgstr "registrera rena lösningar i indexet" -#: builtin/rerere.c:79 +#: builtin/rerere.c:77 msgid "'git rerere forget' without paths is deprecated" msgstr "\"git rerere forget\" utan sökvägar är föråldrat" -#: builtin/rerere.c:113 +#: builtin/rerere.c:111 #, c-format msgid "unable to generate diff for '%s'" msgstr "misslyckades skapa diff för \"%s\"" -#: builtin/reset.c:32 +#: builtin/reset.c:33 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." msgstr "git reset [-q] [<träd-igt>] [--] <sökvägar>..." -#: builtin/reset.c:34 +#: builtin/reset.c:35 msgid "" "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" msgstr "" "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<träd-igt>]" -#: builtin/reset.c:35 +#: builtin/reset.c:36 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" msgstr "git reset --patch [<träd-igt>] [--] [<sökvägar>...]" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "mixed" msgstr "blandad" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "soft" msgstr "mjuk" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "hard" msgstr "hård" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "merge" msgstr "sammanslagning" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "keep" msgstr "behåll" -#: builtin/reset.c:83 +#: builtin/reset.c:90 msgid "You do not have a valid HEAD." msgstr "Du har inte en giltig HEAD." -#: builtin/reset.c:85 +#: builtin/reset.c:92 msgid "Failed to find tree of HEAD." msgstr "Kunde inte hitta trädet för HEAD." -#: builtin/reset.c:91 +#: builtin/reset.c:98 #, c-format msgid "Failed to find tree of %s." msgstr "Kunde inte hitta trädet för %s." -#: builtin/reset.c:116 +#: builtin/reset.c:123 #, c-format msgid "HEAD is now at %s" msgstr "HEAD är nu på %s" -#: builtin/reset.c:195 +#: builtin/reset.c:299 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." -#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663 -#: builtin/stash.c:687 +#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680 +#: builtin/stash.c:704 msgid "be quiet, only report errors" msgstr "var tyst, rapportera endast fel" -#: builtin/reset.c:297 +#: builtin/reset.c:398 msgid "reset HEAD and index" msgstr "återställ HEAD och index" -#: builtin/reset.c:298 +#: builtin/reset.c:399 msgid "reset only HEAD" msgstr "återställ endast HEAD" -#: builtin/reset.c:300 builtin/reset.c:302 +#: builtin/reset.c:401 builtin/reset.c:403 msgid "reset HEAD, index and working tree" msgstr "återställ HEAD, index och arbetskatalog" -#: builtin/reset.c:304 +#: builtin/reset.c:405 msgid "reset HEAD but keep local changes" msgstr "återställ HEAD men behåll lokala ändringar" -#: builtin/reset.c:310 +#: builtin/reset.c:411 msgid "record only the fact that removed paths will be added later" msgstr "registrera endast att borttagna sökvägar kommer läggas till senare" -#: builtin/reset.c:344 +#: builtin/reset.c:445 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Kunde inte slå upp \"%s\" som en giltig revision." -#: builtin/reset.c:352 +#: builtin/reset.c:453 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd." -#: builtin/reset.c:361 -msgid "--patch is incompatible with --{hard,mixed,soft}" -msgstr "--patch är inkompatibel med --{hard,mixed,soft}" - -#: builtin/reset.c:371 +#: builtin/reset.c:472 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"." -#: builtin/reset.c:373 +#: builtin/reset.c:474 #, c-format msgid "Cannot do %s reset with paths." msgstr "Kan inte göra %s återställning med sökvägar." -#: builtin/reset.c:388 +#: builtin/reset.c:489 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s återställning tillåts inte i ett naket arkiv" -#: builtin/reset.c:392 -msgid "-N can only be used with --mixed" -msgstr "-N kan endast användas med --mixed" - -#: builtin/reset.c:413 +#: builtin/reset.c:520 msgid "Unstaged changes after reset:" msgstr "Oköade ändringar efter återställning:" -#: builtin/reset.c:416 +#: builtin/reset.c:523 #, c-format msgid "" "\n" @@ -21447,30 +21575,27 @@ msgstr "" "konfigurationsvariabeln\n" "reset.quiet till true för att göra detta till förval.\n" -#: builtin/reset.c:434 +#: builtin/reset.c:541 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." -#: builtin/reset.c:439 +#: builtin/reset.c:546 msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-list.c:538 -msgid "cannot combine --exclude-promisor-objects and --missing" -msgstr "kan inte kombinera --exclude-promisor-objects och --missing" - -#: builtin/rev-list.c:599 +#: builtin/rev-list.c:602 msgid "object filtering requires --objects" msgstr "objektfiltrering kräver --objects" -#: builtin/rev-list.c:659 +#: builtin/rev-list.c:674 msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" -#: builtin/rev-list.c:664 -msgid "marked counting is incompatible with --objects" -msgstr "markerad räkning är inkompatibelt med --objects" +#: builtin/rev-list.c:679 +#, c-format +msgid "marked counting and '%s' cannot be used together" +msgstr "markerad räkning och \"%s\" kan inte användas samtidigt." #: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" @@ -21488,6 +21613,18 @@ msgstr "sluta tolka efter första argument som inte är flagga" msgid "output in stuck long form" msgstr "utdata fast i lång form" +#: builtin/rev-parse.c:438 +msgid "premature end of input" +msgstr "för tidigt slut på indata" + +#: builtin/rev-parse.c:442 +msgid "no usage string given before the `--' separator" +msgstr "ingen användningssträng angavs före \"--\"-avdelaren" + +#: builtin/rev-parse.c:548 +msgid "Needed a single revision" +msgstr "Behövde ensam revision" + #: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" @@ -21503,6 +21640,50 @@ msgstr "" "Kör \"git rev-parse --parseopt -h\" för mer information om den första " "varianten." +#: builtin/rev-parse.c:712 +msgid "--resolve-git-dir requires an argument" +msgstr "--resolve-git-dir kräver ett argument" + +#: builtin/rev-parse.c:715 +#, c-format +msgid "not a gitdir '%s'" +msgstr "inte en gitkatalog \"%s\"" + +#: builtin/rev-parse.c:739 +msgid "--git-path requires an argument" +msgstr "--git-path kräver ett argument" + +#: builtin/rev-parse.c:749 +msgid "-n requires an argument" +msgstr "-n kräver ett argument" + +#: builtin/rev-parse.c:763 +msgid "--path-format requires an argument" +msgstr "--path-format kräver ett argument" + +#: builtin/rev-parse.c:769 +#, c-format +msgid "unknown argument to --path-format: %s" +msgstr "felaktigt argument till --path-format: %s" + +#: builtin/rev-parse.c:776 +msgid "--default requires an argument" +msgstr "--default kräver ett argument" + +#: builtin/rev-parse.c:782 +msgid "--prefix requires an argument" +msgstr "--prefix kräver ett argument" + +#: builtin/rev-parse.c:851 +#, c-format +msgid "unknown mode for --abbrev-ref: %s" +msgstr "okänt läge för --abbrev-ref: %s" + +#: builtin/rev-parse.c:1023 +#, c-format +msgid "unknown mode for --show-object-format: %s" +msgstr "okänt läge för --show-object-format: %s" + #: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<flaggor>] <incheckning-igt>..." @@ -21577,15 +21758,19 @@ msgstr "lägg till incheckningsnamn" msgid "preserve initially empty commits" msgstr "behåll incheckningar som börjar som tomma" +#: builtin/revert.c:128 +msgid "allow commits with empty messages" +msgstr "tillåt incheckningar med tomt meddelande" + #: builtin/revert.c:129 msgid "keep redundant, empty commits" msgstr "behåll redundanta, tomma incheckningar" -#: builtin/revert.c:237 +#: builtin/revert.c:241 msgid "revert failed" msgstr "\"revert\" misslyckades" -#: builtin/revert.c:250 +#: builtin/revert.c:254 msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" @@ -21633,70 +21818,70 @@ msgid_plural "the following files have local modifications:" msgstr[0] "följande fil har lokala ändringar:" msgstr[1] "följande filer har lokala ändringar:" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "do not list removed files" msgstr "lista inte borttagna filer" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "only remove from the index" msgstr "ta bara bort från indexet" -#: builtin/rm.c:246 +#: builtin/rm.c:247 msgid "override the up-to-date check" msgstr "överstyr àjour-testet" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "allow recursive removal" msgstr "tillåt rekursiv borttagning" -#: builtin/rm.c:249 +#: builtin/rm.c:250 msgid "exit with a zero status even if nothing matched" msgstr "avsluta med nollstatus även om inget träffades" -#: builtin/rm.c:283 +#: builtin/rm.c:285 msgid "No pathspec was given. Which files should I remove?" msgstr "Ingen sökvägsangivelse gavs. Vilka filer ska jag ta bort?" -#: builtin/rm.c:310 +#: builtin/rm.c:315 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" "löa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta" -#: builtin/rm.c:331 +#: builtin/rm.c:337 #, c-format msgid "not removing '%s' recursively without -r" msgstr "tar inte bort \"%s\" rekursivt utan -r" -#: builtin/rm.c:379 +#: builtin/rm.c:385 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: kan inte ta bort %s" #: builtin/send-pack.c:20 msgid "" -"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" -"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " -"[<ref>...]\n" -" --all and explicit <ref> specification are mutually exclusive." +"git send-pack [--mirror] [--dry-run] [--force]\n" +" [--receive-pack=<git-receive-pack>]\n" +" [--verbose] [--thin] [--atomic]\n" +" [<host>:]<directory> (--all | <ref>...)" msgstr "" -"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" -"receive-pack>] [--verbose] [--thin] [--atomic] [<värd>:]<katalog> " -"[<ref>...]\n" -" --all och explicit angiven <ref> är ömsesidigt uteslutande." +"git send-pack [--mirror] [--dry-run] [--force]\n" +" [--receive-pack=<git-receive-pack>]\n" +" [--verbose] [--thin] [--atomic]\n" +" [<värd>:]<katalog> (--all | <ref>...)" -#: builtin/send-pack.c:188 +#: builtin/send-pack.c:192 msgid "remote name" msgstr "fjärrnamn" -#: builtin/send-pack.c:201 +#: builtin/send-pack.c:205 msgid "use stateless RPC protocol" msgstr "använd tillståndslöst RPC-protokoll" -#: builtin/send-pack.c:202 +#: builtin/send-pack.c:206 msgid "read refs from stdin" msgstr "läs referenser från standard in" -#: builtin/send-pack.c:203 +#: builtin/send-pack.c:207 msgid "print status from remote helper" msgstr "visa status från fjärrhjälpare" @@ -21710,7 +21895,7 @@ msgstr "git log --pretty=short | git shortlog [<flaggor>]" #: builtin/shortlog.c:123 msgid "using multiple --group options with stdin is not supported" -msgstr "mer än en --group-flagga stöds inte med standard in" +msgstr "mer än en \"--group\"-flagga stöds inte med standard in" #: builtin/shortlog.c:133 msgid "using --group=trailer with stdin is not supported" @@ -21753,21 +21938,21 @@ msgstr "föt" msgid "group by field" msgstr "gruppera efter fält" -#: builtin/shortlog.c:391 +#: builtin/shortlog.c:394 msgid "too many arguments given outside repository" msgstr "för många flaggor givna utanför arkivet" #: builtin/show-branch.c:13 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" -"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" -"\t\t[--more=<n> | --list | --independent | --merge-base]\n" -"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +" [--current] [--color[=<when>] | --no-color] [--sparse]\n" +" [--more=<n> | --list | --independent | --merge-base]\n" +" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" -"\t\t[--current] [--color[=<när>] | --no-color] [--sparse]\n" -"\t\t[--more=<n> | --list | --independent | --merge-base]\n" -"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]" +" [--current] [--color[=<när>] | --no-color] [--sparse]\n" +" [--more=<n> | --list | --independent | --merge-base]\n" +" [--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]" #: builtin/show-branch.c:17 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" @@ -21780,115 +21965,108 @@ msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "ignorerar %s; kan inte hantera mer än %d referens" msgstr[1] "ignorerar %s; kan inte hantera mer än %d referenser" -#: builtin/show-branch.c:548 +#: builtin/show-branch.c:547 #, c-format msgid "no matching refs with %s" msgstr "inga motsvarande referenser med %s" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:644 msgid "show remote-tracking and local branches" msgstr "visa fjärrspårande och lokala grenar" -#: builtin/show-branch.c:647 +#: builtin/show-branch.c:646 msgid "show remote-tracking branches" msgstr "visa fjärrspårande grenar" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:648 msgid "color '*!+-' corresponding to the branch" msgstr "färga \"*!+-\" enligt grenen" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:650 msgid "show <n> more commits after the common ancestor" msgstr "visa <n> ytterligare incheckningar efter gemensam anfader" -#: builtin/show-branch.c:653 +#: builtin/show-branch.c:652 msgid "synonym to more=-1" msgstr "synonym till more=-1" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:653 msgid "suppress naming strings" msgstr "undertyck namnsträngar" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:655 msgid "include the current branch" -msgstr "inkludera aktuell gren" +msgstr "ta med aktuell gren" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:657 msgid "name commits with their object names" msgstr "namnge incheckningar med deras objektnamn" -#: builtin/show-branch.c:660 +#: builtin/show-branch.c:659 msgid "show possible merge bases" msgstr "visa möjliga sammanslagningsbaser" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:661 msgid "show refs unreachable from any other ref" msgstr "visa referenser som inte kan nås från någon annan referens" -#: builtin/show-branch.c:664 +#: builtin/show-branch.c:663 msgid "show commits in topological order" msgstr "visa incheckningar i topologisk ordning" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:666 msgid "show only commits not on the first branch" msgstr "visa endast incheckningar inte på den första grenen" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:668 msgid "show merges reachable from only one tip" msgstr "visa sammanslagningar som endast kan nås från en spets" -#: builtin/show-branch.c:671 +#: builtin/show-branch.c:670 msgid "topologically sort, maintaining date order where possible" msgstr "sortera topologiskt, behåll datumordning när möjligt" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:673 msgid "<n>[,<base>]" msgstr "<n>[,<bas>]" -#: builtin/show-branch.c:675 +#: builtin/show-branch.c:674 msgid "show <n> most recent ref-log entries starting at base" msgstr "visa <n> nyaste refloggposter med början på bas" -#: builtin/show-branch.c:711 -msgid "" -"--reflog is incompatible with --all, --remotes, --independent or --merge-base" -msgstr "" -"--reflog är inkompatibel med --all, --remotes, --independent eller --merge-" -"base" - -#: builtin/show-branch.c:735 +#: builtin/show-branch.c:734 msgid "no branches given, and HEAD is not valid" msgstr "inga grenar angavs, och HEAD är inte giltigt" -#: builtin/show-branch.c:738 +#: builtin/show-branch.c:737 msgid "--reflog option needs one branch name" msgstr "--reflog behöver ett namn på en gren" -#: builtin/show-branch.c:741 +#: builtin/show-branch.c:740 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "maximalt %d poster kan visas samtidigt." msgstr[1] "maximalt %d poster kan visas samtidigt." -#: builtin/show-branch.c:745 +#: builtin/show-branch.c:744 #, c-format msgid "no such ref %s" msgstr "ingen sådan referens %s" -#: builtin/show-branch.c:831 +#: builtin/show-branch.c:830 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "kan inte hantera mer än %d revision." msgstr[1] "kan inte hantera mer än %d revisioner." -#: builtin/show-branch.c:835 +#: builtin/show-branch.c:834 #, c-format msgid "'%s' is not a valid ref." msgstr "\"%s\" är inte en giltig referens." -#: builtin/show-branch.c:838 +#: builtin/show-branch.c:837 #, c-format msgid "cannot find commit %s (%s)" msgstr "hittar inte incheckning %s (%s)" @@ -21953,75 +22131,116 @@ msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <flaggor>" msgid "git sparse-checkout list" msgstr "git sparse-checkout list" -#: builtin/sparse-checkout.c:72 +#: builtin/sparse-checkout.c:60 +msgid "this worktree is not sparse" +msgstr "arbetskatalogen är inte gren" + +#: builtin/sparse-checkout.c:75 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" "arbetskatalogen är inte glest (sparse-checkout-filen kanske inte finns)" -#: builtin/sparse-checkout.c:227 +#: builtin/sparse-checkout.c:176 +#, c-format +msgid "" +"directory '%s' contains untracked files, but is not in the sparse-checkout " +"cone" +msgstr "" +"katalogen \"%s\" innehåller ospårade filer, men är inte i området som ages i " +"\"sparse-checkout\"" + +#: builtin/sparse-checkout.c:184 +#, c-format +msgid "failed to remove directory '%s'" +msgstr "misslyckades ta bort katalogen \"%s\"" + +#: builtin/sparse-checkout.c:324 msgid "failed to create directory for sparse-checkout file" msgstr "misslyckades skapa katalog för \"sparse-checkout\"-filen" -#: builtin/sparse-checkout.c:268 +#: builtin/sparse-checkout.c:365 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "kunde inte uppgradera arkivformat för att aktivera worktreeConfig" -#: builtin/sparse-checkout.c:270 +#: builtin/sparse-checkout.c:367 msgid "failed to set extensions.worktreeConfig setting" msgstr "misslyckades ändra inställningen extensions.worktreeConfig" -#: builtin/sparse-checkout.c:290 +#: builtin/sparse-checkout.c:411 +msgid "failed to modify sparse-index config" +msgstr "misslyckades ändra inställning för sparse-index" + +#: builtin/sparse-checkout.c:422 msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" -#: builtin/sparse-checkout.c:310 +#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729 +#: builtin/sparse-checkout.c:778 msgid "initialize the sparse-checkout in cone mode" msgstr "initiera sparse-checkout i konläge" -#: builtin/sparse-checkout.c:312 +#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731 +#: builtin/sparse-checkout.c:780 msgid "toggle the use of a sparse index" msgstr "slå på/av använding av glest index" -#: builtin/sparse-checkout.c:340 -msgid "failed to modify sparse-index config" -msgstr "misslyckades ändra inställning för sparse-index" - -#: builtin/sparse-checkout.c:361 +#: builtin/sparse-checkout.c:476 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: builtin/sparse-checkout.c:419 +#: builtin/sparse-checkout.c:528 #, c-format msgid "could not normalize path %s" msgstr "kunde inte normalisera sökvägen \"%s\"" -#: builtin/sparse-checkout.c:431 -msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" -msgstr "git sparse-checkout (set|add) (--stdin | <mönster>)" - -#: builtin/sparse-checkout.c:456 +#: builtin/sparse-checkout.c:557 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "kan inte ta bort citering av C-sträng \"%s\"" -#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534 +#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640 msgid "unable to load existing sparse-checkout patterns" msgstr "kunde inte läsa in existerande mönster för gles utcheckning" -#: builtin/sparse-checkout.c:579 +#: builtin/sparse-checkout.c:616 +msgid "existing sparse-checkout patterns do not use cone mode" +msgstr "befintliga filter för gles utcheckning använder inte konläge" + +#: builtin/sparse-checkout.c:682 +msgid "git sparse-checkout add (--stdin | <patterns>)" +msgstr "git sparse-checkout add (--stdin | <mönster>)" + +#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733 msgid "read patterns from standard in" msgstr "läs mönster från standard in" -#: builtin/sparse-checkout.c:594 -msgid "git sparse-checkout reapply" -msgstr "git sparse-checkout reapply" +#: builtin/sparse-checkout.c:699 +msgid "no sparse-checkout to add to" +msgstr "ingen sparse-checkout att utöka" -#: builtin/sparse-checkout.c:613 +#: builtin/sparse-checkout.c:712 +msgid "" +"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | " +"<patterns>)" +msgstr "" +"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | " +"<mönster>)" + +#: builtin/sparse-checkout.c:765 +msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]" +msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]" + +#: builtin/sparse-checkout.c:785 +msgid "must be in a sparse-checkout to reapply sparsity patterns" +msgstr "" +"måste vara i en gles utcheckning för att tillämpa gleshetsmönster på nytt" + +#: builtin/sparse-checkout.c:803 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:644 +#: builtin/sparse-checkout.c:845 msgid "error while refreshing working directory" msgstr "fel vid uppdatering av arbetskatalog" @@ -22045,28 +22264,28 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <grennamn> [<stash>]" -#: builtin/stash.c:29 builtin/stash.c:70 -msgid "git stash clear" -msgstr "git stash clear" - #: builtin/stash.c:30 msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" +"quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +"git stash [push [-p|--patch] [S|--staged] [-k|--[no-]keep-index] [-q|--" +"quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n" " [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n" " [--] [<sökväg>...]]" -#: builtin/stash.c:34 builtin/stash.c:87 +#: builtin/stash.c:34 msgid "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" +"quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" +"quiet]\n" " [-u|--include-untracked] [-a|--all] [<meddelande>]" #: builtin/stash.c:55 @@ -22091,6 +22310,14 @@ msgstr "" " [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n" " [--] [<sökväg>...]]" +#: builtin/stash.c:87 +msgid "" +"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [<message>]" +msgstr "" +"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [<meddelande>]" + #: builtin/stash.c:130 #, c-format msgid "'%s' is not a stash-like commit" @@ -22114,7 +22341,7 @@ msgstr "%s är inte en giltigt referens" msgid "git stash clear with arguments is unimplemented" msgstr "\"git stash clear\" med argument har inte implementerats" -#: builtin/stash.c:431 +#: builtin/stash.c:447 #, c-format msgid "" "WARNING: Untracked file in way of tracked file! Renaming\n" @@ -22125,166 +22352,183 @@ msgstr "" " %s -> %s\n" " för att lämna plats.\n" -#: builtin/stash.c:492 +#: builtin/stash.c:508 msgid "cannot apply a stash in the middle of a merge" msgstr "kan inte tillämpa en \"stash\" mitt i en sammanslagning" -#: builtin/stash.c:503 +#: builtin/stash.c:519 #, c-format msgid "could not generate diff %s^!." msgstr "kunde inte skapa diff %s^!." -#: builtin/stash.c:510 +#: builtin/stash.c:526 msgid "conflicts in index. Try without --index." msgstr "konflikter i indexet. Testa utan --index." -#: builtin/stash.c:516 +#: builtin/stash.c:532 msgid "could not save index tree" msgstr "kunde inte spara indexträd" -#: builtin/stash.c:525 -msgid "could not restore untracked files from stash" -msgstr "kunde inte återställa ospårade filer från stash-post" - -#: builtin/stash.c:539 +#: builtin/stash.c:552 #, c-format msgid "Merging %s with %s" msgstr "Slår ihop %s med %s" -#: builtin/stash.c:549 +#: builtin/stash.c:562 msgid "Index was not unstashed." msgstr "Indexet har inte tagits upp ur \"stash\":en" -#: builtin/stash.c:591 builtin/stash.c:689 +#: builtin/stash.c:576 +msgid "could not restore untracked files from stash" +msgstr "kunde inte återställa ospårade filer från stash-post" + +#: builtin/stash.c:608 builtin/stash.c:706 msgid "attempt to recreate the index" msgstr "försök återskapa indexet" -#: builtin/stash.c:635 +#: builtin/stash.c:652 #, c-format msgid "Dropped %s (%s)" msgstr "Kastade %s (%s)" -#: builtin/stash.c:638 +#: builtin/stash.c:655 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Kunde inte kasta \"stash\"-post" -#: builtin/stash.c:651 +#: builtin/stash.c:668 #, c-format msgid "'%s' is not a stash reference" msgstr "\"%s\" är inte en \"stash\"-referens" -#: builtin/stash.c:701 +#: builtin/stash.c:718 msgid "The stash entry is kept in case you need it again." msgstr "Stash-posten behålls ifall du behöver den igen." -#: builtin/stash.c:724 +#: builtin/stash.c:741 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: builtin/stash.c:808 +#: builtin/stash.c:825 msgid "failed to parse tree" msgstr "misslyckades tolka träd" -#: builtin/stash.c:819 +#: builtin/stash.c:836 msgid "failed to unpack trees" msgstr "misslyckades packa upp träd" -#: builtin/stash.c:839 +#: builtin/stash.c:856 msgid "include untracked files in the stash" msgstr "ta med ospårade filer i \"stash\"" -#: builtin/stash.c:842 +#: builtin/stash.c:859 msgid "only show untracked files in the stash" msgstr "visa bara ospårade filer i \"stash\"" -#: builtin/stash.c:932 builtin/stash.c:969 +#: builtin/stash.c:946 builtin/stash.c:983 #, c-format msgid "Cannot update %s with %s" msgstr "Kan inte uppdatera %s med %s" -#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671 +#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750 msgid "stash message" msgstr "\"stash\"-meddelande" -#: builtin/stash.c:960 +#: builtin/stash.c:974 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" kräver ett <incheckning>-argument" -#: builtin/stash.c:1175 +#: builtin/stash.c:1159 +msgid "No staged changes" +msgstr "Inga köade ändringar" + +#: builtin/stash.c:1220 msgid "No changes selected" msgstr "Inga ändringar valda" -#: builtin/stash.c:1275 +#: builtin/stash.c:1320 msgid "You do not have the initial commit yet" msgstr "Du har inte den första incheckningen ännu" -#: builtin/stash.c:1302 +#: builtin/stash.c:1347 msgid "Cannot save the current index state" msgstr "Kan inte spara aktuellt tillstånd för indexet" -#: builtin/stash.c:1311 +#: builtin/stash.c:1356 msgid "Cannot save the untracked files" msgstr "Kan inte spara ospårade filer" -#: builtin/stash.c:1322 builtin/stash.c:1331 +#: builtin/stash.c:1367 builtin/stash.c:1386 msgid "Cannot save the current worktree state" msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" -#: builtin/stash.c:1359 +#: builtin/stash.c:1377 +msgid "Cannot save the current staged state" +msgstr "Kan inte spara aktuellt tillstånd kö" + +#: builtin/stash.c:1414 msgid "Cannot record working tree state" msgstr "Kan inte registrera tillstånd för arbetskatalog" -#: builtin/stash.c:1408 +#: builtin/stash.c:1463 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt" -#: builtin/stash.c:1426 +#: builtin/stash.c:1474 +msgid "Can't use --staged and --include-untracked or --all at the same time" +msgstr "" +"Kan inte använda --staged och --include-untracked eller --all samtidigt" + +#: builtin/stash.c:1492 msgid "Did you forget to 'git add'?" msgstr "Glömde du använda \"git add\"?" -#: builtin/stash.c:1441 +#: builtin/stash.c:1507 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" -#: builtin/stash.c:1448 +#: builtin/stash.c:1514 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: builtin/stash.c:1463 +#: builtin/stash.c:1529 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" -#: builtin/stash.c:1468 +#: builtin/stash.c:1534 #, c-format msgid "Saved working directory and index state %s" msgstr "Sparade arbetskatalogen och indexstatus %s" -#: builtin/stash.c:1558 +#: builtin/stash.c:1627 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: builtin/stash.c:1597 builtin/stash.c:1662 +#: builtin/stash.c:1667 builtin/stash.c:1739 msgid "keep index" msgstr "behåll indexet" -#: builtin/stash.c:1599 builtin/stash.c:1664 +#: builtin/stash.c:1669 builtin/stash.c:1741 +msgid "stash staged changes only" +msgstr "stash:a endast köade ändringar" + +#: builtin/stash.c:1671 builtin/stash.c:1743 msgid "stash in patch mode" msgstr "\"stash\" i \"patch\"-läge" -#: builtin/stash.c:1600 builtin/stash.c:1665 +#: builtin/stash.c:1672 builtin/stash.c:1744 msgid "quiet mode" msgstr "tyst läge" -#: builtin/stash.c:1602 builtin/stash.c:1667 +#: builtin/stash.c:1674 builtin/stash.c:1746 msgid "include untracked files in stash" msgstr "ta med ospårade filer i \"stash\"" -#: builtin/stash.c:1604 builtin/stash.c:1669 +#: builtin/stash.c:1676 builtin/stash.c:1748 msgid "include ignore files" msgstr "ta med ignorerade filer" -#: builtin/stash.c:1704 +#: builtin/stash.c:1783 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -22308,40 +22552,49 @@ msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken" msgid "prepend comment character and space to each line" msgstr "lägg in kommentarstecken och blanksteg först på varje rad" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:63 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote tar inga argument" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:101 #, c-format msgid "cannot strip one component off url '%s'" msgstr "kan inte ta bort en komponent från url:en \"%s\"" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820 +#: builtin/submodule--helper.c:211 +#, c-format +msgid "" +"could not look up configuration '%s'. Assuming this repository is its own " +"authoritative upstream." +msgstr "" +"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget " +"officiella uppström." + +#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:410 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605 +#: builtin/submodule--helper.c:628 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:520 #, c-format msgid "Entering '%s'\n" msgstr "Går in i \"%s\"\n" -#: builtin/submodule--helper.c:528 +#: builtin/submodule--helper.c:523 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -22350,7 +22603,7 @@ msgstr "" "run_command returnerade icke-nollstatus för %s\n" "." -#: builtin/submodule--helper.c:550 +#: builtin/submodule--helper.c:545 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -22361,76 +22614,67 @@ msgstr "" "undermoduler för %s\n" "." -#: builtin/submodule--helper.c:566 +#: builtin/submodule--helper.c:561 msgid "suppress output of entering each submodule command" msgstr "dölj utdata från för varje undermodulskommando som startas" -#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889 -#: builtin/submodule--helper.c:1488 +#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864 +#: builtin/submodule--helper.c:1453 msgid "recurse into nested submodules" msgstr "rekursera in i nästlade undermoduler" -#: builtin/submodule--helper.c:573 +#: builtin/submodule--helper.c:568 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]" -#: builtin/submodule--helper.c:600 -#, c-format -msgid "" -"could not look up configuration '%s'. Assuming this repository is its own " -"authoritative upstream." -msgstr "" -"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget " -"officiella uppström." - -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:642 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Misslyckades registrera url för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:646 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:656 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:663 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:685 msgid "suppress output for initializing a submodule" msgstr "dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:690 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<flaggor>] [<sökväg>]" -#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923 +#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\"" -#: builtin/submodule--helper.c:836 +#: builtin/submodule--helper.c:811 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "kunde inte bestämma HEAD:s incheckning i undermodulen \"%s\"" -#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458 +#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "misslyckades rekursera in i undermodulen \"%s\"" -#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590 msgid "suppress submodule status output" msgstr "hindra statusutskrift för undermodul" -#: builtin/submodule--helper.c:888 +#: builtin/submodule--helper.c:863 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -22438,109 +22682,103 @@ msgstr "" "visa incheckning från indexet istället för den som lagrats i undermodulens " "HEAD" -#: builtin/submodule--helper.c:894 +#: builtin/submodule--helper.c:869 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]" -#: builtin/submodule--helper.c:918 +#: builtin/submodule--helper.c:893 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sökväg>" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:965 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodule)" -#: builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:968 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(submodule)->%s(blob)" -#: builtin/submodule--helper.c:1006 +#: builtin/submodule--helper.c:981 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1056 +#: builtin/submodule--helper.c:1031 #, c-format msgid "couldn't hash object from '%s'" msgstr "kunde inte hasha objekt från \"%s\"" -#: builtin/submodule--helper.c:1060 +#: builtin/submodule--helper.c:1035 #, c-format msgid "unexpected mode %o\n" msgstr "okänt läge %o\n" -#: builtin/submodule--helper.c:1301 +#: builtin/submodule--helper.c:1276 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "använd incechkning lagrad i indexet istället för undermodulens HEAD" -#: builtin/submodule--helper.c:1303 -msgid "to compare the commit in the index with that in the submodule HEAD" -msgstr "" -"för att jämföra incheckningen i indexet med den som lagrats i undermodulens " -"HEAD" +#: builtin/submodule--helper.c:1278 +msgid "compare the commit in the index with that in the submodule HEAD" +msgstr "jämför incheckningen i indexet med den i undermodulens HEAD" -#: builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1280 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "" "hoppa över undermoduler där värdet för \"ignore_config\" är satt till \"all\"" -#: builtin/submodule--helper.c:1307 +#: builtin/submodule--helper.c:1282 msgid "limit the summary size" msgstr "begränsa översiktsstorleken" -#: builtin/submodule--helper.c:1312 +#: builtin/submodule--helper.c:1287 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "" "git submodule--helper summary [<flaggor>] [<incheckning>] [--] [<sökväg>]" -#: builtin/submodule--helper.c:1336 +#: builtin/submodule--helper.c:1311 msgid "could not fetch a revision for HEAD" msgstr "kunde inte hämta en version för HEAD" -#: builtin/submodule--helper.c:1341 -msgid "--cached and --files are mutually exclusive" -msgstr "--cached och --files är ömsesidigt uteslutande" - -#: builtin/submodule--helper.c:1408 +#: builtin/submodule--helper.c:1373 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synkroniserar undermodul-url för \"%s\"\n" -#: builtin/submodule--helper.c:1414 +#: builtin/submodule--helper.c:1379 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "misslyckades registrera url för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1428 +#: builtin/submodule--helper.c:1393 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "misslyckades hämta standardfjärr för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1439 +#: builtin/submodule--helper.c:1404 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "misslyckades uppdatera fjärr för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1486 +#: builtin/submodule--helper.c:1451 msgid "suppress output of synchronizing submodule url" msgstr "dölj utdata från synkronisering av undermodul-url" -#: builtin/submodule--helper.c:1493 +#: builtin/submodule--helper.c:1458 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]" -#: builtin/submodule--helper.c:1547 +#: builtin/submodule--helper.c:1508 #, c-format msgid "" -"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " -"really want to remove it including all of its history)" +"Submodule work tree '%s' contains a .git directory. This will be replaced " +"with a .git file by using absorbgitdirs." msgstr "" -"Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog (använd \"rm -rf" -"\" om du verkligen vill ta bort den och all dess historik)" +"Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog. Denna kommer " +"ersättas med en .git-fil med absorbgitdirs." -#: builtin/submodule--helper.c:1559 +#: builtin/submodule--helper.c:1525 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -22549,46 +22787,46 @@ msgstr "" "Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort " "dem" -#: builtin/submodule--helper.c:1567 +#: builtin/submodule--helper.c:1533 #, c-format msgid "Cleared directory '%s'\n" msgstr "Rensade katalogen \"%s\"\n" -#: builtin/submodule--helper.c:1569 +#: builtin/submodule--helper.c:1535 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n" -#: builtin/submodule--helper.c:1580 +#: builtin/submodule--helper.c:1546 #, c-format msgid "could not create empty submodule directory %s" msgstr "kunde inte skapa tom undermodulskatalog %s" -#: builtin/submodule--helper.c:1596 +#: builtin/submodule--helper.c:1562 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n" -#: builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:1591 msgid "remove submodule working trees even if they contain local changes" msgstr "" "ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar" -#: builtin/submodule--helper.c:1626 +#: builtin/submodule--helper.c:1592 msgid "unregister all submodules" msgstr "avregistrera alla undermoduler" -#: builtin/submodule--helper.c:1631 +#: builtin/submodule--helper.c:1597 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]" -#: builtin/submodule--helper.c:1645 +#: builtin/submodule--helper.c:1611 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler" -#: builtin/submodule--helper.c:1714 +#: builtin/submodule--helper.c:1656 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -22600,46 +22838,67 @@ msgstr "" "submodule.alternateErrorStrategy till \"info\" eller, likvärdigt, klona\n" "med \"--reference-if-able\" istället för \"--reference\"." -#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756 +#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "undermodulen \"%s\" kan inte lägga till suppleant: %s" -#: builtin/submodule--helper.c:1792 +#: builtin/submodule--helper.c:1740 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte" -#: builtin/submodule--helper.c:1799 +#: builtin/submodule--helper.c:1747 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte" -#: builtin/submodule--helper.c:1823 +#: builtin/submodule--helper.c:1772 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "vägrar skapa/använda \"%s\" i en annan undermoduls gitkatalog" + +#: builtin/submodule--helper.c:1813 +#, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\"" + +#: builtin/submodule--helper.c:1818 +#, c-format +msgid "directory not empty: '%s'" +msgstr "katalogen inte tom: \"%s\"" + +#: builtin/submodule--helper.c:1830 +#, c-format +msgid "could not get submodule directory for '%s'" +msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" + +#: builtin/submodule--helper.c:1862 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen ska klonas till" -#: builtin/submodule--helper.c:1826 +#: builtin/submodule--helper.c:1865 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:1829 +#: builtin/submodule--helper.c:1868 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:1837 +#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349 +#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526 +#: builtin/submodule--helper.c:3258 msgid "force cloning progress" msgstr "tvinga kloningsförlopp" -#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351 +#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528 msgid "disallow cloning into non-empty directory" msgstr "förhindra kloning till icke-tom katalog" -#: builtin/submodule--helper.c:1849 +#: builtin/submodule--helper.c:1888 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22649,103 +22908,178 @@ msgstr "" "<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] --url <url> --" "path <sökväg>" -#: builtin/submodule--helper.c:1874 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "vägrar skapa/använda \"%s\" i en annan undermoduls gitkatalog" - -#: builtin/submodule--helper.c:1885 -#, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\"" - -#: builtin/submodule--helper.c:1889 -#, c-format -msgid "directory not empty: '%s'" -msgstr "katalogen inte tom: \"%s\"" - -#: builtin/submodule--helper.c:1901 -#, c-format -msgid "could not get submodule directory for '%s'" -msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" - -#: builtin/submodule--helper.c:1937 +#: builtin/submodule--helper.c:1925 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Ogiltigt uppdateringsläge \"%s\" för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1941 +#: builtin/submodule--helper.c:1929 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Ogiltigt uppdateringsläge \"%s\" konfigurerat för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:2042 +#: builtin/submodule--helper.c:2044 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:2046 +#: builtin/submodule--helper.c:2048 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:2076 +#: builtin/submodule--helper.c:2078 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:2105 +#: builtin/submodule--helper.c:2107 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" -#: builtin/submodule--helper.c:2255 +#: builtin/submodule--helper.c:2257 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" -#: builtin/submodule--helper.c:2266 +#: builtin/submodule--helper.c:2268 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Misslyckades klona \"%s\" för andra gången, avbryter" -#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2373 +#, c-format +msgid "Unable to checkout '%s' in submodule path '%s'" +msgstr "Kan inte checka ut \"%s\" i undermodulsökvägen \"%s\"" + +#: builtin/submodule--helper.c:2377 +#, c-format +msgid "Unable to rebase '%s' in submodule path '%s'" +msgstr "Kan inte ombasera \"%s\" i undermodulsökvägen \"%s\"" + +#: builtin/submodule--helper.c:2381 +#, c-format +msgid "Unable to merge '%s' in submodule path '%s'" +msgstr "Kan inte slå ihop \"%s\" i undermodulsökvägen \"%s\"" + +#: builtin/submodule--helper.c:2385 +#, c-format +msgid "Execution of '%s %s' failed in submodule path '%s'" +msgstr "Misslyckades köra \"%s %s\" i undermodulsökvägen \"%s\"" + +#: builtin/submodule--helper.c:2409 +#, c-format +msgid "Submodule path '%s': checked out '%s'\n" +msgstr "Undermodulsökvägen \"%s\": checkade ut \"%s\"\n" + +#: builtin/submodule--helper.c:2413 +#, c-format +msgid "Submodule path '%s': rebased into '%s'\n" +msgstr "Undermodulsökvägen \"%s\": ombaserade in i \"%s\"\n" + +#: builtin/submodule--helper.c:2417 +#, c-format +msgid "Submodule path '%s': merged in '%s'\n" +msgstr "Undermodulsökvägen \"%s\": sammanslagen i \"%s\"\n" + +#: builtin/submodule--helper.c:2421 +#, c-format +msgid "Submodule path '%s': '%s %s'\n" +msgstr "Undermodulsökvägen \"%s\": \"%s %s\"\n" + +#: builtin/submodule--helper.c:2445 +#, c-format +msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:" +msgstr "Kan inte hämta i undermodulsökväg \"%s\"; försökte hämta %s direkt:" + +#: builtin/submodule--helper.c:2454 +#, c-format +msgid "" +"Fetched in submodule path '%s', but it did not contain %s. Direct fetching " +"of that commit failed." +msgstr "" +"Hämtade i undermodulssökvägen \"%s\", men den innehöll inte %s. Direkt " +"hämtning av incheckningen misslyckades." + +#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575 +#: builtin/submodule--helper.c:2813 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:2331 +#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580 msgid "path into the working tree, across nested submodule boundaries" msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser" -#: builtin/submodule--helper.c:2335 +#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:2341 +#: builtin/submodule--helper.c:2518 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "skapa en grund klon trunkerad till angivet antal revisioner" -#: builtin/submodule--helper.c:2344 +#: builtin/submodule--helper.c:2521 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2523 msgid "whether the initial clone should follow the shallow recommendation" msgstr "om den första klonen ska följa rekommendation för grund kloning" -#: builtin/submodule--helper.c:2347 +#: builtin/submodule--helper.c:2524 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:2358 +#: builtin/submodule--helper.c:2535 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:2371 +#: builtin/submodule--helper.c:2548 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:2419 +#: builtin/submodule--helper.c:2566 +msgid "suppress output for update by rebase or merge" +msgstr "dölj utdata för uppdatering via ombasering eller sammanslagning{" + +#: builtin/submodule--helper.c:2567 +msgid "force checkout updates" +msgstr "tvinga utcheckningsuppdateringar" + +#: builtin/submodule--helper.c:2569 +msgid "don't fetch new objects from the remote site" +msgstr "hämta inte nya objekt från fjärrplatsen" + +#: builtin/submodule--helper.c:2571 +msgid "overrides update mode in case the repository is a fresh clone" +msgstr "överstyr uppdateringsläge om arkviet är en färsk klon" + +#: builtin/submodule--helper.c:2572 +msgid "depth for shallow fetch" +msgstr "djup för grund hämtning" + +#: builtin/submodule--helper.c:2582 +msgid "sha1" +msgstr "sha1" + +#: builtin/submodule--helper.c:2583 +msgid "SHA1 expected by superproject" +msgstr "SHA1 förväntades av överprojekt{" + +#: builtin/submodule--helper.c:2585 +msgid "subsha1" +msgstr "subsha1" + +#: builtin/submodule--helper.c:2586 +msgid "SHA1 of submodule's HEAD" +msgstr "SHA1 för undermodulens \"HEAD\"" + +#: builtin/submodule--helper.c:2592 +msgid "git submodule--helper run-update-procedure [<options>] <path>" +msgstr "git submodule--helper run-update-procedure [<flaggor>] <sökväg>" + +#: builtin/submodule--helper.c:2663 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -22754,84 +23088,186 @@ msgstr "" "Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men " "huvudprojektet är inte på någon gren" -#: builtin/submodule--helper.c:2542 +#: builtin/submodule--helper.c:2781 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "kunde inte få tag i arkivhandtag för undermodulen \"%s\"" -#: builtin/submodule--helper.c:2575 +#: builtin/submodule--helper.c:2814 msgid "recurse into submodules" msgstr "rekursera ner i undermoduler" -#: builtin/submodule--helper.c:2581 +#: builtin/submodule--helper.c:2820 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" -msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]" +msgstr "git submodule--helper absorb-git-dirs [<flaggor>] [<sökväg>...]" -#: builtin/submodule--helper.c:2637 +#: builtin/submodule--helper.c:2876 msgid "check if it is safe to write to the .gitmodules file" msgstr "se om det är säkert att skriva till .gitmodules-filen" -#: builtin/submodule--helper.c:2640 +#: builtin/submodule--helper.c:2879 msgid "unset the config in the .gitmodules file" msgstr "ta bort konfigurationen från .gitmodules-filen" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2884 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <namn> [<värde>]" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2885 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <namn>" -#: builtin/submodule--helper.c:2647 +#: builtin/submodule--helper.c:2886 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2666 git-submodule.sh:150 -#, sh-format +#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121 +#: builtin/submodule--helper.c:3277 msgid "please make sure that the .gitmodules file is in the working tree" msgstr "se till att .gitmodules finns i arbetskatalogen" -#: builtin/submodule--helper.c:2682 +#: builtin/submodule--helper.c:2921 msgid "suppress output for setting url of a submodule" msgstr "dölj utdata från inställning av url för undermodul" -#: builtin/submodule--helper.c:2686 +#: builtin/submodule--helper.c:2925 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <sökväg> <nyurl>" -#: builtin/submodule--helper.c:2719 +#: builtin/submodule--helper.c:2958 msgid "set the default tracking branch to master" msgstr "välj master som förvald spårad gren" -#: builtin/submodule--helper.c:2721 +#: builtin/submodule--helper.c:2960 msgid "set the default tracking branch" msgstr "välj förvald spårad gren" -#: builtin/submodule--helper.c:2725 +#: builtin/submodule--helper.c:2964 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <sökväg>" -#: builtin/submodule--helper.c:2726 +#: builtin/submodule--helper.c:2965 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" -"git submodule--helper set-branch [-q|--quiet] (-b|--brand) <gren> <sökväg>" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <gren> <sökväg>" -#: builtin/submodule--helper.c:2733 +#: builtin/submodule--helper.c:2972 msgid "--branch or --default required" msgstr "--branch eller --default krävs" -#: builtin/submodule--helper.c:2736 -msgid "--branch and --default are mutually exclusive" -msgstr "--branch och --default är ömsesidigt uteslutande" +#: builtin/submodule--helper.c:3038 +#, c-format +msgid "Adding existing repo at '%s' to the index\n" +msgstr "Lägger till befintligt arkiv i \"%s\" i indexet\n" + +#: builtin/submodule--helper.c:3041 +#, c-format +msgid "'%s' already exists and is not a valid git repo" +msgstr "\"%s\" finns redan och är inte ett giltigt git-arkiv" + +#: builtin/submodule--helper.c:3054 +#, c-format +msgid "A git directory for '%s' is found locally with remote(s):\n" +msgstr "En git-katalog för \"%s\" hittades lokalt med fjärr(ar):\n" + +#: builtin/submodule--helper.c:3061 +#, c-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from\n" +" %s\n" +"use the '--force' option. If the local git directory is not the correct " +"repo\n" +"or you are unsure what this means choose another name with the '--name' " +"option." +msgstr "" +"Om du vill återanvända den lokala git-katalogen istället för att klona på " +"nytt från\n" +" %s\n" +"kan du använda flaggan \"--force\". Om den lokala git-katalogen inte är " +"korrekt\n" +"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n" +"flaggan \"--name\"." + +#: builtin/submodule--helper.c:3073 +#, c-format +msgid "Reactivating local git directory for submodule '%s'\n" +msgstr "Aktiverar lokal git-katalog för undermodulen \"%s\" på nytt.\n" + +#: builtin/submodule--helper.c:3110 +#, c-format +msgid "unable to checkout submodule '%s'" +msgstr "Kan inte checka ut undermodulen \"%s\"" + +#: builtin/submodule--helper.c:3149 +#, c-format +msgid "Failed to add submodule '%s'" +msgstr "Misslyckades lägga till undermodulen \"%s\"" + +#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158 +#: builtin/submodule--helper.c:3166 +#, c-format +msgid "Failed to register submodule '%s'" +msgstr "Misslyckades registrera undermodulen \"%s\"" + +#: builtin/submodule--helper.c:3222 +#, c-format +msgid "'%s' already exists in the index" +msgstr "\"%s\" finns redan i indexet" -#: builtin/submodule--helper.c:2793 git.c:449 git.c:724 +#: builtin/submodule--helper.c:3225 +#, c-format +msgid "'%s' already exists in the index and is not a submodule" +msgstr "\"%s\" finns redan i indexet och är inte en undermodul" + +#: builtin/submodule--helper.c:3254 +msgid "branch of repository to add as submodule" +msgstr "gren från arkivet att lägga till som undermodul" + +#: builtin/submodule--helper.c:3255 +msgid "allow adding an otherwise ignored submodule path" +msgstr "tillåt lägga till en annars ignorerad undermodulsökväg" + +#: builtin/submodule--helper.c:3257 +msgid "print only error messages" +msgstr "visa endast felmeddelanden" + +#: builtin/submodule--helper.c:3261 +msgid "borrow the objects from reference repositories" +msgstr "låna objekt från referensarkiv" + +#: builtin/submodule--helper.c:3263 +msgid "" +"sets the submodule’s name to the given string instead of defaulting to its " +"path" +msgstr "" +"sätter undermodulens namn till den angivna strängen istället för att använda " +"sökvägen" + +#: builtin/submodule--helper.c:3270 +msgid "git submodule--helper add [<options>] [--] <repository> [<path>]" +msgstr "git submodule--helper add [<flaggor>] [--] <arkiv> [<sökväg>]" + +#: builtin/submodule--helper.c:3298 +msgid "Relative path can only be used from the toplevel of the working tree" +msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå" + +#: builtin/submodule--helper.c:3306 +#, c-format +msgid "repo URL: '%s' must be absolute or begin with ./|../" +msgstr "arkiv-URL: \"%s\" måste vara absolut eller börja med ./|../" + +#: builtin/submodule--helper.c:3341 +#, c-format +msgid "'%s' is not a valid submodule name" +msgstr "\"%s\" är inte ett giltigt namn på undermodul" + +#: builtin/submodule--helper.c:3405 git.c:452 git.c:726 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" -#: builtin/submodule--helper.c:2799 +#: builtin/submodule--helper.c:3411 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -22857,21 +23293,21 @@ msgstr "ta bort symbolisk referens" msgid "shorten ref output" msgstr "förkorta ref-utdata" -#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 +#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505 msgid "reason" msgstr "skäl" -#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 +#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505 msgid "reason of the update" msgstr "skäl till uppdateringen" #: builtin/tag.c:25 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" -"\t\t<tagname> [<head>]" +" <tagname> [<head>]" msgstr "" "git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>]\n" -"\t\t<taggnamn> [<huvud>]" +" <taggnamn> [<huvud>]" #: builtin/tag.c:27 msgid "git tag -d <tagname>..." @@ -22881,13 +23317,13 @@ msgstr "git tag -d <taggnamn>..." msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" -"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +" [--format=<format>] [--merged <commit>] [--no-merged <commit>] " "[<pattern>...]" msgstr "" "git tag -l [-n[<antal>]] [--contains <incheckning>] [--no-contains " "<incheckning>] [--points-at <objekt>]\n" -"\t\t[--format=<format>] [--merged <incheckning>] [--no-merged <incheckning>] " -"[<mönster>...]" +" [--format=<format>] [--merged <incheckning>] [--no-merged " +"<incheckning>] [<mönster>...]" #: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." @@ -22931,11 +23367,11 @@ msgstr "" "Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n" "du vill.\n" -#: builtin/tag.c:241 +#: builtin/tag.c:240 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:259 +#: builtin/tag.c:258 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -22948,134 +23384,111 @@ msgstr "" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:275 +#: builtin/tag.c:274 msgid "bad object type." msgstr "felaktig objekttyp." -#: builtin/tag.c:328 +#: builtin/tag.c:325 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:335 +#: builtin/tag.c:332 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:446 +#: builtin/tag.c:444 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:448 +#: builtin/tag.c:446 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:450 +#: builtin/tag.c:448 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:451 +#: builtin/tag.c:449 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:453 +#: builtin/tag.c:451 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:455 +#: builtin/tag.c:453 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:457 +#: builtin/tag.c:455 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:459 +#: builtin/tag.c:457 msgid "force edit of tag message" msgstr "tvinga redigering av incheckningsmeddelande" -#: builtin/tag.c:460 +#: builtin/tag.c:458 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:463 +#: builtin/tag.c:461 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:464 +#: builtin/tag.c:462 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:465 builtin/update-ref.c:505 +#: builtin/tag.c:463 builtin/update-ref.c:511 msgid "create a reflog" msgstr "skapa en reflog" -#: builtin/tag.c:467 +#: builtin/tag.c:465 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:468 +#: builtin/tag.c:466 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:469 builtin/tag.c:471 +#: builtin/tag.c:467 builtin/tag.c:469 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:470 builtin/tag.c:472 +#: builtin/tag.c:468 builtin/tag.c:470 msgid "print only tags that don't contain the commit" msgstr "visa endast taggar som inte innehåller incheckningen" -#: builtin/tag.c:473 +#: builtin/tag.c:471 msgid "print only tags that are merged" msgstr "visa endast taggar som slagits samman" -#: builtin/tag.c:474 +#: builtin/tag.c:472 msgid "print only tags that are not merged" msgstr "visa endast taggar som ej slagits samman" -#: builtin/tag.c:478 +#: builtin/tag.c:476 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:526 -msgid "--column and -n are incompatible" -msgstr "--column och -n är inkompatibla" - -#: builtin/tag.c:548 -msgid "-n option is only allowed in list mode" -msgstr "Flaggan -n är endast tillåten i listläge" - -#: builtin/tag.c:550 -msgid "--contains option is only allowed in list mode" -msgstr "Flaggan --contains är endast tillåten i listläge" - -#: builtin/tag.c:552 -msgid "--no-contains option is only allowed in list mode" -msgstr "Flaggan --no-contains är endast tillåten i listläge" - -#: builtin/tag.c:554 -msgid "--points-at option is only allowed in list mode" -msgstr "Flaggan --points-at är endast tillåten i listläge" - -#: builtin/tag.c:556 -msgid "--merged and --no-merged options are only allowed in list mode" -msgstr "Flaggorna --merged och --no-merged är endast tillåtna i listläge" - -#: builtin/tag.c:567 -msgid "only one -F or -m option is allowed." -msgstr "endast en av flaggorna -F eller -m tillåts." +#: builtin/tag.c:558 +#, c-format +msgid "the '%s' option is only allowed in list mode" +msgstr "flaggan \"%s\" är endast tillåten i listläge" -#: builtin/tag.c:592 +#: builtin/tag.c:597 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:597 +#: builtin/tag.c:602 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:628 +#: builtin/tag.c:633 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" @@ -23089,198 +23502,193 @@ msgstr "Packar upp objekt" msgid "failed to create directory %s" msgstr "misslyckades skapa katalogen %s" -#: builtin/update-index.c:100 -#, c-format -msgid "failed to create file %s" -msgstr "misslyckades skapa filen %s" - -#: builtin/update-index.c:108 +#: builtin/update-index.c:106 #, c-format msgid "failed to delete file %s" msgstr "misslyckades ta bort filen %s" -#: builtin/update-index.c:115 builtin/update-index.c:221 +#: builtin/update-index.c:113 builtin/update-index.c:219 #, c-format msgid "failed to delete directory %s" msgstr "misslyckades ta bort katalogen %s" -#: builtin/update-index.c:140 +#: builtin/update-index.c:138 #, c-format msgid "Testing mtime in '%s' " msgstr "Testar mtime i \"%s\" " -#: builtin/update-index.c:154 +#: builtin/update-index.c:152 msgid "directory stat info does not change after adding a new file" msgstr "stat-informationen för en katalog ändras inte när nya filer läggs till" -#: builtin/update-index.c:167 +#: builtin/update-index.c:165 msgid "directory stat info does not change after adding a new directory" msgstr "" "stat-informationen för en katalog ändras inte när nya kataloger läggs till" -#: builtin/update-index.c:180 +#: builtin/update-index.c:178 msgid "directory stat info changes after updating a file" msgstr "stat-informationen för en katalog ändras när filer uppdateras" -#: builtin/update-index.c:191 +#: builtin/update-index.c:189 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "stat-informationen för en katalog ändras när filer läggs till i en " "underkatalog" -#: builtin/update-index.c:202 +#: builtin/update-index.c:200 msgid "directory stat info does not change after deleting a file" msgstr "stat-informationen för en katalog ändras inte när en fil tas bort" -#: builtin/update-index.c:215 +#: builtin/update-index.c:213 msgid "directory stat info does not change after deleting a directory" msgstr "stat-informationen för en katalog ändras inte när en katalog tas bort" -#: builtin/update-index.c:222 +#: builtin/update-index.c:220 msgid " OK" msgstr " OK" -#: builtin/update-index.c:591 +#: builtin/update-index.c:589 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<flaggor>] [--] [<fil>...]" -#: builtin/update-index.c:976 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är àjour" -#: builtin/update-index.c:979 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:982 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:984 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "låt filer ersätta kataloger och omvänt" -#: builtin/update-index.c:986 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:988 +#: builtin/update-index.c:986 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" -#: builtin/update-index.c:991 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:995 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:999 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:1013 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:1016 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:1019 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1020 msgid "do not touch index-only entries" msgstr "rör inte \"endast index\"-poster" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1022 msgid "add to index only; do not add content to object database" msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1024 msgid "remove named paths even if present in worktree" msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1026 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:1030 +#: builtin/update-index.c:1028 msgid "read list of paths to be updated from standard input" msgstr "läs lista över sökvägar att uppdatera från standard in" -#: builtin/update-index.c:1034 +#: builtin/update-index.c:1032 msgid "add entries from standard input to the index" msgstr "lägg poster från standard in till indexet" -#: builtin/update-index.c:1038 +#: builtin/update-index.c:1036 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "återfyll etapp 2 och 3 från angivna sökvägar" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: builtin/update-index.c:1046 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "rapportera åtgärder på standard ut" -#: builtin/update-index.c:1051 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "aktivera/inaktivera ospårad cache" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1059 msgid "test if the filesystem supports untracked cache" msgstr "testa om filsystemet stöder ospårad cache" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1061 msgid "enable untracked cache without testing the filesystem" msgstr "aktivera ospårad cache utan att testa filsystemet" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1063 msgid "write out the index even if is not flagged as changed" msgstr "skriv ut indexet även om det inte angivits som ändrat" -#: builtin/update-index.c:1067 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "aktivera eller inaktivera filsystemsövervakning" -#: builtin/update-index.c:1069 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "markera filer som \"fsmonitor valid\"" -#: builtin/update-index.c:1072 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "töm \"fsmonitor valid\"-bit" -#: builtin/update-index.c:1175 +#: builtin/update-index.c:1173 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -23288,7 +23696,7 @@ msgstr "" "core.splitIndex är satt till false; ta bort eller ändra det om du verkligen " "vill aktivera delat index" -#: builtin/update-index.c:1184 +#: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -23296,7 +23704,7 @@ msgstr "" "core.splitIndex är satt till true; ta bort eller ändra det om du verkligen " "vill inaktivera delat index" -#: builtin/update-index.c:1196 +#: builtin/update-index.c:1194 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -23304,11 +23712,11 @@ msgstr "" "core.untrackedCache är satt till true; ta bort eller ändra det om du " "verkligen vill inaktivera den ospårade cachen" -#: builtin/update-index.c:1200 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "Ospårad cache är inaktiverad" -#: builtin/update-index.c:1208 +#: builtin/update-index.c:1206 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -23316,26 +23724,26 @@ msgstr "" "core.untrackedCache är satt till false; ta bort eller ändra det om du " "verkligen vill aktivera den ospårade cachen" -#: builtin/update-index.c:1212 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Ospårad cache är aktiverad för \"%s\"" -#: builtin/update-index.c:1220 +#: builtin/update-index.c:1218 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "core.fsmonitor inte satt; sätt om du verkligen vill aktivera fsmonitor" -#: builtin/update-index.c:1224 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "fsmonitor aktiverat" -#: builtin/update-index.c:1227 +#: builtin/update-index.c:1225 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor är satt; ta bort om du verkligen vill inaktivera fsmonitor" -#: builtin/update-index.c:1231 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "fsmonitor inaktiverat" @@ -23351,19 +23759,19 @@ msgstr "git update-ref [<flaggor>] <refnamn> <gammaltvärde> [<nyttvärde>]" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<flaggor>] --stdin [-z]" -#: builtin/update-ref.c:500 +#: builtin/update-ref.c:506 msgid "delete the reference" msgstr "ta bort referensen" -#: builtin/update-ref.c:502 +#: builtin/update-ref.c:508 msgid "update <refname> not the one it points to" msgstr "uppdatera <refnamn> inte det den pekar på" -#: builtin/update-ref.c:503 +#: builtin/update-ref.c:509 msgid "stdin has NUL-terminated arguments" msgstr "standard in har NUL-terminerade argument" -#: builtin/update-ref.c:504 +#: builtin/update-ref.c:510 msgid "read updates from stdin" msgstr "läs uppdateringar från standard in" @@ -23379,19 +23787,19 @@ msgstr "uppdatera informationsfilerna från grunden" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<flaggor>] <katalog>" -#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17 +#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17 msgid "quit after a single request/response exchange" msgstr "avsluta omedelbart efter första anrop/svar-utväxling" -#: builtin/upload-pack.c:25 -msgid "exit immediately after initial ref advertisement" -msgstr "avsluta omedelbart efter inledande kungörelse av referenser" +#: builtin/upload-pack.c:26 +msgid "serve up the info/refs for git-http-backend" +msgstr "presentera info/referenser för git-http-backend" -#: builtin/upload-pack.c:27 +#: builtin/upload-pack.c:29 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog" -#: builtin/upload-pack.c:29 +#: builtin/upload-pack.c:31 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "avbryt överföringen efter <n> sekunders inaktivitet" @@ -23421,69 +23829,64 @@ msgstr "visa endast statistik" #: builtin/verify-tag.c:18 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." -msgstr "git verify-tag [-v | --verbose] [--format=<format] <tagg>..." +msgstr "git verify-tag [-v | --verbose] [--format=<format>] <tagg>..." #: builtin/verify-tag.c:36 msgid "print tag contents" msgstr "visa innehåll för tag" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<flaggor>] <sökväg> [<incheckning-igt>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree list [<options>]" msgstr "git worktree list [<flaggor>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<flaggor>] <sökväg>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <arbetskatalog> <ny-sökväg>" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<flaggor>]" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<flaggor>] <arbetskatalog>" -#: builtin/worktree.c:24 +#: builtin/worktree.c:25 msgid "git worktree unlock <path>" msgstr "git worktree unlock <sökväg>" -#: builtin/worktree.c:61 builtin/worktree.c:935 -#, c-format -msgid "failed to delete '%s'" -msgstr "misslyckades ta bort \"%s\"" - -#: builtin/worktree.c:74 +#: builtin/worktree.c:75 #, c-format msgid "Removing %s/%s: %s" msgstr "Tar bort %s/%s: %s" -#: builtin/worktree.c:149 +#: builtin/worktree.c:148 msgid "report pruned working trees" msgstr "rapportera borttagna arbetskataloger" -#: builtin/worktree.c:151 +#: builtin/worktree.c:150 msgid "expire working trees older than <time>" msgstr "låt tid gå ut för arbetskataloger äldre än <tid>" -#: builtin/worktree.c:221 +#: builtin/worktree.c:220 #, c-format msgid "'%s' already exists" msgstr "\"%s\" finns redan" -#: builtin/worktree.c:230 +#: builtin/worktree.c:229 #, c-format msgid "unusable worktree destination '%s'" msgstr "oanvändbar mål för arbetskatalog \"%s\"" -#: builtin/worktree.c:235 +#: builtin/worktree.c:234 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -23493,7 +23896,7 @@ msgstr "" "använd \"%s -f -f\" för att överstyra, eller \"unlock\" och \"prune\" eller " "\"remove\" för att rensa" -#: builtin/worktree.c:237 +#: builtin/worktree.c:236 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -23503,27 +23906,31 @@ msgstr "" "använd \"%s -f\" för att överstyra, eller \"prune\" eller \"remove\" för att " "rensa" -#: builtin/worktree.c:288 +#: builtin/worktree.c:287 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:422 builtin/worktree.c:428 +#: builtin/worktree.c:309 +msgid "initializing" +msgstr "initierar" + +#: builtin/worktree.c:420 builtin/worktree.c:426 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Förbereder arbetskatalog (ny gren \"%s\")" -#: builtin/worktree.c:424 +#: builtin/worktree.c:422 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Förbereder arbetskatalog (återställer gren \"%s\"; var på %s)" -#: builtin/worktree.c:433 +#: builtin/worktree.c:431 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Förbereder arbetskatalog (checkar ut \"%s\")" -#: builtin/worktree.c:439 +#: builtin/worktree.c:437 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)" @@ -23549,83 +23956,79 @@ msgstr "befolka den nya arbetskatalogen" msgid "keep the new working tree locked" msgstr "låt arbetskatalogen förbli låst" -#: builtin/worktree.c:493 +#: builtin/worktree.c:492 builtin/worktree.c:729 +msgid "reason for locking" +msgstr "orsak till lås" + +#: builtin/worktree.c:495 msgid "set up tracking mode (see git-branch(1))" msgstr "ställ in spårningsläge (se git-branch(1))" -#: builtin/worktree.c:496 +#: builtin/worktree.c:498 msgid "try to match the new branch name with a remote-tracking branch" msgstr "försök träffa namn på ny gren mot en fjärrspårande gren" -#: builtin/worktree.c:504 -msgid "-b, -B, and --detach are mutually exclusive" -msgstr "-b, -B och --detach är ömsesidigt uteslutande" +#: builtin/worktree.c:512 +msgid "added with --lock" +msgstr "lagt till med --lock" -#: builtin/worktree.c:565 +#: builtin/worktree.c:574 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track kan endast användas när ny gran skapas" -#: builtin/worktree.c:682 +#: builtin/worktree.c:691 msgid "show extended annotations and reasons, if available" msgstr "visa utökade annoteringar och grunder, om tillgängliga" -#: builtin/worktree.c:684 +#: builtin/worktree.c:693 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "" "lägg till \"prunable\"-annoteringar till arbetskataloger äldre än <tid>" -#: builtin/worktree.c:693 -msgid "--verbose and --porcelain are mutually exclusive" -msgstr "--verbose och --porcelain är ömsesidigt uteslutande" - -#: builtin/worktree.c:720 -msgid "reason for locking" -msgstr "orsak till lås" - -#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839 -#: builtin/worktree.c:963 +#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848 +#: builtin/worktree.c:972 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:734 builtin/worktree.c:767 +#: builtin/worktree.c:743 builtin/worktree.c:776 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:739 +#: builtin/worktree.c:748 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:741 +#: builtin/worktree.c:750 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:769 +#: builtin/worktree.c:778 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" -#: builtin/worktree.c:810 +#: builtin/worktree.c:819 msgid "working trees containing submodules cannot be moved or removed" msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort" -#: builtin/worktree.c:818 +#: builtin/worktree.c:827 msgid "force move even if worktree is dirty or locked" msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst" -#: builtin/worktree.c:841 builtin/worktree.c:965 +#: builtin/worktree.c:850 builtin/worktree.c:974 #, c-format msgid "'%s' is a main working tree" msgstr "\"%s\" är inte en huvudarbetskatalog" -#: builtin/worktree.c:846 +#: builtin/worktree.c:855 #, c-format msgid "could not figure out destination name from '%s'" msgstr "kunde inte lista ut målnamn från \"%s\"" -#: builtin/worktree.c:859 +#: builtin/worktree.c:868 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -23634,7 +24037,7 @@ msgstr "" "kan inte flytta en låst arbetskatalog, orsak till lås: %s\n" "använd \"move -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:861 +#: builtin/worktree.c:870 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -23642,38 +24045,38 @@ msgstr "" "kan inte flytta en låst arbetskatalog;\n" "använd \"move -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:864 +#: builtin/worktree.c:873 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s" -#: builtin/worktree.c:869 +#: builtin/worktree.c:878 #, c-format msgid "failed to move '%s' to '%s'" msgstr "misslyckades flytta \"%s\" till \"%s\"" -#: builtin/worktree.c:915 +#: builtin/worktree.c:924 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "misslyckades köra \"git status\" på \"%s\"" -#: builtin/worktree.c:919 +#: builtin/worktree.c:928 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" "\"%s\" innehåller ändrade eller ospårade filer, använd --force för att ta " "bort det" -#: builtin/worktree.c:924 +#: builtin/worktree.c:933 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "misslyckades köra \"git status\" på \"%s\", kod %d" -#: builtin/worktree.c:947 +#: builtin/worktree.c:956 msgid "force removal even if worktree is dirty or locked" msgstr "tvinga ta bort även om arbetskatalogen är smutsig eller låst" -#: builtin/worktree.c:970 +#: builtin/worktree.c:979 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -23682,7 +24085,7 @@ msgstr "" "kan inte ta bort en låst arbetskatalog, orsak till låset: %s\n" "använd \"remove -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:972 +#: builtin/worktree.c:981 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -23690,17 +24093,17 @@ msgstr "" "kan inte ta bort en låst arbetskatalog;\n" "använd \"remove -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:975 +#: builtin/worktree.c:984 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s" -#: builtin/worktree.c:999 +#: builtin/worktree.c:1008 #, c-format msgid "repair: %s: %s" msgstr "reparera: %s: %s" -#: builtin/worktree.c:1002 +#: builtin/worktree.c:1011 #, c-format msgid "error: %s: %s" msgstr "fel: %s: %s" @@ -23752,21 +24155,16 @@ msgstr "" "<koncept>\" för att läsa mer om specifika underkommandon och koncept.\n" "See \"git help git\" för en översikt över systemet." -#: git.c:188 +#: git.c:188 git.c:216 git.c:300 #, c-format -msgid "no directory given for --git-dir\n" -msgstr "ingen katalog angavs för --git-dir\n" +msgid "no directory given for '%s' option\n" +msgstr "ingen katalog angavs för flaggan \"%s\"\n" #: git.c:202 #, c-format msgid "no namespace given for --namespace\n" msgstr "ingen namnrymd angavs för --namespace\n" -#: git.c:216 -#, c-format -msgid "no directory given for --work-tree\n" -msgstr "ingen katalog angavs för --work-tree\n" - #: git.c:230 #, c-format msgid "no prefix given for --super-prefix\n" @@ -23782,11 +24180,6 @@ msgstr "-c förväntar en konfigurationssträng\n" msgid "no config key given for --config-env\n" msgstr "ingen konfigurationsnyckel angavs för --config-env\n" -#: git.c:300 -#, c-format -msgid "no directory given for -C\n" -msgstr "ingen katalog angavs för -C\n" - #: git.c:326 #, c-format msgid "unknown option: %s\n" @@ -23816,29 +24209,29 @@ msgstr "tomt alias för %s" msgid "recursive alias: %s" msgstr "rekursivt alias: %s" -#: git.c:476 +#: git.c:479 msgid "write failure on standard output" msgstr "skrivfel på standard ut" -#: git.c:478 +#: git.c:481 msgid "unknown write failure on standard output" msgstr "okänt skrivfel på standard ut" -#: git.c:480 +#: git.c:483 msgid "close failed on standard output" msgstr "stäng misslyckades på standard ut" -#: git.c:833 +#: git.c:835 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "alias-slinga detekterades: expansionen av \"%s\" avslutas aldrig:%s" -#: git.c:883 +#: git.c:885 #, c-format msgid "cannot handle %s as a builtin" msgstr "kan inte hantera %s som inbyggd" -#: git.c:896 +#: git.c:898 #, c-format msgid "" "usage: %s\n" @@ -23847,35 +24240,27 @@ msgstr "" "användning: %s\n" "\n" -#: git.c:916 +#: git.c:918 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" "expandering av alias \"%s\" misslyckades; \"%s\" är inte ett git-kommando\n" -#: git.c:928 +#: git.c:930 #, c-format msgid "failed to run command '%s': %s\n" msgstr "misslyckades köra kommandot \"%s\": %s\n" -#: http-fetch.c:118 +#: http-fetch.c:128 #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "" "argumentet till --packfile måste vara ett giltigt hashvärde (fick '%s')" -#: http-fetch.c:128 +#: http-fetch.c:138 msgid "not a git repository" msgstr "inte ett git-arkiv" -#: http-fetch.c:134 -msgid "--packfile requires --index-pack-args" -msgstr "--packfile kräver --index-pack-args" - -#: http-fetch.c:143 -msgid "--index-pack-args can only be used with --packfile" -msgstr "--index-pack-args kan endast användas med --packfile" - #: t/helper/test-fast-rebase.c:141 msgid "unhandled options" msgstr "flaggor som inte hanterats" @@ -23901,66 +24286,32 @@ msgstr "test-tool serve-v2 [<flaggor>]" msgid "exit immediately after advertising capabilities" msgstr "avsluta omedelbart efter kungörelse av kapabiliteter" -#: t/helper/test-simple-ipc.c:262 -#, c-format -msgid "socket/pipe already in use: '%s'" -msgstr "uttag/rör används redan: \"%s\"" - -#: t/helper/test-simple-ipc.c:264 -#, c-format -msgid "could not start server on: '%s'" -msgstr "kunde inte starta server på: \"%s\"" - -#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331 -msgid "could not spawn daemon in the background" -msgstr "kunde inte starta serverprocess i bakgrunden" - -#: t/helper/test-simple-ipc.c:356 -msgid "waitpid failed" -msgstr "\"waitpid\" misslyckades" - -#: t/helper/test-simple-ipc.c:376 -msgid "daemon not online yet" -msgstr "serverprocessen ännu inte operativ" - -#: t/helper/test-simple-ipc.c:406 -msgid "daemon failed to start" -msgstr "serverprocessen kunde inte startas" - -#: t/helper/test-simple-ipc.c:410 -msgid "waitpid is confused" -msgstr "waitpid är förvirrad" - -#: t/helper/test-simple-ipc.c:541 -msgid "daemon has not shutdown yet" -msgstr "serverprocessen har ännu inte avslutats" - -#: t/helper/test-simple-ipc.c:682 +#: t/helper/test-simple-ipc.c:581 msgid "test-helper simple-ipc is-active [<name>] [<options>]" msgstr "test-helper simple-ipc is-active [<namn>] [<flaggor>]" -#: t/helper/test-simple-ipc.c:683 +#: t/helper/test-simple-ipc.c:582 msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]" msgstr "test-helper simple-ipc run-daemon [<namn>] [<trådar>]" -#: t/helper/test-simple-ipc.c:684 +#: t/helper/test-simple-ipc.c:583 msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]" msgstr "" "test-helper simple-ipc start-daemon [<namn>] [<trådar>] [<max-väntetid>]" -#: t/helper/test-simple-ipc.c:685 +#: t/helper/test-simple-ipc.c:584 msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]" msgstr "test-helper simple-ipc stop-daemon [<namn>] [<max-väntetid>]" -#: t/helper/test-simple-ipc.c:686 +#: t/helper/test-simple-ipc.c:585 msgid "test-helper simple-ipc send [<name>] [<token>]" msgstr "test-helper simple-ipc send [<namn>] [<igenkänningstecken>]" -#: t/helper/test-simple-ipc.c:687 +#: t/helper/test-simple-ipc.c:586 msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]" msgstr "test-helper simple-ipc sendbytes [<namn>] [<antal-byte>] [<byte>]" -#: t/helper/test-simple-ipc.c:688 +#: t/helper/test-simple-ipc.c:587 msgid "" "test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " "[<batchsize>]" @@ -23968,83 +24319,79 @@ msgstr "" "test-helper simple-ipc multiple [<namn>] [<trådar>] [<antal-byte>] " "[<buntstorlek>]" -#: t/helper/test-simple-ipc.c:696 +#: t/helper/test-simple-ipc.c:595 msgid "name or pathname of unix domain socket" msgstr "namn eller sövkäg till unixdomän-uttag" -#: t/helper/test-simple-ipc.c:698 +#: t/helper/test-simple-ipc.c:597 msgid "named-pipe name" msgstr "namn på namngivet rör" -#: t/helper/test-simple-ipc.c:700 +#: t/helper/test-simple-ipc.c:599 msgid "number of threads in server thread pool" msgstr "antal trådar i serverns trådpool" -#: t/helper/test-simple-ipc.c:701 +#: t/helper/test-simple-ipc.c:600 msgid "seconds to wait for daemon to start or stop" msgstr "sekunder att vänta på att serverprocessen startar eller stoppar" -#: t/helper/test-simple-ipc.c:703 +#: t/helper/test-simple-ipc.c:602 msgid "number of bytes" msgstr "antal byte" -#: t/helper/test-simple-ipc.c:704 +#: t/helper/test-simple-ipc.c:603 msgid "number of requests per thread" msgstr "antal frågor per tråd" -#: t/helper/test-simple-ipc.c:706 +#: t/helper/test-simple-ipc.c:605 msgid "byte" msgstr "byte" -#: t/helper/test-simple-ipc.c:706 +#: t/helper/test-simple-ipc.c:605 msgid "ballast character" msgstr "ballasttecken" -#: t/helper/test-simple-ipc.c:707 +#: t/helper/test-simple-ipc.c:606 msgid "token" msgstr "igenkänningstecken" -#: t/helper/test-simple-ipc.c:707 +#: t/helper/test-simple-ipc.c:606 msgid "command token to send to the server" msgstr "igenkänningstecken för kommando att sända till servern" -#: http.c:399 +#: http.c:350 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "http.postbuffer har negativt värde; använder förvalet %d" -#: http.c:420 +#: http.c:371 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Delegerad styrning stöds inte av cURL < 7.22.0" -#: http.c:429 -msgid "Public key pinning not supported with cURL < 7.44.0" -msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0" +#: http.c:380 +msgid "Public key pinning not supported with cURL < 7.39.0" +msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.39.0" -#: http.c:910 +#: http.c:812 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REVOKE stöds inte av cURL < 7.44.0" -#: http.c:989 -msgid "Protocol restrictions not supported with cURL < 7.19.4" -msgstr "Prtokollbegränsningar stöds inte av cURL < 7.19.4" - -#: http.c:1132 +#: http.c:1016 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "SSL-bakändan \"%s\" stöds inte. Dessa SSL-bakändor stöds:" -#: http.c:1139 +#: http.c:1023 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "Kan inte sätta SSL-bakända till \"%s\": cURL byggdes utan SSL-bakändor" -#: http.c:1143 +#: http.c:1027 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "Kunde inte sätta SSL-bakända till \"%s\": redan valt" -#: http.c:2035 +#: http.c:1876 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -24060,133 +24407,308 @@ msgstr "" msgid "invalid quoting in push-option value: '%s'" msgstr "felaktig citering på värde för push-option: \"%s\"" -#: remote-curl.c:307 +#: remote-curl.c:304 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "%sinfo/refs inte giltig: är detta ett git-arkiv?" -#: remote-curl.c:408 +#: remote-curl.c:405 msgid "invalid server response; expected service, got flush packet" msgstr "ogiltigt svar från servern; förväntade tjänst, fick flush-paket" -#: remote-curl.c:439 +#: remote-curl.c:436 #, c-format msgid "invalid server response; got '%s'" msgstr "ogiltigt svar från servern; fick \"%s\"" -#: remote-curl.c:499 +#: remote-curl.c:496 #, c-format msgid "repository '%s' not found" msgstr "arkivet \"%s\" hittades inte" -#: remote-curl.c:503 +#: remote-curl.c:500 #, c-format msgid "Authentication failed for '%s'" msgstr "Autentisering misslyckades \"%s\"" -#: remote-curl.c:507 +#: remote-curl.c:504 +#, c-format +msgid "unable to access '%s' with http.pinnedPubkey configuration: %s" +msgstr "kan inte nå \"%s\" med http.pinnedPubkey inställt till: %s" + +#: remote-curl.c:508 #, c-format msgid "unable to access '%s': %s" msgstr "kan inte komma åt \"%s\": %s" -#: remote-curl.c:513 +#: remote-curl.c:514 #, c-format msgid "redirecting to %s" msgstr "omdirigerar till %s" -#: remote-curl.c:642 +#: remote-curl.c:645 msgid "shouldn't have EOF when not gentle on EOF" msgstr "borde inte ha EOF när inte försiktig på EOF" -#: remote-curl.c:654 -msgid "remote server sent stateless separator" -msgstr "fjärrservern sände tillståndslös avdelare" +#: remote-curl.c:657 +msgid "remote server sent unexpected response end packet" +msgstr "fjärrservern sände oväntat svarsavslutningspaketet" -#: remote-curl.c:724 +#: remote-curl.c:726 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "kunde inte spola tillbaka rpc-postdata - försök öka http.postBuffer" -#: remote-curl.c:754 +#: remote-curl.c:755 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "remote-curl: felaktig radlängdstecken: %.4s" -#: remote-curl.c:756 +#: remote-curl.c:757 msgid "remote-curl: unexpected response end packet" msgstr "remote-curl: oväntat svarsavslutningspaketet" -#: remote-curl.c:832 +#: remote-curl.c:833 #, c-format msgid "RPC failed; %s" msgstr "RPC misslyckades; %s" -#: remote-curl.c:872 +#: remote-curl.c:873 msgid "cannot handle pushes this big" msgstr "kan inte hantera så stora sändningar" -#: remote-curl.c:987 +#: remote-curl.c:986 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "kan inte packa upp anrop; zlib-deflate-fel %d" -#: remote-curl.c:991 +#: remote-curl.c:990 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "kan inte packa upp anrop; zlib-slutfel %d" -#: remote-curl.c:1041 +#: remote-curl.c:1040 #, c-format msgid "%d bytes of length header were received" msgstr "%d byte av längd-huvudet togs emot" -#: remote-curl.c:1043 +#: remote-curl.c:1042 #, c-format msgid "%d bytes of body are still expected" msgstr "%d byte av kroppen väntas fortfarande" -#: remote-curl.c:1132 +#: remote-curl.c:1131 msgid "dumb http transport does not support shallow capabilities" msgstr "dum http-transport stöder inte grunda arkiv" -#: remote-curl.c:1147 +#: remote-curl.c:1146 msgid "fetch failed." msgstr "mottagning misslyckades." -#: remote-curl.c:1193 +#: remote-curl.c:1192 msgid "cannot fetch by sha1 over smart http" msgstr "kan inte hämta med sha1 över smart http" -#: remote-curl.c:1237 remote-curl.c:1243 +#: remote-curl.c:1236 remote-curl.c:1242 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "protokollfel: förväntade sha/ref, fick \"%s\"" -#: remote-curl.c:1255 remote-curl.c:1373 +#: remote-curl.c:1254 remote-curl.c:1372 #, c-format msgid "http transport does not support %s" msgstr "http-transporten stöder inte %s" -#: remote-curl.c:1291 +#: remote-curl.c:1290 msgid "git-http-push failed" msgstr "git-http-push misslyckades" -#: remote-curl.c:1479 +#: remote-curl.c:1478 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: användning: git remote-curl <fjärr> [<url>]" -#: remote-curl.c:1511 +#: remote-curl.c:1510 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: fel vid läsning av kommandoström från git" -#: remote-curl.c:1518 +#: remote-curl.c:1517 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: försökte ta emot utan lokalt arkiv" -#: remote-curl.c:1559 +#: remote-curl.c:1558 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: okänt kommando \"%s\" från git" +#: contrib/scalar/scalar.c:49 +msgid "need a working directory" +msgstr "behöver en arbetskatalog" + +#: contrib/scalar/scalar.c:86 +msgid "could not find enlistment root" +msgstr "kunde inte hitta enrolleringsroten" + +#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351 +#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579 +#, c-format +msgid "could not switch to '%s'" +msgstr "kunde inte växla till \"%s\"" + +#: contrib/scalar/scalar.c:180 +#, c-format +msgid "could not configure %s=%s" +msgstr "kunde inte ställa in %s=%s" + +#: contrib/scalar/scalar.c:198 +msgid "could not configure log.excludeDecoration" +msgstr "kunde inte ställa in log.excludeDecoration" + +#: contrib/scalar/scalar.c:219 +msgid "Scalar enlistments require a worktree" +msgstr "Scalar-enrolleringar kräver en arbetskatalog" + +#: contrib/scalar/scalar.c:311 +#, c-format +msgid "remote HEAD is not a branch: '%.*s'" +msgstr "HEAD hos fjärren är inte en gren: \"%.*s\"" + +#: contrib/scalar/scalar.c:317 +msgid "failed to get default branch name from remote; using local default" +msgstr "" +"misslyckades hämta namn på standardgren för fjärr; använder lokalt förval" + +#: contrib/scalar/scalar.c:330 +msgid "failed to get default branch name" +msgstr "misslyckades hämta namn på standardgren" + +#: contrib/scalar/scalar.c:341 +msgid "failed to unregister repository" +msgstr "misslyckades avregistrera arkivet" + +#: contrib/scalar/scalar.c:356 +msgid "failed to delete enlistment directory" +msgstr "misslyckades ta bort enrolleringskatalogen" + +#: contrib/scalar/scalar.c:376 +msgid "branch to checkout after clone" +msgstr "gren att checka ut efter kloning" + +#: contrib/scalar/scalar.c:378 +msgid "when cloning, create full working directory" +msgstr "skapa komplett arbetskatalog vid kloning" + +#: contrib/scalar/scalar.c:380 +msgid "only download metadata for the branch that will be checked out" +msgstr "hämta endast metadata för grenen som skall checkas ut" + +#: contrib/scalar/scalar.c:385 +msgid "scalar clone [<options>] [--] <repo> [<dir>]" +msgstr "scalar clone [<flaggor>] [--] <arkiv> [<kat>]" + +#: contrib/scalar/scalar.c:410 +#, c-format +msgid "cannot deduce worktree name from '%s'" +msgstr "Kan inte härleda arbetsträdsnamn från \"%s\"" + +#: contrib/scalar/scalar.c:419 +#, c-format +msgid "directory '%s' exists already" +msgstr "katalogen \"%s\" finns redan" + +#: contrib/scalar/scalar.c:446 +#, c-format +msgid "failed to get default branch for '%s'" +msgstr "misslyckades hämta standardgren för \"%s\"" + +#: contrib/scalar/scalar.c:457 +#, c-format +msgid "could not configure remote in '%s'" +msgstr "kunde inte ställa in fjärr i \"%s\"" + +#: contrib/scalar/scalar.c:466 +#, c-format +msgid "could not configure '%s'" +msgstr "kunde inte ställa in \"%s\"" + +#: contrib/scalar/scalar.c:469 +msgid "partial clone failed; attempting full clone" +msgstr "delvis klon misslyckades; försöker med fullständig klon" + +#: contrib/scalar/scalar.c:473 +msgid "could not configure for full clone" +msgstr "kunde inte ställa in för komplett klon" + +#: contrib/scalar/scalar.c:505 +msgid "`scalar list` does not take arguments" +msgstr "\"scalar list\" tar inte argument" + +#: contrib/scalar/scalar.c:518 +msgid "scalar register [<enlistment>]" +msgstr "scalar register [<enrollering>]" + +#: contrib/scalar/scalar.c:545 +msgid "reconfigure all registered enlistments" +msgstr "konfigurera alla registrerade enrolleringar på nytt" + +#: contrib/scalar/scalar.c:549 +msgid "scalar reconfigure [--all | <enlistment>]" +msgstr "scalar reconfigure [--all | <enrollering>]" + +#: contrib/scalar/scalar.c:567 +msgid "--all or <enlistment>, but not both" +msgstr "--all eller <enrollering>, men inte bägge" + +#: contrib/scalar/scalar.c:582 +#, c-format +msgid "git repository gone in '%s'" +msgstr "git-arkiv försvunnet i \"%s\"" + +#: contrib/scalar/scalar.c:622 +msgid "" +"scalar run <task> [<enlistment>]\n" +"Tasks:\n" +msgstr "" +"scalar run <uppgift> [<enrollering>]\n" +"Uppgifter:\n" + +#: contrib/scalar/scalar.c:640 +#, c-format +msgid "no such task: '%s'" +msgstr "okänd uppgift: \"%s\"" + +#: contrib/scalar/scalar.c:690 +msgid "scalar unregister [<enlistment>]" +msgstr "scalar unregister [<enrollering>]" + +#: contrib/scalar/scalar.c:737 +msgid "scalar delete <enlistment>" +msgstr "scalar delete <enrollering>" + +#: contrib/scalar/scalar.c:752 +msgid "refusing to delete current working directory" +msgstr "vägrar ta bort aktuell arbetskatalog" + +#: contrib/scalar/scalar.c:767 +msgid "include Git version" +msgstr "ta med Git-version" + +#: contrib/scalar/scalar.c:769 +msgid "include Git's build options" +msgstr "ta med Gits byggflaggor" + +#: contrib/scalar/scalar.c:773 +msgid "scalar verbose [-v | --verbose] [--build-options]" +msgstr "scalar verbose [-v | --verbose] [--build-options]" + +#: contrib/scalar/scalar.c:821 +msgid "" +"scalar <command> [<options>]\n" +"\n" +"Commands:\n" +msgstr "" +"scalar <kommando> [<flaggor>]\n" +"\n" +"Kommandon:\n" + #: compat/compiler.h:26 msgid "no compiler information available\n" msgstr "ingen kompilatorinformation tillgänglig\n" @@ -24203,11 +24725,11 @@ msgstr "argument" msgid "object filtering" msgstr "objektfiltrering" -#: parse-options.h:184 +#: parse-options.h:183 msgid "expiry-date" msgstr "giltig-till" -#: parse-options.h:198 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakåtkompatibilitet)" @@ -24236,11 +24758,11 @@ msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "med --pathspec-from-file, sökvägsangivelser avdelas med NUL-tecken" -#: ref-filter.h:99 +#: ref-filter.h:98 msgid "key" msgstr "nyckel" -#: ref-filter.h:99 +#: ref-filter.h:98 msgid "field name to sort on" msgstr "fältnamn att sortera på" @@ -24310,17 +24832,17 @@ msgid "Show canonical names and email addresses of contacts" msgstr "Visa kanoniska namn och e-postadresser för kontakter" #: command-list.h:65 +msgid "Ensures that a reference name is well formed" +msgstr "Se till att referensen är välformad" + +#: command-list.h:66 msgid "Switch branches or restore working tree files" msgstr "Byt till en ny gren eller återställ filer i arbetskatalogen" -#: command-list.h:66 +#: command-list.h:67 msgid "Copy files from the index to the working tree" msgstr "Kopiera filer från indexet till arbetskatalogen" -#: command-list.h:67 -msgid "Ensures that a reference name is well formed" -msgstr "Se till att referensen är välformad" - #: command-list.h:68 msgid "Find commits yet to be applied to upstream" msgstr "Hitta incheckningar som ännu inte applicerats uppströms" @@ -24515,452 +25037,417 @@ msgstr "" "Lägg till eller tolka strukturerad information i incheckningsmeddelanden" #: command-list.h:116 -msgid "The Git repository browser" -msgstr "Bläddraren för Git-arkiv" - -#: command-list.h:117 msgid "Show commit logs" msgstr "Visa incheckningsloggar" -#: command-list.h:118 +#: command-list.h:117 msgid "Show information about files in the index and the working tree" msgstr "Visa information om filer i indexet och arbetskatalogen" -#: command-list.h:119 +#: command-list.h:118 msgid "List references in a remote repository" msgstr "Lista referenser i ett fjärrarkiv" -#: command-list.h:120 +#: command-list.h:119 msgid "List the contents of a tree object" msgstr "Visa innehållet i ett trädobjekt" -#: command-list.h:121 +#: command-list.h:120 msgid "Extracts patch and authorship from a single e-mail message" msgstr "Hämta patch och ägarskap från ett enkelt e-postmeddelande" -#: command-list.h:122 +#: command-list.h:121 msgid "Simple UNIX mbox splitter program" msgstr "Enkelt program för att dela en UNIX mbox" -#: command-list.h:123 +#: command-list.h:122 msgid "Run tasks to optimize Git repository data" msgstr "Utför uppgifter för att optimera Git-arkivdata" -#: command-list.h:124 +#: command-list.h:123 msgid "Join two or more development histories together" msgstr "Slå ihop två eller flera utvecklingshistorier" -#: command-list.h:125 +#: command-list.h:124 msgid "Find as good common ancestors as possible for a merge" msgstr "Hitta en så bra anfader som möjligt för sammanslagning" -#: command-list.h:126 +#: command-list.h:125 msgid "Run a three-way file merge" msgstr "Kör en trevägs-filsammanslagning" -#: command-list.h:127 +#: command-list.h:126 msgid "Run a merge for files needing merging" msgstr "Kör en sammanslagning för filer som behöver det" -#: command-list.h:128 +#: command-list.h:127 msgid "The standard helper program to use with git-merge-index" msgstr "Förvalt hjälpprogram att använda tillsammans med git-merge-index" +#: command-list.h:128 +msgid "Show three-way merge without touching index" +msgstr "Visa trevägssammanslagning utan att röra indexet" + #: command-list.h:129 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "Kör verktyg för lösning av sammanslagningskonflikter" #: command-list.h:130 -msgid "Show three-way merge without touching index" -msgstr "Visa trevägssammanslagning utan att röra indexet" - -#: command-list.h:131 -msgid "Write and verify multi-pack-indexes" -msgstr "Skriv och verifiera multi-pack-index" - -#: command-list.h:132 msgid "Creates a tag object with extra validation" msgstr "skapar ett taggobjekt med extra validering" -#: command-list.h:133 +#: command-list.h:131 msgid "Build a tree-object from ls-tree formatted text" msgstr "Bygg ett trädobjekt från ls-tree-formaterad text" -#: command-list.h:134 +#: command-list.h:132 +msgid "Write and verify multi-pack-indexes" +msgstr "Skriv och verifiera multi-pack-index" + +#: command-list.h:133 msgid "Move or rename a file, a directory, or a symlink" msgstr "Flytta eller byt namn på en fil, katalog eller symbolisk länk" -#: command-list.h:135 +#: command-list.h:134 msgid "Find symbolic names for given revs" msgstr "Hitta symboliska namn för givna referenser" -#: command-list.h:136 +#: command-list.h:135 msgid "Add or inspect object notes" msgstr "Lägg till eller inspektera objektanteckningar" -#: command-list.h:137 +#: command-list.h:136 msgid "Import from and submit to Perforce repositories" msgstr "Importera från eller sänd till Perforce-arkiv" -#: command-list.h:138 +#: command-list.h:137 msgid "Create a packed archive of objects" msgstr "Skapa ett packat arkiv med objekt" -#: command-list.h:139 +#: command-list.h:138 msgid "Find redundant pack files" msgstr "Hitta redundanta pack-filer" -#: command-list.h:140 +#: command-list.h:139 msgid "Pack heads and tags for efficient repository access" msgstr "Packa huvuden och taggar för effektiv arkivåtkomst" -#: command-list.h:141 +#: command-list.h:140 msgid "Compute unique ID for a patch" msgstr "Beräkna unik ID för en patch" -#: command-list.h:142 +#: command-list.h:141 msgid "Prune all unreachable objects from the object database" msgstr "Ta bort alla onåbara objekt från objektdatabasen" -#: command-list.h:143 +#: command-list.h:142 msgid "Remove extra objects that are already in pack files" msgstr "Ta bort extraobjekt som redan finns i pack-filerna" -#: command-list.h:144 +#: command-list.h:143 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Hämta från och integrera med annat arkiv eller en lokal gren" -#: command-list.h:145 +#: command-list.h:144 msgid "Update remote refs along with associated objects" msgstr "Uppdatera fjärr-referenser och tillhörande objekt" -#: command-list.h:146 +#: command-list.h:145 msgid "Applies a quilt patchset onto the current branch" msgstr "Tillämpar en quilt-patchuppsättning på aktiv gren" -#: command-list.h:147 +#: command-list.h:146 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "Jämför två incheckningsintervall (dvs. två versioner av en gren)" -#: command-list.h:148 +#: command-list.h:147 msgid "Reads tree information into the index" msgstr "Läser trädinformation in i indexet" -#: command-list.h:149 +#: command-list.h:148 msgid "Reapply commits on top of another base tip" msgstr "Applicera incheckningar på nytt ovanpå en annan bastopp" -#: command-list.h:150 +#: command-list.h:149 msgid "Receive what is pushed into the repository" msgstr "Ta emot det som sänds till arkivet" -#: command-list.h:151 +#: command-list.h:150 msgid "Manage reflog information" msgstr "Hantera referenslogg-information" -#: command-list.h:152 +#: command-list.h:151 msgid "Manage set of tracked repositories" msgstr "Hantera uppsättningen spårade arkiv" -#: command-list.h:153 +#: command-list.h:152 msgid "Pack unpacked objects in a repository" msgstr "Packa opackade objekt i ett arkiv" -#: command-list.h:154 +#: command-list.h:153 msgid "Create, list, delete refs to replace objects" msgstr "Skapa, visa, ta bort referenser för att ersätta objekt" -#: command-list.h:155 +#: command-list.h:154 msgid "Generates a summary of pending changes" msgstr "Skapar en sammanfattning av väntande ändringar" -#: command-list.h:156 +#: command-list.h:155 msgid "Reuse recorded resolution of conflicted merges" msgstr "Återanvänd sparad lösning av sammanslagningskonflikter" -#: command-list.h:157 +#: command-list.h:156 msgid "Reset current HEAD to the specified state" msgstr "Återställ aktuell HEAD till angivet tillstånd" -#: command-list.h:158 +#: command-list.h:157 msgid "Restore working tree files" msgstr "Återställ filer i arbetskatalogen" -#: command-list.h:159 -msgid "Revert some existing commits" -msgstr "Återställ några befintliga incheckningar" - -#: command-list.h:160 +#: command-list.h:158 msgid "Lists commit objects in reverse chronological order" msgstr "Visa incheckningsobjekt i omvänd kronologisk ordning" -#: command-list.h:161 +#: command-list.h:159 msgid "Pick out and massage parameters" msgstr "Plocka ut och massera parametrar" -#: command-list.h:162 +#: command-list.h:160 +msgid "Revert some existing commits" +msgstr "Återställ några befintliga incheckningar" + +#: command-list.h:161 msgid "Remove files from the working tree and from the index" msgstr "Ta bort filer från arbetskatalogen och från indexet" -#: command-list.h:163 +#: command-list.h:162 msgid "Send a collection of patches as emails" msgstr "Sänd en uppsättning patchar som e-post" -#: command-list.h:164 +#: command-list.h:163 msgid "Push objects over Git protocol to another repository" msgstr "Sänd objekt över Git-protokollet till annat arkiv" +#: command-list.h:164 +msgid "Git's i18n setup code for shell scripts" +msgstr "Git:s i18n-startkod för skalskript" + #: command-list.h:165 +msgid "Common Git shell script setup code" +msgstr "Gemensam skriptstartkod för Git" + +#: command-list.h:166 msgid "Restricted login shell for Git-only SSH access" msgstr "Begränsat inloggningsskal för SSH-åtkomst till bara Git" -#: command-list.h:166 +#: command-list.h:167 msgid "Summarize 'git log' output" msgstr "Summera \"git log\"-utdata" -#: command-list.h:167 +#: command-list.h:168 msgid "Show various types of objects" msgstr "Visa olika sorters objekt" -#: command-list.h:168 +#: command-list.h:169 msgid "Show branches and their commits" msgstr "Visa grenar och deras incheckningar" -#: command-list.h:169 +#: command-list.h:170 msgid "Show packed archive index" msgstr "Skapa packat arkivindex" -#: command-list.h:170 +#: command-list.h:171 msgid "List references in a local repository" msgstr "Visa referenser i ett lokalt arkiv" -#: command-list.h:171 -msgid "Git's i18n setup code for shell scripts" -msgstr "Git:s i18n-startkod för skalskript" - #: command-list.h:172 -msgid "Common Git shell script setup code" -msgstr "Gemensam skriptstartkod för Git" - -#: command-list.h:173 msgid "Initialize and modify the sparse-checkout" msgstr "Initiera och modifiera sparse-checkout" +#: command-list.h:173 +msgid "Add file contents to the staging area" +msgstr "Lägg filinnehållet till indexet" + #: command-list.h:174 msgid "Stash the changes in a dirty working directory away" msgstr "Spara undan ändringar i en lortig arbetskatalog" #: command-list.h:175 -msgid "Add file contents to the staging area" -msgstr "Lägg filinnehållet till indexet" - -#: command-list.h:176 msgid "Show the working tree status" msgstr "Visa status för arbetskatalogen" -#: command-list.h:177 +#: command-list.h:176 msgid "Remove unnecessary whitespace" msgstr "Ta bort onödiga blanksteg" -#: command-list.h:178 +#: command-list.h:177 msgid "Initialize, update or inspect submodules" msgstr "Initiera, uppdatera eller inspektera undermoduler" -#: command-list.h:179 +#: command-list.h:178 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Dubbelriktad verkan mellan ett Subversion-arkiv och Git" -#: command-list.h:180 +#: command-list.h:179 msgid "Switch branches" msgstr "Byt gren" -#: command-list.h:181 +#: command-list.h:180 msgid "Read, modify and delete symbolic refs" msgstr "Läs, modifiera eller ta bort symbolisk referens" -#: command-list.h:182 +#: command-list.h:181 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt" -#: command-list.h:183 +#: command-list.h:182 msgid "Creates a temporary file with a blob's contents" msgstr "Skapar temporära filer med innehållet från en blob" -#: command-list.h:184 +#: command-list.h:183 msgid "Unpack objects from a packed archive" msgstr "Packa upp objekt från ett pakat arkiv" -#: command-list.h:185 +#: command-list.h:184 msgid "Register file contents in the working tree to the index" msgstr "Registrera filinnehållet från arbetskatalogen i indexet" -#: command-list.h:186 +#: command-list.h:185 msgid "Update the object name stored in a ref safely" msgstr "Uppdatera objektnamnet i en referens på ett säkert sätt" -#: command-list.h:187 +#: command-list.h:186 msgid "Update auxiliary info file to help dumb servers" msgstr "Uppdatera tilläggsinfofil för att hjälpa dumma servrar" -#: command-list.h:188 +#: command-list.h:187 msgid "Send archive back to git-archive" msgstr "Sänd arkivet tillbaka till git-archive" -#: command-list.h:189 +#: command-list.h:188 msgid "Send objects packed back to git-fetch-pack" msgstr "Sänd packade objekt tillbaka till git-fetch-pack" -#: command-list.h:190 +#: command-list.h:189 msgid "Show a Git logical variable" msgstr "Visa en logisk Git-variabel" -#: command-list.h:191 +#: command-list.h:190 msgid "Check the GPG signature of commits" msgstr "Kontrollera GPG-signaturer för incheckningar" -#: command-list.h:192 +#: command-list.h:191 msgid "Validate packed Git archive files" msgstr "Bekräfta packade Git-arkivfiler" -#: command-list.h:193 +#: command-list.h:192 msgid "Check the GPG signature of tags" msgstr "Kontrollera GPG-signaturer i taggar" -#: command-list.h:194 -msgid "Git web interface (web frontend to Git repositories)" -msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)" - -#: command-list.h:195 +#: command-list.h:193 msgid "Show logs with difference each commit introduces" msgstr "Visa loggar med differenser varje incheckning introducerar" -#: command-list.h:196 +#: command-list.h:194 msgid "Manage multiple working trees" msgstr "Hantera ytterligare arbetskataloger" -#: command-list.h:197 +#: command-list.h:195 msgid "Create a tree object from the current index" msgstr "Skapa ett trädobjekt från aktuellt index" -#: command-list.h:198 +#: command-list.h:196 msgid "Defining attributes per path" msgstr "Definierar attribut per sökväg" -#: command-list.h:199 +#: command-list.h:197 msgid "Git command-line interface and conventions" msgstr "Gits kommandoradsgränssnitt och -konventioner" -#: command-list.h:200 +#: command-list.h:198 msgid "A Git core tutorial for developers" msgstr "Grundläggande Git-handledning för utvecklare" -#: command-list.h:201 +#: command-list.h:199 msgid "Providing usernames and passwords to Git" msgstr "Tillhandahåll användarnamn och lösenord till Git" -#: command-list.h:202 +#: command-list.h:200 msgid "Git for CVS users" msgstr "Git för CVS-användare" -#: command-list.h:203 +#: command-list.h:201 msgid "Tweaking diff output" msgstr "Justrea diff-utdata" -#: command-list.h:204 +#: command-list.h:202 msgid "A useful minimum set of commands for Everyday Git" msgstr "Ett användbart minsta uppsättning kommandon för vardags-Git" -#: command-list.h:205 +#: command-list.h:203 msgid "Frequently asked questions about using Git" msgstr "Ofta ställda frågor om att använda Git" -#: command-list.h:206 +#: command-list.h:204 msgid "A Git Glossary" msgstr "En Git-ordlista" -#: command-list.h:207 +#: command-list.h:205 msgid "Hooks used by Git" msgstr "Krokar som används av Git" -#: command-list.h:208 +#: command-list.h:206 msgid "Specifies intentionally untracked files to ignore" msgstr "Ange avsiktligen ospårade filer att ignorera" -#: command-list.h:209 +#: command-list.h:207 +msgid "The Git repository browser" +msgstr "Bläddraren för Git-arkiv" + +#: command-list.h:208 msgid "Map author/committer names and/or E-Mail addresses" -msgstr "Mappa författar-/incheckarnamn och/eller -e-postadresser" +msgstr "Kopplar författar-/incheckarnamn och/eller -e-postadresser" -#: command-list.h:210 +#: command-list.h:209 msgid "Defining submodule properties" msgstr "Ange egenskaper för undermoduler" -#: command-list.h:211 +#: command-list.h:210 msgid "Git namespaces" msgstr "Git-namnrymder" -#: command-list.h:212 +#: command-list.h:211 msgid "Helper programs to interact with remote repositories" msgstr "Hjälpprogram för att interagera med fjärrarkiv" -#: command-list.h:213 +#: command-list.h:212 msgid "Git Repository Layout" msgstr "Gits arkivlayout" -#: command-list.h:214 +#: command-list.h:213 msgid "Specifying revisions and ranges for Git" msgstr "Ange versioner och intervall i Git" -#: command-list.h:215 +#: command-list.h:214 msgid "Mounting one repository inside another" msgstr "Monterar ett arkiv inuti ett annat" +#: command-list.h:215 +msgid "A tutorial introduction to Git" +msgstr "Introduktion till Git" + #: command-list.h:216 msgid "A tutorial introduction to Git: part two" msgstr "Introduktion till Git: del två" #: command-list.h:217 -msgid "A tutorial introduction to Git" -msgstr "Introduktion till Git" +msgid "Git web interface (web frontend to Git repositories)" +msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)" #: command-list.h:218 msgid "An overview of recommended workflows with Git" msgstr "Översikt över rekommenderade arbetsflöden med Git" -#: git-bisect.sh:68 -msgid "bisect run failed: no command provided." -msgstr "bisect-körning misslyckades: inget kommando gavs." - -#: git-bisect.sh:73 -#, sh-format -msgid "running $command" -msgstr "kör $command" - -#: git-bisect.sh:80 -#, sh-format -msgid "" -"bisect run failed:\n" -"exit code $res from '$command' is < 0 or >= 128" -msgstr "" -"\"bisect\"-körningen misslyckades:\n" -"felkod $res från \"$command\" är < 0 eller >= 128" - -#: git-bisect.sh:105 -msgid "bisect run cannot continue any more" -msgstr "\"bisect\"-körningen kan inte fortsätta längre" - -#: git-bisect.sh:111 -#, sh-format -msgid "" -"bisect run failed:\n" -"'bisect-state $state' exited with error code $res" -msgstr "" -"\"bisect\"-körningen misslyckades:\n" -"\"bisect-state $state\" avslutades med felkoden $res" - -#: git-bisect.sh:118 -msgid "bisect run success" -msgstr "\"bisect\"-körningen lyckades" - #: git-merge-octopus.sh:46 msgid "" "Error: Your local changes to the following files would be overwritten by " @@ -25001,94 +25488,17 @@ msgstr "Försök enkel sammanslagning med $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning." -#: git-submodule.sh:179 -msgid "Relative path can only be used from the toplevel of the working tree" -msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå" - -#: git-submodule.sh:189 -#, sh-format -msgid "repo URL: '$repo' must be absolute or begin with ./|../" -msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../" - -#: git-submodule.sh:208 -#, sh-format -msgid "'$sm_path' already exists in the index" -msgstr "\"$sm_path\" finns redan i indexet" - -#: git-submodule.sh:211 -#, sh-format -msgid "'$sm_path' already exists in the index and is not a submodule" -msgstr "\"$sm_path\" finns redan i indexet och är inte en undermodul" - -#: git-submodule.sh:218 -#, sh-format -msgid "'$sm_path' does not have a commit checked out" -msgstr "\"$sm_path\" har inte någon utcheckad incheckning" - -#: git-submodule.sh:249 -#, sh-format -msgid "Adding existing repo at '$sm_path' to the index" -msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet" - -#: git-submodule.sh:251 -#, sh-format -msgid "'$sm_path' already exists and is not a valid git repo" -msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv" - -#: git-submodule.sh:259 -#, sh-format -msgid "A git directory for '$sm_name' is found locally with remote(s):" -msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):" - -#: git-submodule.sh:261 -#, sh-format -msgid "" -"If you want to reuse this local git directory instead of cloning again from\n" -" $realrepo\n" -"use the '--force' option. If the local git directory is not the correct " -"repo\n" -"or you are unsure what this means choose another name with the '--name' " -"option." -msgstr "" -"Om du vill återanvända den lokala git-katalogen instället för att klona på " -"nytt från\n" -" $realrepo\n" -"kan du använda flaggan \"--force\". Om den lokala git-katalogen inte är " -"korrekt\n" -"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n" -"flaggan \"--name\"." - -#: git-submodule.sh:267 -#, sh-format -msgid "Reactivating local git directory for submodule '$sm_name'." -msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt." - -#: git-submodule.sh:279 -#, sh-format -msgid "Unable to checkout submodule '$sm_path'" -msgstr "Kan inte checka ut undermodulen \"$sm_path\"" - -#: git-submodule.sh:284 -#, sh-format -msgid "Failed to add submodule '$sm_path'" -msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" - -#: git-submodule.sh:293 -#, sh-format -msgid "Failed to register submodule '$sm_path'" -msgstr "Misslyckades registrera undermodulen \"$sm_path\"" - -#: git-submodule.sh:568 +#: git-submodule.sh:401 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:578 +#: git-submodule.sh:411 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\"" -#: git-submodule.sh:583 +#: git-submodule.sh:416 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -25097,453 +25507,50 @@ msgstr "" "Kan inte hitta aktuell revision för ${remote_name}/${branch} i " "undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:601 -#, sh-format -msgid "" -"Unable to fetch in submodule path '$displaypath'; trying to directly fetch " -"$sha1:" -msgstr "" -"Kan inte hämta i undermodulsökväg \"$displaypath\"; försökte hämta $sha1 " -"direkt:" - -#: git-submodule.sh:607 -#, sh-format -msgid "" -"Fetched in submodule path '$displaypath', but it did not contain $sha1. " -"Direct fetching of that commit failed." -msgstr "" -"Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. " -"Direkt hämtning av incheckningen misslyckades." - -#: git-submodule.sh:614 -#, sh-format -msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" -msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\"" - -#: git-submodule.sh:615 -#, sh-format -msgid "Submodule path '$displaypath': checked out '$sha1'" -msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" - -#: git-submodule.sh:619 -#, sh-format -msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" -msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\"" - -#: git-submodule.sh:620 -#, sh-format -msgid "Submodule path '$displaypath': rebased into '$sha1'" -msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\"" - -#: git-submodule.sh:625 -#, sh-format -msgid "Unable to merge '$sha1' in submodule path '$displaypath'" -msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\"" - -#: git-submodule.sh:626 -#, sh-format -msgid "Submodule path '$displaypath': merged in '$sha1'" -msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" - -#: git-submodule.sh:631 -#, sh-format -msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" -msgstr "" -"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\"" - -#: git-submodule.sh:632 -#, sh-format -msgid "Submodule path '$displaypath': '$command $sha1'" -msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" - -#: git-submodule.sh:663 +#: git-submodule.sh:464 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-rebase--preserve-merges.sh:109 -msgid "Applied autostash." -msgstr "Tillämpade autostash." - -#: git-rebase--preserve-merges.sh:112 -#, sh-format -msgid "Cannot store $stash_sha1" -msgstr "Kan inte spara $stash_sha1" - -#: git-rebase--preserve-merges.sh:113 -msgid "" -"Applying autostash resulted in conflicts.\n" -"Your changes are safe in the stash.\n" -"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" -msgstr "" -"Tillämpning av autostash gav konflikter.\n" -"Dina ändringar är säkra i stashen.\n" -"Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" - -#: git-rebase--preserve-merges.sh:191 -#, sh-format -msgid "Rebasing ($new_count/$total)" -msgstr "Ombaserar ($new_count/$total)" - -#: git-rebase--preserve-merges.sh:197 -msgid "" -"\n" -"Commands:\n" -"p, pick <commit> = use commit\n" -"r, reword <commit> = use commit, but edit the commit message\n" -"e, edit <commit> = use commit, but stop for amending\n" -"s, squash <commit> = use commit, but meld into previous commit\n" -"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" -"x, exec <commit> = run command (the rest of the line) using shell\n" -"d, drop <commit> = remove commit\n" -"l, label <label> = label current HEAD with a name\n" -"t, reset <label> = reset HEAD to a label\n" -"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". create a merge commit using the original merge commit's\n" -". message (or the oneline, if no original merge commit was\n" -". specified). Use -c <commit> to reword the commit message.\n" -"\n" -"These lines can be re-ordered; they are executed from top to bottom.\n" -msgstr "" -"\n" -"Kommandon:\n" -"p, pick <incheckning> = använd incheckning\n" -"r, reword <incheckning> = använd incheckning, men redigera " -"incheckningsmeddelandet\n" -"e, edit <incheckning> = använd incheckning, men stanna för tillägg\n" -"s, squash <incheckning> = använd incheckning, men infoga i föregående " -"incheckning\n" -"f, fixup <incheckning> = som \"squash\", men förkasta " -"incheckningsmeddelandet\n" -"x, exec <incheckning> = kör kommando (resten av raden) i skalet\n" -"d, drop <incheckning> = ta bort incheckning\n" -"l, label <etikett> = ge aktuellt HEAD ett namn\n" -"t, reset <etikett> = återställ HEAD till en etikett\n" -"m, merge [-C <incheckning> | -c <incheckning>] <etikett> [# <enrads>]\n" -". skapa en sammanslagning med ursprungligt meddelande (eller\n" -". enrads, om inget incheckningsmeddelande angavs). Använd\n" -". -v <incheckning> för att skriva om meddelandet.\n" -"\n" -"Du kan byta ordning på raderna; de utförs uppifrån och ned.\n" - -#: git-rebase--preserve-merges.sh:260 -#, sh-format -msgid "" -"You can amend the commit now, with\n" -"\n" -"\tgit commit --amend $gpg_sign_opt_quoted\n" -"\n" -"Once you are satisfied with your changes, run\n" -"\n" -"\tgit rebase --continue" -msgstr "" -"Du kan utöka incheckningen nu, med\n" -"\n" -"\tgit commit --amend $gpg_sign_opt_quoted\n" -"\n" -"När du är nöjd med dina ändringar kör du\n" -"\n" -"\tgit rebase --continue" - -#: git-rebase--preserve-merges.sh:285 -#, sh-format -msgid "$sha1: not a commit that can be picked" -msgstr "$sha1: inte en incheckning som kan väljas" - -#: git-rebase--preserve-merges.sh:324 -#, sh-format -msgid "Invalid commit name: $sha1" -msgstr "Felaktigt incheckningsnamn: $sha1" - -#: git-rebase--preserve-merges.sh:354 -msgid "Cannot write current commit's replacement sha1" -msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning" - -#: git-rebase--preserve-merges.sh:405 -#, sh-format -msgid "Fast-forward to $sha1" -msgstr "Snabbspolade till $sha1" - -#: git-rebase--preserve-merges.sh:407 -#, sh-format -msgid "Cannot fast-forward to $sha1" -msgstr "Kan inte snabbspola till $sha1" - -#: git-rebase--preserve-merges.sh:416 -#, sh-format -msgid "Cannot move HEAD to $first_parent" -msgstr "Kan inte flytta HEAD till $first_parent" - -#: git-rebase--preserve-merges.sh:421 -#, sh-format -msgid "Refusing to squash a merge: $sha1" -msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1" - -#: git-rebase--preserve-merges.sh:439 -#, sh-format -msgid "Error redoing merge $sha1" -msgstr "Fel när sammanslagningen $sha1 skulle göras om" - -#: git-rebase--preserve-merges.sh:448 -#, sh-format -msgid "Could not pick $sha1" -msgstr "Kunde inte välja $sha1" - -#: git-rebase--preserve-merges.sh:457 -#, sh-format -msgid "This is the commit message #${n}:" -msgstr "Det här är incheckningsmeddelande ${n}:" - -#: git-rebase--preserve-merges.sh:462 -#, sh-format -msgid "The commit message #${n} will be skipped:" -msgstr "Incheckningsmeddelande ${n} kommer hoppas över:" - -#: git-rebase--preserve-merges.sh:473 -#, sh-format -msgid "This is a combination of $count commit." -msgid_plural "This is a combination of $count commits." -msgstr[0] "Det här är en kombination av $count incheckning." -msgstr[1] "Det här är en kombination av $count incheckningar." - -#: git-rebase--preserve-merges.sh:482 -#, sh-format -msgid "Cannot write $fixup_msg" -msgstr "Kan inte skriva $fixup_msg" - -#: git-rebase--preserve-merges.sh:485 -msgid "This is a combination of 2 commits." -msgstr "Det här är en kombination av 2 incheckningar." - -#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 -#: git-rebase--preserve-merges.sh:572 -#, sh-format -msgid "Could not apply $sha1... $rest" -msgstr "Kunde inte tillämpa $sha1... $rest" - -#: git-rebase--preserve-merges.sh:601 -#, sh-format -msgid "" -"Could not amend commit after successfully picking $sha1... $rest\n" -"This is most likely due to an empty commit message, or the pre-commit hook\n" -"failed. If the pre-commit hook failed, you may need to resolve the issue " -"before\n" -"you are able to reword the commit." -msgstr "" -"Kunde inte utöka incheckning efter att ha lyckats välja $sha1... $rest\n" -"Det är antagligen på grund av ett tomt incheckningsmeddelande, eller att\n" -"pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n" -"du måste lösa problemet innan du kan skriva om incheckningsmeddelandet." - -#: git-rebase--preserve-merges.sh:616 -#, sh-format -msgid "Stopped at $sha1_abbrev... $rest" -msgstr "Stoppade på $sha1_abbrev... $rest" - -#: git-rebase--preserve-merges.sh:631 -#, sh-format -msgid "Cannot '$squash_style' without a previous commit" -msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning" - -#: git-rebase--preserve-merges.sh:673 -#, sh-format -msgid "Executing: $rest" -msgstr "Kör: $rest" - -#: git-rebase--preserve-merges.sh:681 -#, sh-format -msgid "Execution failed: $rest" -msgstr "Körning misslyckades: $rest" - -#: git-rebase--preserve-merges.sh:683 -msgid "and made changes to the index and/or the working tree" -msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen" - -#: git-rebase--preserve-merges.sh:685 -msgid "" -"You can fix the problem, and then run\n" -"\n" -"\tgit rebase --continue" -msgstr "" -"Du kan rätta problemet och sedan köra\n" -"\n" -"\tgit rebase --continue" - -#. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:698 -#, sh-format -msgid "" -"Execution succeeded: $rest\n" -"but left changes to the index and/or the working tree\n" -"Commit or stash your changes, and then run\n" -"\n" -"\tgit rebase --continue" -msgstr "" -"Körningen lyckades: $rest\n" -"men lämnade kvar ändringar i indexet och/eller arbetskatalogen\n" -"Checka in eller utför \"stash\" på ändringarna och kör sedan\n" -"\n" -"\tgit rebase --continue" - -#: git-rebase--preserve-merges.sh:709 -#, sh-format -msgid "Unknown command: $command $sha1 $rest" -msgstr "Okänt kommando: $command $sha1 $rest" - -#: git-rebase--preserve-merges.sh:710 -msgid "Please fix this using 'git rebase --edit-todo'." -msgstr "Rätta det med \"git rebase --edit-todo\"." - -#: git-rebase--preserve-merges.sh:745 -#, sh-format -msgid "Successfully rebased and updated $head_name." -msgstr "Lyckades ombasera och uppdatera $head_name." - -#: git-rebase--preserve-merges.sh:802 -msgid "Could not remove CHERRY_PICK_HEAD" -msgstr "Kunde inte ta bort CHERRY_PICK_HEAD" - -#: git-rebase--preserve-merges.sh:807 -#, sh-format -msgid "" -"You have staged changes in your working tree.\n" -"If these changes are meant to be\n" -"squashed into the previous commit, run:\n" -"\n" -" git commit --amend $gpg_sign_opt_quoted\n" -"\n" -"If they are meant to go into a new commit, run:\n" -"\n" -" git commit $gpg_sign_opt_quoted\n" -"\n" -"In both cases, once you're done, continue with:\n" -"\n" -" git rebase --continue\n" -msgstr "" -"Du har köade ändringar i din arbetskatalog.\n" -"Om det är meningen att ändringarna\n" -"ska läggas in i föregående incheckning, kör:\n" -"\n" -" git commit --amend $gpg_sign_opt_quoted\n" -"\n" -"Om de ska checkas in i en egen incheckning, kör:\n" -"\n" -" git commit $gpg_sign_opt_quoted\n" -"\n" -"Oavsett vilket, när du är färdig fortsätter du med:\n" -"\n" -" git rebase --continue\n" - -#: git-rebase--preserve-merges.sh:824 -msgid "Error trying to find the author identity to amend commit" -msgstr "Fel vid försök att hitta författaridentitet för att utöka incheckning" - -#: git-rebase--preserve-merges.sh:829 -msgid "" -"You have uncommitted changes in your working tree. Please commit them\n" -"first and then run 'git rebase --continue' again." -msgstr "" -"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" -"först och kör sedan \"git rebase --continue\" igen." - -#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 -msgid "Could not commit staged changes." -msgstr "Kunde inte checka in köade ändringar." - -#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 -msgid "Could not execute editor" -msgstr "Kunde inte starta textredigerare" - -#: git-rebase--preserve-merges.sh:890 -#, sh-format -msgid "Could not checkout $switch_to" -msgstr "Kunde inte checka ut $switch_to" - -#: git-rebase--preserve-merges.sh:897 -msgid "No HEAD?" -msgstr "Inget HEAD?" - -#: git-rebase--preserve-merges.sh:898 -#, sh-format -msgid "Could not create temporary $state_dir" -msgstr "Kunde inte skapa temporär $state_dir" - -#: git-rebase--preserve-merges.sh:901 -msgid "Could not mark as interactive" -msgstr "Kunde inte markera som interaktiv" - -#: git-rebase--preserve-merges.sh:933 -#, sh-format -msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" -msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" -msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)" -msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)" - -#: git-rebase--preserve-merges.sh:945 -msgid "Note that empty commits are commented out" -msgstr "Observera att tomma incheckningar är utkommenterade" - -#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 -msgid "Could not init rewritten commits" -msgstr "Kunde inte initiera omskrivna incheckningar" - #: git-sh-setup.sh:89 git-sh-setup.sh:94 #, sh-format msgid "usage: $dashless $USAGE" msgstr "använd: $dashless $USAGE" -#: git-sh-setup.sh:191 +#: git-sh-setup.sh:183 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" msgstr "Kunde inte byta katalog till $cdup, toppnivån på arbetskatalogen" -#: git-sh-setup.sh:200 git-sh-setup.sh:207 +#: git-sh-setup.sh:192 git-sh-setup.sh:199 #, sh-format msgid "fatal: $program_name cannot be used without a working tree." msgstr "ödesdigetrt: $program_name kan inte användas utan arbetskatalog." -#: git-sh-setup.sh:221 -msgid "Cannot rebase: You have unstaged changes." -msgstr "Kan inte ombasera: Du har oköade ändringar." - -#: git-sh-setup.sh:224 +#: git-sh-setup.sh:213 msgid "Cannot rewrite branches: You have unstaged changes." msgstr "Kan inte skriva om grenar: Du har oköade ändringar." -#: git-sh-setup.sh:227 -msgid "Cannot pull with rebase: You have unstaged changes." -msgstr "Kan inte hämta med ombasering: Du har oköade ändringar." - -#: git-sh-setup.sh:230 +#: git-sh-setup.sh:216 #, sh-format msgid "Cannot $action: You have unstaged changes." msgstr "Kan inte $action: Du har oköade ändringar." -#: git-sh-setup.sh:243 -msgid "Cannot rebase: Your index contains uncommitted changes." -msgstr "" -"Kan inte ombasera: Ditt index innehåller ändringar som inte checkats in." - -#: git-sh-setup.sh:246 -msgid "Cannot pull with rebase: Your index contains uncommitted changes." -msgstr "" -"Kan inte hämta med ombasering: Ditt index innehåller oincheckade ändringar." - -#: git-sh-setup.sh:249 +#: git-sh-setup.sh:227 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "" "Kan inte $action: Ditt index innehåller ändringar som inte checkats in." -#: git-sh-setup.sh:253 +#: git-sh-setup.sh:229 msgid "Additionally, your index contains uncommitted changes." msgstr "Dessutom innehåller dit index ändringar som inte har checkats in." -#: git-sh-setup.sh:373 +#: git-sh-setup.sh:349 msgid "You need to run this command from the toplevel of the working tree." msgstr "Du måste köra kommandot från arbetskatalogens toppnivå." -#: git-sh-setup.sh:378 +#: git-sh-setup.sh:354 msgid "Unable to determine absolute path of git directory" msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" @@ -25625,7 +25632,7 @@ msgstr "" msgid "failed to open hunk edit file for reading: %s" msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s" -#: git-add--interactive.perl:1251 +#: git-add--interactive.perl:1253 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -25639,7 +25646,7 @@ msgstr "" "a - köa stycket och alla följande i filen\n" "d - köa inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1257 +#: git-add--interactive.perl:1259 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -25653,7 +25660,7 @@ msgstr "" "a - \"stash\":a stycket och alla följande i filen\n" "d - \"stash\":a inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1263 +#: git-add--interactive.perl:1265 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -25667,7 +25674,7 @@ msgstr "" "a - ta bort stycket och alla följande i filen från kön\n" "d - ta inte bort stycket eller något av de följande i filen från kön" -#: git-add--interactive.perl:1269 +#: git-add--interactive.perl:1271 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -25681,7 +25688,7 @@ msgstr "" "a - applicera stycket och alla följande i filen\n" "d - applicera inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1275 git-add--interactive.perl:1293 +#: git-add--interactive.perl:1277 git-add--interactive.perl:1295 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -25695,7 +25702,7 @@ msgstr "" "a - förkasta stycket och alla följande i filen\n" "d - förkasta inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1281 +#: git-add--interactive.perl:1283 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -25709,7 +25716,7 @@ msgstr "" "a - förkasta stycket och alla följande i filen\n" "d - förkasta inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1287 +#: git-add--interactive.perl:1289 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -25723,7 +25730,7 @@ msgstr "" "a - applicera stycket och alla följande i filen\n" "d - applicera inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1299 +#: git-add--interactive.perl:1301 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -25737,7 +25744,7 @@ msgstr "" "a - applicera stycket och alla följande i filen\n" "d - applicera inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1314 +#: git-add--interactive.perl:1316 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -25759,90 +25766,90 @@ msgstr "" "e - redigera aktuellt stycke manuellt\n" "? - visa hjälp\n" -#: git-add--interactive.perl:1345 +#: git-add--interactive.perl:1347 msgid "The selected hunks do not apply to the index!\n" msgstr "Markerade stycken kan inte appliceras på indexet!\n" -#: git-add--interactive.perl:1360 +#: git-add--interactive.perl:1362 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorerar ej sammanslagen: %s\n" -#: git-add--interactive.perl:1479 +#: git-add--interactive.perl:1481 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "Applicera ändrat läge på arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1480 +#: git-add--interactive.perl:1482 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Applicera borttagning på arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1481 +#: git-add--interactive.perl:1483 #, perl-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "Applicera tillägg på arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1482 +#: git-add--interactive.perl:1484 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "Applicera stycket på arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1599 +#: git-add--interactive.perl:1601 msgid "No other hunks to goto\n" msgstr "Inga andra stycken att gå till\n" -#: git-add--interactive.perl:1617 +#: git-add--interactive.perl:1619 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Ogiltigt siffervärde: \"%s\"\n" -#: git-add--interactive.perl:1622 +#: git-add--interactive.perl:1624 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Beklagar, det finns bara %d stycke.\n" msgstr[1] "Beklagar, det finns bara %d stycken.\n" -#: git-add--interactive.perl:1657 +#: git-add--interactive.perl:1659 msgid "No other hunks to search\n" msgstr "Inga andra stycken att söka efter\n" -#: git-add--interactive.perl:1674 +#: git-add--interactive.perl:1676 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n" -#: git-add--interactive.perl:1684 +#: git-add--interactive.perl:1686 msgid "No hunk matches the given pattern\n" msgstr "Inga stycken motsvarar givet mönster\n" -#: git-add--interactive.perl:1696 git-add--interactive.perl:1718 +#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 msgid "No previous hunk\n" msgstr "Inget föregående stycke\n" -#: git-add--interactive.perl:1705 git-add--interactive.perl:1724 +#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 msgid "No next hunk\n" msgstr "Inget följande stycke\n" -#: git-add--interactive.perl:1730 +#: git-add--interactive.perl:1732 msgid "Sorry, cannot split this hunk\n" msgstr "Beklagar, kan inte dela stycket\n" -#: git-add--interactive.perl:1736 +#: git-add--interactive.perl:1738 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Dela i %d stycke.\n" msgstr[1] "Dela i %d stycken.\n" -#: git-add--interactive.perl:1746 +#: git-add--interactive.perl:1748 msgid "Sorry, cannot edit this hunk\n" msgstr "Beklagar, kan inte redigera stycket\n" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1811 +#: git-add--interactive.perl:1813 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -25859,57 +25866,57 @@ msgstr "" "diff - visa diff mellan HEAD och index\n" "add untracked - lägg till innehåll i ospårade filer till köade ändringar\n" -#: git-add--interactive.perl:1828 git-add--interactive.perl:1840 -#: git-add--interactive.perl:1843 git-add--interactive.perl:1850 -#: git-add--interactive.perl:1853 git-add--interactive.perl:1860 -#: git-add--interactive.perl:1864 git-add--interactive.perl:1870 +#: git-add--interactive.perl:1830 git-add--interactive.perl:1842 +#: git-add--interactive.perl:1845 git-add--interactive.perl:1852 +#: git-add--interactive.perl:1855 git-add--interactive.perl:1862 +#: git-add--interactive.perl:1866 git-add--interactive.perl:1872 msgid "missing --" msgstr "saknad --" -#: git-add--interactive.perl:1866 +#: git-add--interactive.perl:1868 #, perl-format msgid "unknown --patch mode: %s" msgstr "okänt läge för --patch: %s" -#: git-add--interactive.perl:1872 git-add--interactive.perl:1878 +#: git-add--interactive.perl:1874 git-add--interactive.perl:1880 #, perl-format msgid "invalid argument %s, expecting --" msgstr "felaktigt argument %s, förväntar --" -#: git-send-email.perl:138 +#: git-send-email.perl:159 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "lokal zon skiljer sig från GMT med delar av minuter\n" -#: git-send-email.perl:145 git-send-email.perl:151 +#: git-send-email.perl:166 git-send-email.perl:172 msgid "local time offset greater than or equal to 24 hours\n" msgstr "lokal tidszonförskjutning större än eller lika med 24 timmar\n" -#: git-send-email.perl:222 +#: git-send-email.perl:244 #, perl-format msgid "fatal: command '%s' died with exit code %d" msgstr "ödesdigert: kommandot \"%s\" dog med slutkoden %d" -#: git-send-email.perl:235 +#: git-send-email.perl:257 msgid "the editor exited uncleanly, aborting everything" msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting" -#: git-send-email.perl:321 +#: git-send-email.perl:346 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" "\"%s\" innehåller en mellanliggande version av e-postbrevet du skrev.\n" -#: git-send-email.perl:326 +#: git-send-email.perl:351 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "\"%s.final\" innehåller det skrivna brevet.\n" -#: git-send-email.perl:419 +#: git-send-email.perl:484 msgid "--dump-aliases incompatible with other options\n" -msgstr "--dump-alias är inkompatibelt med andra flaggor\n" +msgstr "--dump-aliases är inkompatibelt med andra flaggor\n" -#: git-send-email.perl:493 +#: git-send-email.perl:561 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -25921,11 +25928,11 @@ msgstr "" "Sätt sendemail.forbidSendmailVariables till false för att inaktivera denna " "kontroll.\n" -#: git-send-email.perl:498 git-send-email.perl:700 +#: git-send-email.perl:566 git-send-email.perl:782 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Kan inte köra git format-patch från utanför arkivet\n" -#: git-send-email.perl:501 +#: git-send-email.perl:569 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -25933,37 +25940,37 @@ msgstr "" "\"batch-size\" och \"relogin\" måste anges tillsammans (via kommandorad " "eller konfigurationsflagga)\n" -#: git-send-email.perl:514 +#: git-send-email.perl:582 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Okänt fält i --suppress-cc: \"%s\"\n" -#: git-send-email.perl:545 +#: git-send-email.perl:613 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Okänd inställning i --confirm: \"%s\"\n" -#: git-send-email.perl:573 +#: git-send-email.perl:653 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "varning: sendmail-alias med citationstecken stöds inte. %s\n" -#: git-send-email.perl:575 +#: git-send-email.perl:655 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "varning: \":include:\" stöds inte: %s\n" -#: git-send-email.perl:577 +#: git-send-email.perl:657 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "varning: omdirigering til \"/fil\" eller \"|rör\" stöds inte: %s\n" -#: git-send-email.perl:582 +#: git-send-email.perl:662 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "varning: sendmail-raden känns inte igen: %s\n" -#: git-send-email.perl:666 +#: git-send-email.perl:747 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -25978,12 +25985,12 @@ msgstr "" " * Säga \"./%s\" om du menar en fil; eller\n" " * Ange flaggan --format-patch om du menar ett intervall.\n" -#: git-send-email.perl:687 +#: git-send-email.perl:768 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Misslyckades utföra opendir %s: %s" -#: git-send-email.perl:720 +#: git-send-email.perl:803 msgid "" "\n" "No patch files specified!\n" @@ -25993,17 +26000,17 @@ msgstr "" "Inga patchfiler angavs!\n" "\n" -#: git-send-email.perl:733 +#: git-send-email.perl:816 #, perl-format msgid "No subject line in %s?" msgstr "Ingen ärenderad i %s?" -#: git-send-email.perl:743 +#: git-send-email.perl:827 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Kunde inte öppna för skrivning %s: %s" -#: git-send-email.perl:754 +#: git-send-email.perl:838 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -26017,38 +26024,38 @@ msgstr "" "\n" "Rensa brevkroppen om du inte vill sända någon sammanfattning.\n" -#: git-send-email.perl:778 +#: git-send-email.perl:862 #, perl-format msgid "Failed to open %s: %s" msgstr "Misslyckades öppna %s: %s" -#: git-send-email.perl:795 +#: git-send-email.perl:879 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Misslyckades öppna %s.final: %s" -#: git-send-email.perl:838 +#: git-send-email.perl:922 msgid "Summary email is empty, skipping it\n" msgstr "Sammanfattande brev tomt, hoppar över\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:873 +#: git-send-email.perl:971 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Är du säker på att du vill använda <%s> [Y=ja, N=nej]? " -#: git-send-email.perl:928 +#: git-send-email.perl:1026 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" "Följande filer är åttabitars, men anger inte en Content-Transfer-Encoding.\n" -#: git-send-email.perl:933 +#: git-send-email.perl:1031 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Vilken åttabitarsteckenkodning ska jag ange [UTF-8]? " -#: git-send-email.perl:941 +#: git-send-email.perl:1039 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -26061,21 +26068,21 @@ msgstr "" "har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen " "vill sända.\n" -#: git-send-email.perl:960 +#: git-send-email.perl:1058 msgid "To whom should the emails be sent (if anyone)?" msgstr "Till vem ska breven sändas (om någon)?" -#: git-send-email.perl:978 +#: git-send-email.perl:1076 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n" -#: git-send-email.perl:990 +#: git-send-email.perl:1088 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Message-ID att använda som In-Reply-To för det första brevet (om något)? " -#: git-send-email.perl:1048 git-send-email.perl:1056 +#: git-send-email.perl:1150 git-send-email.perl:1158 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "fel: kunde inte få fram en giltig adress från: %s\n" @@ -26083,16 +26090,16 @@ msgstr "fel: kunde inte få fram en giltig adress från: %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1060 +#: git-send-email.perl:1162 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Vad vill du göra med adressen? (q=avsluta, d=kasta, e=redigera): " -#: git-send-email.perl:1377 +#: git-send-email.perl:1482 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA-sökvägen \"%s\" finns inte" -#: git-send-email.perl:1460 +#: git-send-email.perl:1565 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -26119,114 +26126,114 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1475 +#: git-send-email.perl:1580 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "Sända brevet? (y=ja, n=nej, e=redigera, q=avsluta, a=alla): " -#: git-send-email.perl:1478 +#: git-send-email.perl:1583 msgid "Send this email reply required" msgstr "Svar krävs på frågan \"Sända brevet?\"" -#: git-send-email.perl:1506 +#: git-send-email.perl:1617 msgid "The required SMTP server is not properly defined." msgstr "Nödvändig SMTP-server har inte angivits korrekt." -#: git-send-email.perl:1553 +#: git-send-email.perl:1664 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Servern stöder inte SMARTTLS! %s" -#: git-send-email.perl:1558 git-send-email.perl:1562 +#: git-send-email.perl:1669 git-send-email.perl:1673 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS misslyckades! %s" -#: git-send-email.perl:1571 +#: git-send-email.perl:1682 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Kan inte initiera SMTP korrekt. Kontrollera inställningarna och använd --" "smtp-debug." -#: git-send-email.perl:1589 +#: git-send-email.perl:1700 #, perl-format msgid "Failed to send %s\n" msgstr "Misslyckades sända %s\n" -#: git-send-email.perl:1592 +#: git-send-email.perl:1703 #, perl-format msgid "Dry-Sent %s\n" msgstr "Test-Sände %s\n" -#: git-send-email.perl:1592 +#: git-send-email.perl:1703 #, perl-format msgid "Sent %s\n" msgstr "Sände %s\n" -#: git-send-email.perl:1594 +#: git-send-email.perl:1705 msgid "Dry-OK. Log says:\n" msgstr "Test-OK. Loggen säger:\n" -#: git-send-email.perl:1594 +#: git-send-email.perl:1705 msgid "OK. Log says:\n" msgstr "OK. Loggen säger:\n" -#: git-send-email.perl:1606 +#: git-send-email.perl:1724 msgid "Result: " msgstr "Resultat: " -#: git-send-email.perl:1609 +#: git-send-email.perl:1727 msgid "Result: OK\n" msgstr "Resultat: OK\n" -#: git-send-email.perl:1627 +#: git-send-email.perl:1744 #, perl-format msgid "can't open file %s" msgstr "kan inte öppna filen %s" -#: git-send-email.perl:1674 git-send-email.perl:1694 +#: git-send-email.perl:1792 git-send-email.perl:1812 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Lägger till cc: %s från raden \"%s\"\n" -#: git-send-email.perl:1680 +#: git-send-email.perl:1798 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Lägger till to: %s från raden \"%s\"\n" -#: git-send-email.perl:1737 +#: git-send-email.perl:1855 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(icke-mbox) Lägger till cc: %s från raden \"%s\"\n" -#: git-send-email.perl:1772 +#: git-send-email.perl:1890 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(kropp) Lägger till cc: %s från raden \"%s\"\n" -#: git-send-email.perl:1883 +#: git-send-email.perl:2009 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Kunde inte köra \"%s\"" -#: git-send-email.perl:1890 +#: git-send-email.perl:2016 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Lägger till %s: %s från: \"%s\"\n" -#: git-send-email.perl:1894 +#: git-send-email.perl:2020 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) misslyckades stänga röret till \"%s\"" -#: git-send-email.perl:1924 +#: git-send-email.perl:2050 msgid "cannot send message as 7bit" msgstr "kan inte sända brev som sjubitars" -#: git-send-email.perl:1932 +#: git-send-email.perl:2058 msgid "invalid transfer encoding" msgstr "ogiltig överföringskondning" -#: git-send-email.perl:1966 +#: git-send-email.perl:2095 #, perl-format msgid "" "fatal: %s: rejected by sendemail-validate hook\n" @@ -26237,12 +26244,12 @@ msgstr "" "%s\n" "varning: inga patchar har sänts\n" -#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039 +#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168 #, perl-format msgid "unable to open %s: %s\n" msgstr "kunde inte öppna %s: %s\n" -#: git-send-email.perl:1979 +#: git-send-email.perl:2108 #, perl-format msgid "" "fatal: %s:%d is longer than 998 characters\n" @@ -26251,7 +26258,7 @@ msgstr "" "ödesdigert: %s:%d är längre än 998 tecken\n" "varning: inga patchar har sänts\n" -#: git-send-email.perl:1997 +#: git-send-email.perl:2126 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" @@ -26259,11 +26266,911 @@ msgstr "" "säkerhetskopior.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:2001 +#: git-send-email.perl:2130 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "--index outside a repository" +#~ msgstr "--index utanför arkiv" + +#~ msgid "--cached outside a repository" +#~ msgstr "--cached utanför arkiv" + +#~ msgid "unrecognized input" +#~ msgstr "indata känns inte igen" + +#, c-format +#~ msgid "cannot read %s" +#~ msgstr "kan inte läsa %s" + +#~ msgid "Option --exec can only be used together with --remote" +#~ msgstr "Flaggan --exec kan endast användas tillsammans med --remote" + +#, c-format +#~ msgid "" +#~ "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." +#~ msgstr "" +#~ "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\" genom " +#~ "ombasering." + +#, c-format +#~ msgid "Branch '%s' set up to track remote branch '%s' from '%s'." +#~ msgstr "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\"." + +#, c-format +#~ msgid "Branch '%s' set up to track local branch '%s' by rebasing." +#~ msgstr "" +#~ "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\" genom " +#~ "ombasering." + +#, c-format +#~ msgid "Branch '%s' set up to track local branch '%s'." +#~ msgstr "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"." + +#, c-format +#~ msgid "Branch '%s' set up to track remote ref '%s' by rebasing." +#~ msgstr "" +#~ "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\" genom " +#~ "ombasering." + +#, c-format +#~ msgid "Branch '%s' set up to track remote ref '%s'." +#~ msgstr "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\"." + +#~ msgid "Cannot force update the current branch." +#~ msgstr "Kan inte tvinga uppdatering av aktuell gren." + +#, c-format +#~ msgid "Not a valid object name: '%s'." +#~ msgstr "Objektnamnet är inte giltigt: \"%s\"." + +#~ msgid "--name-only, --name-status, --check and -s are mutually exclusive" +#~ msgstr "" +#~ "--name-only, --name-status, --check och -s är ömsesidigt uteslutande" + +#~ msgid "-G, -S and --find-object are mutually exclusive" +#~ msgstr "-G, -S och --find-object är ömsesidigt uteslutande" + +#~ msgid "" +#~ "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" +#~ msgstr "" +#~ "-G och --pickaxe-regex är ömsesidigt uteslutande, använd --pickaxe-regex " +#~ "med -S" + +#~ msgid "" +#~ "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +#~ "with -G and -S" +#~ msgstr "" +#~ "--pickaxe-all och --find-object är ömsesidigt uteslutande, använd --" +#~ "pickaxe-all med -G och -S" + +#~ msgid "--stateless-rpc requires multi_ack_detailed" +#~ msgstr "--stateless-rpc kräver \"multi_ack_detailed\"" + +#~ msgid "--left-only and --right-only are mutually exclusive" +#~ msgstr "--left-only och --right-only är ömsesidigt uteslutande" + +#, c-format +#~ msgid "unrecognized %%(objectsize) argument: %s" +#~ msgstr "okänt %%(objectsize)-argument: %s" + +#, c-format +#~ msgid "unrecognized %%(subject) argument: %s" +#~ msgstr "okänt %%(subject)-argument: %s" + +#, c-format +#~ msgid "unrecognized %%(contents) argument: %s" +#~ msgstr "okänt %%(contents)-argument: %s" + +#, c-format +#~ msgid "unrecognized %%(raw) argument: %s" +#~ msgstr "okänt %%(raw)-argument: %s" + +#, c-format +#~ msgid "unrecognized argument '%s' in %%(%s)" +#~ msgstr "okänt argument \"%s\" i %%(%s)" + +#, c-format +#~ msgid "unrecognized %%(align) argument: %s" +#~ msgstr "okänt %%(align)-argument: %s" + +#, c-format +#~ msgid "unrecognized %%(if) argument: %s" +#~ msgstr "okänt %%(if)-argument: %s" + +#, c-format +#~ msgid "format: %%(if) atom used without a %%(then) atom" +#~ msgstr "format: atomen %%(if) använd utan en %%(then)-atom" + +#, c-format +#~ msgid "format: %%(then) atom used without an %%(if) atom" +#~ msgstr "format: atomen %%(then) använd utan en %%(if)-atom" + +#, c-format +#~ msgid "format: %%(else) atom used without a %%(then) atom" +#~ msgstr "format: atomen %%(else) använd utan en %%(then)-atom" + +#~ msgid "--unsorted-input is incompatible with --no-walk" +#~ msgstr "--unsorted-input är inkompatibelt med --no-walk" + +#~ msgid "--no-walk is incompatible with --unsorted-input" +#~ msgstr "--no-walk är inkompatibelt med --unsorted-input" + +#~ msgid "--dry-run is incompatible with --interactive/--patch" +#~ msgstr "--dry-run är inkompatibelt med --interactive/--patch" + +#~ msgid "--pathspec-from-file is incompatible with --interactive/--patch" +#~ msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch" + +#~ msgid "--pathspec-from-file is incompatible with --edit" +#~ msgstr "--pathspec-from-file är inkompatibelt med --edit" + +#~ msgid "-A and -u are mutually incompatible" +#~ msgstr "-A och -u är ömsesidigt inkompatibla" + +#~ msgid "Option --ignore-missing can only be used together with --dry-run" +#~ msgstr "" +#~ "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" + +#~ msgid "--pathspec-from-file is incompatible with pathspec arguments" +#~ msgstr "" +#~ "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar" + +#~ msgid "--pathspec-file-nul requires --pathspec-from-file" +#~ msgstr "--pathspec-file-nul kräver --pathspec-from-file" + +#, c-format +#~ msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" +#~ msgstr "" +#~ "--show-current-patch=%s är inkompatibelt med --show-current-patch=%s" + +#~ msgid "--column and --verbose are incompatible" +#~ msgstr "--column och --verbose är inkompatibla" + +#, c-format +#~ msgid "'%s' cannot be used with %s" +#~ msgstr "\"%s\" kan inte användas med %s" + +#~ msgid "set upstream info for new branch" +#~ msgstr "sätt uppströmsinformation för ny gren" + +#, c-format +#~ msgid "-%c, -%c and --orphan are mutually exclusive" +#~ msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande" + +#~ msgid "-p and --overlay are mutually exclusive" +#~ msgstr "-p och --overlay är ömsesidigt uteslutande" + +#~ msgid "--pathspec-from-file is incompatible with --detach" +#~ msgstr "--pathspec-from-file är inkompatibelt med --detach" + +#~ msgid "--pathspec-from-file is incompatible with --patch" +#~ msgstr "--pathspec-from-file är inkompatibelt med --patch" + +#, c-format +#~ msgid "--bare and --origin %s options are incompatible." +#~ msgstr "flaggorna --bare och --origin %s är inkompatibla." + +#~ msgid "--bare and --separate-git-dir are incompatible." +#~ msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." + +#~ msgid "--pathspec-from-file with -a does not make sense" +#~ msgstr "--pathspec-from-file med -a ger ingen mening" + +#, c-format +#~ msgid "cannot combine -m with --fixup:%s" +#~ msgstr "kan inte kombinera -m med --fixup:%s" + +#~ msgid "--long and -z are incompatible" +#~ msgstr "--long och -z är inkompatibla" + +#, c-format +#~ msgid "cannot combine reword option of --fixup with path '%s'" +#~ msgstr "" +#~ "kan inte kombinera omformuleringsflaggor för --fixup med sökvägen \"%s\"" + +#~ msgid "" +#~ "reword option of --fixup is mutually exclusive with --patch/--" +#~ "interactive/--all/--include/--only" +#~ msgstr "" +#~ "omformuleringsflaggan i --fixup är ömsesidigt uteslutande med --patch/--" +#~ "interactive/--all/--include/--only" + +#~ msgid "--long is incompatible with --abbrev=0" +#~ msgstr "--long är inkompatibel med --abbrev=0" + +#~ msgid "--dirty is incompatible with commit-ishes" +#~ msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden" + +#~ msgid "--broken is incompatible with commit-ishes" +#~ msgstr "--broken är inkompatibelt med \"commit-ish\"-värden" + +#~ msgid "--stdin and --merge-base are mutually exclusive" +#~ msgstr "--stdin och --merge-base är ömsesidigt uteslutande" + +#~ msgid "--dir-diff is incompatible with --no-index" +#~ msgstr "--dir-diff är inkompatibelt med --no-index" + +#~ msgid "--gui, --tool and --extcmd are mutually exclusive" +#~ msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande" + +#~ msgid "--anonymize-map without --anonymize does not make sense" +#~ msgstr "--anonymize-map utan --anonymize ger ingen mening" + +#~ msgid "Cannot pass both --import-marks and --import-marks-if-exists" +#~ msgstr "Kan inte ange både --import-marks och --import-marks-if-exists" + +#, 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" + +#~ msgid "--deepen and --depth are mutually exclusive" +#~ msgstr "--deepen och --depth är ömsesidigt uteslutande" + +#~ msgid "--depth and --unshallow cannot be used together" +#~ msgstr "--depth och --unshallow kan inte användas samtidigt" + +#~ msgid "--fix-thin cannot be used without --stdin" +#~ msgstr "--fix-thin kan inte användas med --stdin" + +#~ msgid "--object-format cannot be used with --stdin" +#~ msgstr "--object-format kan inte användas med --stdin" + +#~ msgid "--separate-git-dir and --bare are mutually exclusive" +#~ msgstr "--separate-git-dir och --bare är ömsesidigt uteslutande" + +#~ msgid "-n and -k are mutually exclusive" +#~ msgstr "-n och -k kan inte användas samtidigt" + +#~ msgid "--subject-prefix/--rfc and -k are mutually exclusive" +#~ msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt" + +#~ msgid "--stdout, --output, and --output-directory are mutually exclusive" +#~ msgstr "" +#~ "--stdout, --output, och --output-directory är ömsesidigt uteslutande" + +#~ msgid "--creation-factor requires --range-diff" +#~ msgstr "--creation-factor kräver --range-diff" + +#~ msgid "You cannot combine --squash with --no-ff." +#~ msgstr "Du kan inte kombinera --squash med --no-ff." + +#~ msgid "You cannot combine --squash with --commit." +#~ msgstr "Du kan inte kombinera --squash med --commit." + +#~ msgid "--keep-unreachable and --unpack-unreachable are incompatible" +#~ msgstr "" +#~ "--keep-unreachable och --unpack-unreachable kan inte användas samtidigt" + +#~ msgid "--delete is incompatible with --all, --mirror and --tags" +#~ msgstr "--delete är inkompatibel med --all, --mirror och --tags" + +#~ msgid "--all and --tags are incompatible" +#~ msgstr "--all och --tags är inkompatibla" + +#~ msgid "--mirror and --tags are incompatible" +#~ msgstr "--mirror och --tags är inkompatibla" + +#~ msgid "--all and --mirror are incompatible" +#~ msgstr "--all och --mirror är inkompatibla" + +#~ msgid "cannot combine '--keep-base' with '--onto'" +#~ msgstr "kan inte kombinera \"--keep-base\" med \"--onto\"" + +#~ msgid "cannot combine '--keep-base' with '--root'" +#~ msgstr "kan inte kombinera \"--keep-base\" med \"--root\"" + +#~ msgid "cannot combine '--root' with '--fork-point'" +#~ msgstr "kan inte kombinera \"--root\" med \"--fork-point\"" + +#~ msgid "cannot combine apply options with merge options" +#~ msgstr "kan inte kombinera apply-flaggor med merge-flaggor" + +#~ msgid "--keep-unreachable and -A are incompatible" +#~ msgstr "--keep-unreachable och -A kan inte användas samtidigt" + +#~ msgid "--geometric is incompatible with -A, -a" +#~ msgstr "--geometric är inkompatibel med -A, -a" + +#~ msgid "--patch is incompatible with --{hard,mixed,soft}" +#~ msgstr "--patch är inkompatibel med --{hard,mixed,soft}" + +#~ msgid "-N can only be used with --mixed" +#~ msgstr "-N kan endast användas med --mixed" + +#~ msgid "cannot combine --exclude-promisor-objects and --missing" +#~ msgstr "kan inte kombinera --exclude-promisor-objects och --missing" + +#~ msgid "marked counting is incompatible with --objects" +#~ msgstr "markerad räkning är inkompatibelt med --objects" + +#~ msgid "" +#~ "--reflog is incompatible with --all, --remotes, --independent or --merge-" +#~ "base" +#~ msgstr "" +#~ "--reflog är inkompatibel med --all, --remotes, --independent eller --" +#~ "merge-base" + +#~ msgid "git sparse-checkout reapply" +#~ msgstr "git sparse-checkout reapply" + +#~ msgid "--cached and --files are mutually exclusive" +#~ msgstr "--cached och --files är ömsesidigt uteslutande" + +#~ msgid "--branch and --default are mutually exclusive" +#~ msgstr "--branch och --default är ömsesidigt uteslutande" + +#~ msgid "--column and -n are incompatible" +#~ msgstr "--column och -n är inkompatibla" + +#~ msgid "--contains option is only allowed in list mode" +#~ msgstr "Flaggan --contains är endast tillåten i listläge" + +#~ msgid "--no-contains option is only allowed in list mode" +#~ msgstr "Flaggan --no-contains är endast tillåten i listläge" + +#~ msgid "--points-at option is only allowed in list mode" +#~ msgstr "Flaggan --points-at är endast tillåten i listläge" + +#~ msgid "--merged and --no-merged options are only allowed in list mode" +#~ msgstr "Flaggorna --merged och --no-merged är endast tillåtna i listläge" + +#~ msgid "only one -F or -m option is allowed." +#~ msgstr "endast en av flaggorna -F eller -m tillåts." + +#~ msgid "-b, -B, and --detach are mutually exclusive" +#~ msgstr "-b, -B och --detach är ömsesidigt uteslutande" + +#~ msgid "--reason requires --lock" +#~ msgstr "--reason kräver --lock" + +#~ msgid "--verbose and --porcelain are mutually exclusive" +#~ msgstr "--verbose och --porcelain är ömsesidigt uteslutande" + +#, c-format +#~ msgid "no directory given for --git-dir\n" +#~ msgstr "ingen katalog angavs för --git-dir\n" + +#, c-format +#~ msgid "no directory given for --work-tree\n" +#~ msgstr "ingen katalog angavs för --work-tree\n" + +#~ msgid "--packfile requires --index-pack-args" +#~ msgstr "--packfile kräver --index-pack-args" + +#~ msgid "--index-pack-args can only be used with --packfile" +#~ msgstr "--index-pack-args kan endast användas med --packfile" + +#~ msgid "gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s" +#~ msgstr "gpg.ssh.defaultKeycommand lyckades men gav inga nycklar: %s %s" + +#~ msgid "--format=%.*s cannot be used with--python, --shell, --tcl" +#~ msgstr "--format=%.*s kan inte användas med --python, --shell, --tcl" + +#~ msgid "unable to rename temporary '*.%s' file to '%s" +#~ msgstr "kunde inte byta namn på temporär \"*.%s\"-fil till \"%s\"" + +#~ msgid "" +#~ "The following pathspecs didn't match any eligible path, but they do match " +#~ "index\n" +#~ "entries outside the current sparse checkout:\n" +#~ msgstr "" +#~ "Följande sökvägsangivelser motsvarar inte någon kvalificerad sökväg, men " +#~ "motsvarar\n" +#~ "indexposter utanför den nuvarande glesa utcheckningen:\n" + +#~ msgid "" +#~ "Disable or modify the sparsity rules if you intend to update such entries." +#~ msgstr "" +#~ "Du måste ta bort eller ändra glesningsreglerna för att uppdatera sådana " +#~ "poster." + +#~ msgid "could not set GIT_DIR to '%s'" +#~ msgstr "kunde inte ställa in GIT_DIR till \"%s\"" + +#~ msgid "unable to unpack %s header with --allow-unknown-type" +#~ msgstr "kan inte packa upp %s-huvud med --allow-unknown-type" + +#~ msgid "unable to parse %s header with --allow-unknown-type" +#~ msgstr "kan inte tolka %s-huvud med --allow-unknown-type" + +#~ msgid "open /dev/null failed" +#~ msgstr "misslyckades öppna /dev/null" + +#~ msgid "" +#~ "after resolving the conflicts, mark the corrected paths\n" +#~ "with 'git add <paths>' or 'git rm <paths>'\n" +#~ "and commit the result with 'git commit'" +#~ msgstr "" +#~ "efter att ha löst konflikterna, markera de rättade sökvägarna\n" +#~ "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" +#~ "och checka in resultatet med \"git commit\"" + +#~ msgid "open /dev/null or dup failed" +#~ msgstr "misslyckades öppna /dev/null eller \"dup\"" + +#~ msgid "attempting to use sparse-index without cone mode" +#~ msgstr "försöker använda glest index utan \"cone\"-läge" + +#~ msgid "unable to update cache-tree, staying full" +#~ msgstr "kan inte uppdatera cacheträd, behåller fullt läge" + +#~ msgid "Could not open '%s' for writing." +#~ msgstr "Kunde inte öppna \"%s\" för skrivning." + +#~ msgid "could not create archive file '%s'" +#~ msgstr "kunde inte skapa arkivfilen \"%s\"" + +#~ msgid "" +#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" +#~ msgstr "" +#~ "git bisect--helper --bisect-next-check <term-för-rätt> <term-för-fel> " +#~ "<eterm>" + +#~ msgid "--bisect-next-check requires 2 or 3 arguments" +#~ msgstr "--bisect-next-check kräver 2 eller 3 argument" + +#~ msgid "couldn't create a new file at '%s'" +#~ msgstr "kunde inte skapa filen på \"%s\"" + +#~ msgid "git commit-tree: failed to open '%s'" +#~ msgstr "git commit-tree: misslyckades öppna \"%s\"" + +#~ msgid "cannot open packfile '%s'" +#~ msgstr "kan inte öppna paketfilen \"%s\"" + +#~ msgid "cannot store pack file" +#~ msgstr "kan inte spara paketfil" + +#~ msgid "cannot store index file" +#~ msgstr "kan inte spara indexfil" + +#~ msgid "exclude patterns are read from <file>" +#~ msgstr "exkludera mönster som läses från <fil>" + +#~ msgid "Unknown option for merge-recursive: -X%s" +#~ msgstr "Felaktig flagga för merge-recursive: -X%s" + +#~ msgid "unusable todo list: '%s'" +#~ msgstr "oanvändbar todo-lista: %s" + +#~ msgid "git rebase--interactive [<options>]" +#~ msgstr "git rebase--interactive [<flaggor>]" + +#~ msgid "rebase merge commits" +#~ msgstr "ombasera sammanslagningar" + +#~ msgid "keep original branch points of cousins" +#~ msgstr "behåll ursprungliga förgreningspunkter för kusiner" + +#~ msgid "move commits that begin with squash!/fixup!" +#~ msgstr "flytta incheckningar som inleds med squash!/fixup!" + +#~ msgid "sign commits" +#~ msgstr "signera incheckningar" + +#~ msgid "continue rebase" +#~ msgstr "fortsätt ombasering" + +#~ msgid "skip commit" +#~ msgstr "hoppa över incheckning" + +#~ msgid "edit the todo list" +#~ msgstr "redigera attgöra-listan" + +#~ msgid "shorten commit ids in the todo list" +#~ msgstr "förkorta inchecknings-id i todo-listan" + +#~ msgid "expand commit ids in the todo list" +#~ msgstr "utöka inchecknings-id i todo-listan" + +#~ msgid "check the todo list" +#~ msgstr "kontrollera todo-listan" + +#~ msgid "rearrange fixup/squash lines" +#~ msgstr "ordna om fixup-/squash-rader" + +#~ msgid "insert exec commands in todo list" +#~ msgstr "lägg in exec-kommandon i todo-listan" + +#~ msgid "onto" +#~ msgstr "ovanpå" + +#~ msgid "restrict-revision" +#~ msgstr "restrict-revision" + +#~ msgid "restrict revision" +#~ msgstr "begränsa revision" + +#~ msgid "squash-onto" +#~ msgstr "squash-onto" + +#~ msgid "squash onto" +#~ msgstr "tryck ihop ovanpå" + +#~ msgid "the upstream commit" +#~ msgstr "uppströmsincheckningen" + +#~ msgid "head-name" +#~ msgstr "head-name" + +#~ msgid "head name" +#~ msgstr "namn på huvud" + +#~ msgid "rebase strategy" +#~ msgstr "sammanslagningsstrategi" + +#~ msgid "strategy-opts" +#~ msgstr "strategy-opts" + +#~ msgid "strategy options" +#~ msgstr "strategiflaggor" + +#~ msgid "switch-to" +#~ msgstr "switch-to" + +#~ msgid "the branch or commit to checkout" +#~ msgstr "gren eller inchecking att checka ut" + +#~ msgid "onto-name" +#~ msgstr "onto-name" + +#~ msgid "onto name" +#~ msgstr "på-namn" + +#~ msgid "cmd" +#~ msgstr "kmd" + +#~ msgid "the command to run" +#~ msgstr "kommando att köra" + +#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges" +#~ msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges" + +#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'" +#~ msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\"" + +#~ msgid "" +#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" +#~ msgstr "" +#~ "fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-" +#~ "exec\"" + +#~ msgid "" +#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> " +#~ "--name <name>" +#~ msgstr "" +#~ "git submodule--helper add-clone [<flaggor>...] --url <url> --path " +#~ "<sökväg> --name <namn>" + +#~ msgid "failed to create file %s" +#~ msgstr "misslyckades skapa filen %s" + +#~ msgid "exit immediately after initial ref advertisement" +#~ msgstr "avsluta omedelbart efter inledande kungörelse av referenser" + +#~ msgid "socket/pipe already in use: '%s'" +#~ msgstr "uttag/rör används redan: \"%s\"" + +#~ msgid "could not start server on: '%s'" +#~ msgstr "kunde inte starta server på: \"%s\"" + +#~ msgid "could not spawn daemon in the background" +#~ msgstr "kunde inte starta serverprocess i bakgrunden" + +#~ msgid "waitpid failed" +#~ msgstr "\"waitpid\" misslyckades" + +#~ msgid "daemon not online yet" +#~ msgstr "serverprocessen ännu inte operativ" + +#~ msgid "daemon failed to start" +#~ msgstr "serverprocessen kunde inte startas" + +#~ msgid "waitpid is confused" +#~ msgstr "waitpid är förvirrad" + +#~ msgid "daemon has not shutdown yet" +#~ msgstr "serverprocessen har ännu inte avslutats" + +#~ msgid "Protocol restrictions not supported with cURL < 7.19.4" +#~ msgstr "Prtokollbegränsningar stöds inte av cURL < 7.19.4" + +#~ msgid "running $command" +#~ msgstr "kör $command" + +#~ msgid "'$sm_path' does not have a commit checked out" +#~ msgstr "\"$sm_path\" har inte någon utcheckad incheckning" + +#~ msgid "Submodule path '$displaypath': '$command $sha1'" +#~ msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" + +#~ msgid "Applied autostash." +#~ msgstr "Tillämpade autostash." + +#~ msgid "Cannot store $stash_sha1" +#~ msgstr "Kan inte spara $stash_sha1" + +#~ msgid "" +#~ "Applying autostash resulted in conflicts.\n" +#~ "Your changes are safe in the stash.\n" +#~ "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +#~ msgstr "" +#~ "Tillämpning av autostash gav konflikter.\n" +#~ "Dina ändringar är säkra i stashen.\n" +#~ "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" + +#~ msgid "Rebasing ($new_count/$total)" +#~ msgstr "Ombaserar ($new_count/$total)" + +#~ msgid "" +#~ "\n" +#~ "Commands:\n" +#~ "p, pick <commit> = use commit\n" +#~ "r, reword <commit> = use commit, but edit the commit message\n" +#~ "e, edit <commit> = use commit, but stop for amending\n" +#~ "s, squash <commit> = use commit, but meld into previous commit\n" +#~ "f, fixup <commit> = like \"squash\", but discard this commit's log " +#~ "message\n" +#~ "x, exec <commit> = run command (the rest of the line) using shell\n" +#~ "d, drop <commit> = remove commit\n" +#~ "l, label <label> = label current HEAD with a name\n" +#~ "t, reset <label> = reset HEAD to a label\n" +#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +#~ ". create a merge commit using the original merge commit's\n" +#~ ". message (or the oneline, if no original merge commit was\n" +#~ ". specified). Use -c <commit> to reword the commit message.\n" +#~ "\n" +#~ "These lines can be re-ordered; they are executed from top to bottom.\n" +#~ msgstr "" +#~ "\n" +#~ "Kommandon:\n" +#~ "p, pick <incheckning> = använd incheckning\n" +#~ "r, reword <incheckning> = använd incheckning, men redigera " +#~ "incheckningsmeddelandet\n" +#~ "e, edit <incheckning> = använd incheckning, men stanna för tillägg\n" +#~ "s, squash <incheckning> = använd incheckning, men infoga i föregående " +#~ "incheckning\n" +#~ "f, fixup <incheckning> = som \"squash\", men förkasta " +#~ "incheckningsmeddelandet\n" +#~ "x, exec <incheckning> = kör kommando (resten av raden) i skalet\n" +#~ "d, drop <incheckning> = ta bort incheckning\n" +#~ "l, label <etikett> = ge aktuellt HEAD ett namn\n" +#~ "t, reset <etikett> = återställ HEAD till en etikett\n" +#~ "m, merge [-C <incheckning> | -c <incheckning>] <etikett> [# <enrads>]\n" +#~ ". skapa en sammanslagning med ursprungligt meddelande (eller\n" +#~ ". enrads, om inget incheckningsmeddelande angavs). Använd\n" +#~ ". -v <incheckning> för att skriva om meddelandet.\n" +#~ "\n" +#~ "Du kan byta ordning på raderna; de utförs uppifrån och ned.\n" + +#~ msgid "" +#~ "You can amend the commit now, with\n" +#~ "\n" +#~ "\tgit commit --amend $gpg_sign_opt_quoted\n" +#~ "\n" +#~ "Once you are satisfied with your changes, run\n" +#~ "\n" +#~ "\tgit rebase --continue" +#~ msgstr "" +#~ "Du kan utöka incheckningen nu, med\n" +#~ "\n" +#~ "\tgit commit --amend $gpg_sign_opt_quoted\n" +#~ "\n" +#~ "När du är nöjd med dina ändringar kör du\n" +#~ "\n" +#~ "\tgit rebase --continue" + +#~ msgid "$sha1: not a commit that can be picked" +#~ msgstr "$sha1: inte en incheckning som kan väljas" + +#~ msgid "Invalid commit name: $sha1" +#~ msgstr "Felaktigt incheckningsnamn: $sha1" + +#~ msgid "Cannot write current commit's replacement sha1" +#~ msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning" + +#~ msgid "Fast-forward to $sha1" +#~ msgstr "Snabbspolade till $sha1" + +#~ msgid "Cannot fast-forward to $sha1" +#~ msgstr "Kan inte snabbspola till $sha1" + +#~ msgid "Cannot move HEAD to $first_parent" +#~ msgstr "Kan inte flytta HEAD till $first_parent" + +#~ msgid "Refusing to squash a merge: $sha1" +#~ msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1" + +#~ msgid "Error redoing merge $sha1" +#~ msgstr "Fel när sammanslagningen $sha1 skulle göras om" + +#~ msgid "Could not pick $sha1" +#~ msgstr "Kunde inte välja $sha1" + +#~ msgid "This is the commit message #${n}:" +#~ msgstr "Det här är incheckningsmeddelande ${n}:" + +#~ msgid "The commit message #${n} will be skipped:" +#~ msgstr "Incheckningsmeddelande ${n} kommer hoppas över:" + +#~ msgid "This is a combination of $count commit." +#~ msgid_plural "This is a combination of $count commits." +#~ msgstr[0] "Det här är en kombination av $count incheckning." +#~ msgstr[1] "Det här är en kombination av $count incheckningar." + +#~ msgid "Cannot write $fixup_msg" +#~ msgstr "Kan inte skriva $fixup_msg" + +#~ msgid "This is a combination of 2 commits." +#~ msgstr "Det här är en kombination av 2 incheckningar." + +#~ msgid "Could not apply $sha1... $rest" +#~ msgstr "Kunde inte tillämpa $sha1... $rest" + +#~ msgid "" +#~ "Could not amend commit after successfully picking $sha1... $rest\n" +#~ "This is most likely due to an empty commit message, or the pre-commit " +#~ "hook\n" +#~ "failed. If the pre-commit hook failed, you may need to resolve the issue " +#~ "before\n" +#~ "you are able to reword the commit." +#~ msgstr "" +#~ "Kunde inte utöka incheckning efter att ha lyckats välja $sha1... $rest\n" +#~ "Det är antagligen på grund av ett tomt incheckningsmeddelande, eller att\n" +#~ "pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n" +#~ "du måste lösa problemet innan du kan skriva om incheckningsmeddelandet." + +#~ msgid "Stopped at $sha1_abbrev... $rest" +#~ msgstr "Stoppade på $sha1_abbrev... $rest" + +#~ msgid "Cannot '$squash_style' without a previous commit" +#~ msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning" + +#~ msgid "Executing: $rest" +#~ msgstr "Kör: $rest" + +#~ msgid "Execution failed: $rest" +#~ msgstr "Körning misslyckades: $rest" + +#~ msgid "and made changes to the index and/or the working tree" +#~ msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen" + +#~ msgid "" +#~ "You can fix the problem, and then run\n" +#~ "\n" +#~ "\tgit rebase --continue" +#~ msgstr "" +#~ "Du kan rätta problemet och sedan köra\n" +#~ "\n" +#~ "\tgit rebase --continue" + +#~ msgid "" +#~ "Execution succeeded: $rest\n" +#~ "but left changes to the index and/or the working tree\n" +#~ "Commit or stash your changes, and then run\n" +#~ "\n" +#~ "\tgit rebase --continue" +#~ msgstr "" +#~ "Körningen lyckades: $rest\n" +#~ "men lämnade kvar ändringar i indexet och/eller arbetskatalogen\n" +#~ "Checka in eller utför \"stash\" på ändringarna och kör sedan\n" +#~ "\n" +#~ "\tgit rebase --continue" + +#~ msgid "Unknown command: $command $sha1 $rest" +#~ msgstr "Okänt kommando: $command $sha1 $rest" + +#~ msgid "Please fix this using 'git rebase --edit-todo'." +#~ msgstr "Rätta det med \"git rebase --edit-todo\"." + +#~ msgid "Successfully rebased and updated $head_name." +#~ msgstr "Lyckades ombasera och uppdatera $head_name." + +#~ msgid "Could not remove CHERRY_PICK_HEAD" +#~ msgstr "Kunde inte ta bort CHERRY_PICK_HEAD" + +#~ msgid "" +#~ "You have staged changes in your working tree.\n" +#~ "If these changes are meant to be\n" +#~ "squashed into the previous commit, run:\n" +#~ "\n" +#~ " git commit --amend $gpg_sign_opt_quoted\n" +#~ "\n" +#~ "If they are meant to go into a new commit, run:\n" +#~ "\n" +#~ " git commit $gpg_sign_opt_quoted\n" +#~ "\n" +#~ "In both cases, once you're done, continue with:\n" +#~ "\n" +#~ " git rebase --continue\n" +#~ msgstr "" +#~ "Du har köade ändringar i din arbetskatalog.\n" +#~ "Om det är meningen att ändringarna\n" +#~ "ska läggas in i föregående incheckning, kör:\n" +#~ "\n" +#~ " git commit --amend $gpg_sign_opt_quoted\n" +#~ "\n" +#~ "Om de ska checkas in i en egen incheckning, kör:\n" +#~ "\n" +#~ " git commit $gpg_sign_opt_quoted\n" +#~ "\n" +#~ "Oavsett vilket, när du är färdig fortsätter du med:\n" +#~ "\n" +#~ " git rebase --continue\n" + +#~ msgid "Error trying to find the author identity to amend commit" +#~ msgstr "" +#~ "Fel vid försök att hitta författaridentitet för att utöka incheckning" + +#~ msgid "" +#~ "You have uncommitted changes in your working tree. Please commit them\n" +#~ "first and then run 'git rebase --continue' again." +#~ msgstr "" +#~ "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" +#~ "först och kör sedan \"git rebase --continue\" igen." + +#~ msgid "Could not commit staged changes." +#~ msgstr "Kunde inte checka in köade ändringar." + +#~ msgid "Could not execute editor" +#~ msgstr "Kunde inte starta textredigerare" + +#~ msgid "Could not checkout $switch_to" +#~ msgstr "Kunde inte checka ut $switch_to" + +#~ msgid "No HEAD?" +#~ msgstr "Inget HEAD?" + +#~ msgid "Could not create temporary $state_dir" +#~ msgstr "Kunde inte skapa temporär $state_dir" + +#~ msgid "Could not mark as interactive" +#~ msgstr "Kunde inte markera som interaktiv" + +#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" +#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" +#~ msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)" +#~ msgstr[1] "" +#~ "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)" + +#~ msgid "Note that empty commits are commented out" +#~ msgstr "Observera att tomma incheckningar är utkommenterade" + +#~ msgid "Could not init rewritten commits" +#~ msgstr "Kunde inte initiera omskrivna incheckningar" + +#~ msgid "Cannot rebase: You have unstaged changes." +#~ msgstr "Kan inte ombasera: Du har oköade ändringar." + +#~ msgid "Cannot pull with rebase: You have unstaged changes." +#~ msgstr "Kan inte hämta med ombasering: Du har oköade ändringar." + +#~ msgid "Cannot rebase: Your index contains uncommitted changes." +#~ msgstr "" +#~ "Kan inte ombasera: Ditt index innehåller ändringar som inte checkats in." + +#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes." +#~ msgstr "" +#~ "Kan inte hämta med ombasering: Ditt index innehåller oincheckade " +#~ "ändringar." + +#~ msgid "unable to write stateless separator packet" +#~ msgstr "kan inte skriva tillståndslöst avdelarpaket" + +#~ msgid "git merge --abort" +#~ msgstr "git merge --abort" + +#~ msgid "git merge --continue" +#~ msgstr "git merge --continue" + +#~ msgid "git stash clear" +#~ msgstr "git stash clear" + +#~ msgid "remote server sent stateless separator" +#~ msgstr "fjärrservern sände tillståndslös avdelare" + #~ msgid "--cached and --3way cannot be used together." #~ msgstr "--cached och --3way kan inte användas samtidigt." @@ -26639,12 +27546,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "Cannot store %s" #~ msgstr "Kan inte spara %s" -#~ msgid "initialize sparse-checkout" -#~ msgstr "initiera sparse-checkout" - -#~ msgid "set sparse-checkout patterns" -#~ msgstr "ställ in filter för gles utcheckning" - #~ msgid "disable sparse-checkout" #~ msgstr "inaktivera gles utcheckning" @@ -26918,9 +27819,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "unrecognized verb: %s" #~ msgstr "okänt verb: %s" -#~ msgid "option '%s' requires a value" -#~ msgstr "flaggan \"%s\" behöver ett värde" - #~ msgid "could not transform the todo list" #~ msgstr "kunde inte transformera att göra-listan" @@ -27179,9 +28077,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "could not truncate '%s'" #~ msgstr "kunde inte trunkera \"%s\"" -#~ msgid "could not close %s" -#~ msgstr "kunde inte stänga %s" - #~ msgid "Copied a misnamed branch '%s' away" #~ msgstr "Kopierade bort en felaktigt namngiven gren \"%s\"" @@ -27207,9 +28102,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "Failed to recurse into submodule path '$sm_path'" #~ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" -#~ msgid "%%(trailers) does not take arguments" -#~ msgstr "%%(trailers) tar inte argument" - #~ msgid "" #~ "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring." #~ msgstr "" @@ -27538,9 +28430,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "Can't cherry-pick into empty head" #~ msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" -#~ msgid "could not open %s for writing" -#~ msgstr "kunde inte öppna %s för skrivning" - #~ msgid "bug: unhandled unmerged status %x" #~ msgstr "programfel: ej hanterad \"unmerged\"-status %x" @@ -27564,9 +28453,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid " (unable to update local ref)" #~ msgstr " (kunde inte uppdatera lokal ref)" -#~ msgid "Reinitialized existing" -#~ msgstr "Ominitierade befintligt" - #~ msgid "Initialized empty" #~ msgstr "Initierade tomt" @@ -27718,9 +28604,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "branch '%s' does not point at a commit" #~ msgstr "grenen \"%s\" pekar inte på en incheckning" -#~ msgid "print only merged branches" -#~ msgstr "visa endast sammanslagna grenar" - #~ msgid "--dissociate given, but there is no --reference" #~ msgstr "--dissociate angavs, men --reference har inte angivits" |