diff options
| -rw-r--r-- | po/sv.po | 4864 |
1 files changed, 2532 insertions, 2332 deletions
@@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.29.0\n" +"Project-Id-Version: git 2.30.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-10-10 09:32+0800\n" -"PO-Revision-Date: 2020-10-11 11:52+0100\n" +"POT-Creation-Date: 2020-12-15 16:27+0800\n" +"PO-Revision-Date: 2020-12-15 21:41+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -18,200 +18,200 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 3.30.1\n" -#: add-interactive.c:368 +#: add-interactive.c:376 #, c-format msgid "Huh (%s)?" msgstr "Vadå (%s)?" -#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250 -#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 -#: builtin/rebase.c:1944 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284 +#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532 +#: builtin/rebase.c:1955 msgid "could not read index" msgstr "kunde inte läsa indexet" -#: add-interactive.c:576 git-add--interactive.perl:269 +#: add-interactive.c:584 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "binär" -#: add-interactive.c:634 git-add--interactive.perl:278 +#: add-interactive.c:642 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "ingenting" -#: add-interactive.c:635 git-add--interactive.perl:314 +#: add-interactive.c:643 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "oändrad" -#: add-interactive.c:672 git-add--interactive.perl:643 +#: add-interactive.c:680 git-add--interactive.perl:641 msgid "Update" msgstr "Uppdatera" -#: add-interactive.c:689 add-interactive.c:877 +#: add-interactive.c:697 add-interactive.c:885 #, c-format msgid "could not stage '%s'" msgstr "kunde inte köa \"%s\"" -#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478 msgid "could not write index" msgstr "kunde inte skriva indexet" -#: add-interactive.c:698 git-add--interactive.perl:628 +#: add-interactive.c:706 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:716 git-add--interactive.perl:678 +#: add-interactive.c:724 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:721 apply.c:4127 builtin/checkout.c:295 +#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:295 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: add-interactive.c:751 git-add--interactive.perl:655 +#: add-interactive.c:759 git-add--interactive.perl:653 msgid "Revert" msgstr "Återställ" -#: add-interactive.c:767 +#: add-interactive.c:775 msgid "Could not parse HEAD^{tree}" msgstr "kunde inte tolka HEAD^{tree}" -#: add-interactive.c:805 git-add--interactive.perl:631 +#: add-interactive.c:813 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:856 git-add--interactive.perl:695 +#: add-interactive.c:864 git-add--interactive.perl:693 #, c-format msgid "No untracked files.\n" msgstr "Inga ospårade filer.\n" -#: add-interactive.c:860 git-add--interactive.perl:689 +#: add-interactive.c:868 git-add--interactive.perl:687 msgid "Add untracked" msgstr "Lägg till ospårad" -#: add-interactive.c:887 git-add--interactive.perl:625 +#: add-interactive.c:895 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:917 +#: add-interactive.c:925 #, c-format msgid "ignoring unmerged: %s" msgstr "ignorerar ej sammanslagen: %s" -#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371 +#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "Endast binära filer ändrade.\n" -#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 +#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "Inga ändringar.\n" -#: add-interactive.c:935 git-add--interactive.perl:1381 +#: add-interactive.c:943 git-add--interactive.perl:1379 msgid "Patch update" msgstr "Uppdatera patch" -#: add-interactive.c:974 git-add--interactive.perl:1794 +#: add-interactive.c:982 git-add--interactive.perl:1792 msgid "Review diff" msgstr "Granska diff" -#: add-interactive.c:1002 +#: add-interactive.c:1010 msgid "show paths with changes" msgstr "visa sökvägar med ändringar" -#: add-interactive.c:1004 +#: add-interactive.c:1012 msgid "add working tree state to the staged set of changes" msgstr "lägg arbetskatalogens tillstånd till köade ändringar" -#: add-interactive.c:1006 +#: add-interactive.c:1014 msgid "revert staged set of changes back to the HEAD version" msgstr "återställ köade ändringar tillbaka till HEAD-versionen" -#: add-interactive.c:1008 +#: add-interactive.c:1016 msgid "pick hunks and update selectively" msgstr "välj stycken och uppdatera selektivt" -#: add-interactive.c:1010 +#: add-interactive.c:1018 msgid "view diff between HEAD and index" msgstr "visa skillnad mellan HEAD och index" -#: add-interactive.c:1012 +#: add-interactive.c:1020 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:1020 add-interactive.c:1069 +#: add-interactive.c:1028 add-interactive.c:1077 msgid "Prompt help:" msgstr "Kommandoradshjälp:" -#: add-interactive.c:1022 +#: add-interactive.c:1030 msgid "select a single item" msgstr "markera en post" -#: add-interactive.c:1024 +#: add-interactive.c:1032 msgid "select a range of items" msgstr "markera intervall av poster" -#: add-interactive.c:1026 +#: add-interactive.c:1034 msgid "select multiple ranges" msgstr "markera flera intervall" -#: add-interactive.c:1028 add-interactive.c:1073 +#: add-interactive.c:1036 add-interactive.c:1081 msgid "select item based on unique prefix" msgstr "markera post baserad på unikt prefix" -#: add-interactive.c:1030 +#: add-interactive.c:1038 msgid "unselect specified items" msgstr "avmarkera angivna poster" -#: add-interactive.c:1032 +#: add-interactive.c:1040 msgid "choose all items" msgstr "välj alla poster" -#: add-interactive.c:1034 +#: add-interactive.c:1042 msgid "(empty) finish selecting" msgstr "(tomt) avsluta markering" -#: add-interactive.c:1071 +#: add-interactive.c:1079 msgid "select a numbered item" msgstr "markera en numrerad post" -#: add-interactive.c:1075 +#: add-interactive.c:1083 msgid "(empty) select nothing" msgstr "(tomt) markera ingenting" -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891 +#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 msgid "What now" msgstr "Vad nu" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 git-add--interactive.perl:213 msgid "staged" msgstr "köad" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 git-add--interactive.perl:213 msgid "unstaged" msgstr "ej köad" -#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270 -#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 -#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: add-interactive.c:1144 apply.c:4989 apply.c:4992 builtin/am.c:2257 +#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 +#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190 #: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 #: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 #: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 @@ -219,31 +219,31 @@ msgstr "ej köad" msgid "path" msgstr "sökväg" -#: add-interactive.c:1143 +#: add-interactive.c:1151 msgid "could not refresh index" msgstr "kunde inte uppdatera indexet" -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805 +#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "Hej då.\n" -#: add-patch.c:34 git-add--interactive.perl:1433 +#: add-patch.c:34 git-add--interactive.perl:1431 #, 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:1434 +#: add-patch.c:35 git-add--interactive.perl:1432 #, 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:1435 +#: add-patch.c:36 git-add--interactive.perl:1433 #, 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:1436 +#: add-patch.c:37 git-add--interactive.perl:1434 #, 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 +270,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:1439 +#: add-patch.c:56 git-add--interactive.perl:1437 #, 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:1440 +#: add-patch.c:57 git-add--interactive.perl:1438 #, 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:1441 +#: add-patch.c:58 git-add--interactive.perl:1439 #, 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:1442 +#: add-patch.c:59 git-add--interactive.perl:1440 #, 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 +312,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:1445 +#: add-patch.c:80 git-add--interactive.perl:1443 #, 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:1446 +#: add-patch.c:81 git-add--interactive.perl:1444 #, 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:1447 +#: add-patch.c:82 git-add--interactive.perl:1445 #, 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:1448 +#: add-patch.c:83 git-add--interactive.perl:1446 #, 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 +354,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:1451 +#: add-patch.c:103 git-add--interactive.perl:1449 #, 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:1452 +#: add-patch.c:104 git-add--interactive.perl:1450 #, 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:1453 +#: add-patch.c:105 git-add--interactive.perl:1451 #, 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:1454 +#: add-patch.c:106 git-add--interactive.perl:1452 #, 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 +396,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:1457 -#: git-add--interactive.perl:1475 +#: add-patch.c:126 git-add--interactive.perl:1455 +#: git-add--interactive.perl:1473 #, 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:1458 -#: git-add--interactive.perl:1476 +#: add-patch.c:127 git-add--interactive.perl:1456 +#: git-add--interactive.perl:1474 #, 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:1459 -#: git-add--interactive.perl:1477 +#: add-patch.c:128 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 #, 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:1460 -#: git-add--interactive.perl:1478 +#: add-patch.c:129 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 #, 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 +442,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:1463 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 #, 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:1464 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 #, 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:1465 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463 #, 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:1466 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464 #, 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 +476,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:1469 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 #, 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:1470 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468 #, 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:1471 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469 #, 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:1472 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 #, 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,?]? " @@ -559,7 +559,7 @@ msgstr "" "Alla rader i indata måste ha en motsvarande rad i utdata från\n" "ditt filter." -#: add-patch.c:785 +#: add-patch.c:790 #, c-format msgid "" "expected context line #%d in\n" @@ -568,7 +568,7 @@ msgstr "" "förväntade sammanhangsrad %d i\n" "%.*s" -#: add-patch.c:800 +#: add-patch.c:805 #, c-format msgid "" "hunks do not overlap:\n" @@ -581,11 +581,11 @@ msgstr "" "\tavslutas inte med:\n" "%.*s" -#: add-patch.c:1076 git-add--interactive.perl:1117 +#: add-patch.c:1081 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:1080 +#: add-patch.c:1085 #, c-format msgid "" "---\n" @@ -599,7 +599,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:1094 git-add--interactive.perl:1131 +#: add-patch.c:1099 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 +609,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:1127 +#: add-patch.c:1132 msgid "could not parse hunk header" msgstr "kunde inte tolka styckehuvud" -#: add-patch.c:1172 +#: add-patch.c:1177 msgid "'git apply --cached' failed" msgstr "\"git apply --cached\" misslyckades" @@ -629,26 +629,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:1241 git-add--interactive.perl:1244 +#: add-patch.c:1246 git-add--interactive.perl:1242 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:1284 +#: add-patch.c:1289 msgid "The selected hunks do not apply to the index!" msgstr "Markerade stycken kan inte appliceras på indexet!" -#: add-patch.c:1285 git-add--interactive.perl:1348 +#: add-patch.c:1290 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "Applicera dem på arbetskatalogen trots det? " -#: add-patch.c:1292 git-add--interactive.perl:1351 +#: add-patch.c:1297 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "Ingenting applicerades.\n" -#: add-patch.c:1349 +#: add-patch.c:1354 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -670,73 +670,73 @@ msgstr "" "e - redigera aktuellt stycke manuellt\n" "? - visa hjälp\n" -#: add-patch.c:1511 add-patch.c:1521 +#: add-patch.c:1516 add-patch.c:1526 msgid "No previous hunk" msgstr "Inget föregående stycke" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1521 add-patch.c:1531 msgid "No next hunk" msgstr "Inget följande stycke" -#: add-patch.c:1532 +#: add-patch.c:1537 msgid "No other hunks to goto" msgstr "Inga andra stycken att gå till" -#: add-patch.c:1543 git-add--interactive.perl:1608 +#: add-patch.c:1548 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " msgstr "gå till vilket stycke (<ret> för att se fler)? " -#: add-patch.c:1544 git-add--interactive.perl:1610 +#: add-patch.c:1549 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "gå till vilket stycke? " -#: add-patch.c:1555 +#: add-patch.c:1560 #, c-format msgid "Invalid number: '%s'" msgstr "Ogiltigt siffervärde: \"%s\"" -#: add-patch.c:1560 +#: add-patch.c:1565 #, 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:1569 +#: add-patch.c:1574 msgid "No other hunks to search" msgstr "Inga andra stycken att söka efter" -#: add-patch.c:1575 git-add--interactive.perl:1663 +#: add-patch.c:1580 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "sök efter reguljärt uttryck? " -#: add-patch.c:1590 +#: add-patch.c:1595 #, c-format msgid "Malformed search regexp %s: %s" msgstr "Felaktigt format på reguljärt sökuttryck %s: %s" -#: add-patch.c:1607 +#: add-patch.c:1612 msgid "No hunk matches the given pattern" msgstr "Inga stycken motsvarar givet mönster" -#: add-patch.c:1614 +#: add-patch.c:1619 msgid "Sorry, cannot split this hunk" msgstr "Beklagar, kan inte dela stycket" -#: add-patch.c:1618 +#: add-patch.c:1623 #, c-format msgid "Split into %d hunks." msgstr "Dela i %d stycken." -#: add-patch.c:1622 +#: add-patch.c:1627 msgid "Sorry, cannot edit this hunk" msgstr "Beklagar, kan inte redigera stycket" -#: add-patch.c:1674 +#: add-patch.c:1679 msgid "'git apply' failed" msgstr "\"git apply\" misslyckades" -#: advice.c:140 +#: advice.c:143 #, c-format msgid "" "\n" @@ -745,47 +745,47 @@ msgstr "" "\n" "Slå av meddelandet med \"git config advice.%s false\"" -#: advice.c:156 +#: advice.c:159 #, c-format msgid "%shint: %.*s%s\n" msgstr "%stips: %.*s%s\n" -#: advice.c:247 +#: advice.c:250 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:249 +#: advice.c:252 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:251 +#: advice.c:254 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:253 +#: advice.c:256 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:255 +#: advice.c:258 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:257 +#: advice.c:260 #, 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:265 +#: advice.c:268 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,23 +793,23 @@ msgstr "" "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n" "som lämpligt för att ange lösning och checka in." -#: advice.c:273 +#: advice.c:276 msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:278 builtin/merge.c:1349 +#: advice.c:281 builtin/merge.c:1369 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: advice.c:280 +#: advice.c:283 msgid "Please, commit your changes before merging." msgstr "Checka in dina ändringar innan du utför sammanslagningen." -#: advice.c:281 +#: advice.c:284 msgid "Exiting because of unfinished merge." msgstr "Avslutar på grund av ofullbordad sammanslagning." -#: advice.c:287 +#: advice.c:290 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -1101,7 +1101,7 @@ msgstr "patch misslyckades: %s:%ld" msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" @@ -1262,7 +1262,7 @@ msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s" 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:537 +#: apply.c:4376 builtin/bisect--helper.c:524 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" @@ -1313,170 +1313,170 @@ msgstr "Stycke %d tillämpades rent." msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4715 +#: apply.c:4720 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4723 +#: apply.c:4728 msgid "unrecognized input" msgstr "indata känns inte igen" -#: apply.c:4743 +#: apply.c:4748 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4900 +#: apply.c:4905 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4927 +#: apply.c:4932 #, 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:4933 apply.c:4948 +#: apply.c:4938 apply.c:4953 #, 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:4941 +#: apply.c:4946 #, 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:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4962 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: apply.c:4985 +#: apply.c:4990 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:4988 +#: apply.c:4993 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:4990 builtin/am.c:2279 +#: apply.c:4995 builtin/am.c:2266 msgid "num" msgstr "antal" -#: apply.c:4991 +#: apply.c:4996 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:4994 +#: apply.c:4999 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:4996 +#: apply.c:5001 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:5000 +#: apply.c:5005 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:5002 +#: apply.c:5007 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:5004 +#: apply.c:5009 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:5006 +#: apply.c:5011 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:5008 +#: apply.c:5013 msgid "mark new files with `git add --intent-to-add`" msgstr "markera nya filer med \"git add --intent-to-add\"" -#: apply.c:5010 +#: apply.c:5015 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:5012 +#: apply.c:5017 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:5015 +#: apply.c:5020 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:5017 +#: apply.c:5022 msgid "attempt three-way merge if a patch does not apply" msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" -#: apply.c:5019 +#: apply.c:5024 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 +#: apply.c:5027 builtin/checkout-index.c:182 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: apply.c:5024 +#: apply.c:5029 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 +#: apply.c:5030 builtin/am.c:2245 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1346 msgid "action" msgstr "åtgärd" -#: apply.c:5026 +#: apply.c:5031 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:5029 apply.c:5032 +#: apply.c:5034 apply.c:5037 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:5035 +#: apply.c:5040 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:5037 +#: apply.c:5042 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:5039 +#: apply.c:5044 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:5041 +#: apply.c:5046 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: apply.c:5047 builtin/add.c:329 builtin/check-ignore.c:22 #: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 -#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "var pratsam" -#: apply.c:5044 +#: apply.c:5049 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:5047 +#: apply.c:5052 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:5049 builtin/am.c:2267 +#: apply.c:5054 builtin/am.c:2254 msgid "root" msgstr "rot" -#: apply.c:5050 +#: apply.c:5055 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" @@ -1490,16 +1490,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:449 +#: archive-tar.c:450 #, c-format msgid "unable to start '%s' filter" msgstr "kunde inte starta filtret \"%s\"" -#: archive-tar.c:452 +#: archive-tar.c:453 msgid "unable to redirect descriptor" msgstr "kan inte omdirigera handtag" -#: archive-tar.c:459 +#: archive-tar.c:460 #, c-format msgid "'%s' filter reported error" msgstr "filtret \"%s\" rapporterade fel" @@ -1548,9 +1548,9 @@ msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" msgid "cannot read %s" msgstr "kan inte läsa %s" -#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852 -#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 -#: builtin/merge.c:1124 +#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886 +#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786 +#: builtin/merge.c:1138 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" @@ -1589,118 +1589,110 @@ msgstr "Hittar inte filen: %s" msgid "Not a regular file: %s" msgstr "Inte en vanlig fil: %s" -#: archive.c:553 +#: archive.c:555 msgid "fmt" msgstr "fmt" -#: archive.c:553 +#: archive.c:555 msgid "archive format" msgstr "arkivformat" -#: archive.c:554 builtin/log.c:1760 +#: archive.c:556 builtin/log.c:1765 msgid "prefix" msgstr "prefix" -#: archive.c:555 +#: archive.c:557 msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 -#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 +#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890 +#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1208 builtin/fast-export.c:1210 -#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: builtin/fast-export.c:1214 builtin/grep.c:919 builtin/hash-object.c:105 #: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "fil" -#: archive.c:557 +#: archive.c:559 msgid "add untracked file to archive" msgstr "ta med ospårade filer i arkivet" -#: archive.c:560 builtin/archive.c:90 +#: archive.c:562 builtin/archive.c:90 msgid "write the archive to this file" msgstr "skriv arkivet till filen" -#: archive.c:562 +#: archive.c:564 msgid "read .gitattributes in working directory" msgstr "läs .gitattributes i arbetskatalogen" -#: archive.c:563 +#: archive.c:565 msgid "report archived files on stderr" msgstr "rapportera arkiverade filer på standard fel" -#: archive.c:564 -msgid "store only" -msgstr "endast spara" - -#: archive.c:565 -msgid "compress faster" -msgstr "komprimera snabbare" +#: archive.c:567 +msgid "set compression level" +msgstr "välj komprimeringsgrad" -#: archive.c:573 -msgid "compress better" -msgstr "komprimera bättre" - -#: archive.c:576 +#: archive.c:570 msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 #: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "arkiv" -#: archive.c:579 builtin/archive.c:92 +#: archive.c:573 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 #: builtin/notes.c:498 msgid "command" msgstr "kommando" -#: archive.c:581 builtin/archive.c:94 +#: archive.c:575 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "sökväg till kommandot git-upload-archive på fjärren" -#: archive.c:588 +#: archive.c:582 msgid "Unexpected option --remote" msgstr "Oväntad flagga --remote" -#: archive.c:590 +#: archive.c:584 msgid "Option --exec can only be used together with --remote" msgstr "Flaggan --exec kan endast användas tillsammans med --remote" -#: archive.c:592 +#: archive.c:586 msgid "Unexpected option --output" msgstr "Oväntad flagga --output" -#: archive.c:594 +#: archive.c:588 msgid "Options --add-file and --remote cannot be used together" msgstr "Flaggorna --add-file och --remote kan inte användas samtidigt" -#: archive.c:616 +#: archive.c:610 #, c-format msgid "Unknown archive format '%s'" msgstr "Okänt arkivformat \"%s\"" -#: archive.c:623 +#: archive.c:619 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumentet stöd inte för formatet \"%s\": -%d" -#: attr.c:212 +#: attr.c:202 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%-*s är inte ett giltigt namn på attribut" -#: attr.c:369 +#: attr.c:359 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s inte tillåtet: %s:%d" -#: attr.c:409 +#: attr.c:399 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1708,22 +1700,22 @@ msgstr "" "Negativa mönster ignoreras i git-attribut\n" "Använd '\\!' för att inleda med ett utropstecken." -#: bisect.c:476 +#: bisect.c:489 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Felaktigt citerat innehåll i filen \"%s\": %s" -#: bisect.c:686 +#: bisect.c:699 #, c-format msgid "We cannot bisect more!\n" msgstr "Det finns inte mer att göra \"bisect\" på!\n" -#: bisect.c:753 +#: bisect.c:766 #, c-format msgid "Not a valid commit name %s" msgstr "Namnet på incheckningen är inte giltigt: %s" -#: bisect.c:778 +#: bisect.c:791 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1732,7 +1724,7 @@ msgstr "" "Sammanslagningsbasen %s är trasig.\n" "Det betyder att felet har rättats mellan %s och [%s].\n" -#: bisect.c:783 +#: bisect.c:796 #, c-format msgid "" "The merge base %s is new.\n" @@ -1741,7 +1733,7 @@ msgstr "" "Sammanslagningsbasen %s är ny.\n" "Egenskapen har ändrats mellan %s och [%s].\n" -#: bisect.c:788 +#: bisect.c:801 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1750,7 +1742,7 @@ msgstr "" "Sammanslagningsbasen %s är %s.\n" "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n" -#: bisect.c:796 +#: bisect.c:809 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1761,7 +1753,7 @@ msgstr "" "git bisect kan inte fungera korrekt i detta fall.\n" "Kanske du skrev fel %s- och %s-revisioner?\n" -#: bisect.c:809 +#: bisect.c:822 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1773,36 +1765,36 @@ msgstr "" "%s.\n" "Vi fortsätter ändå." -#: bisect.c:848 +#: bisect.c:861 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisect: en sammanslagningsbas måste testas\n" -#: bisect.c:898 +#: bisect.c:911 #, c-format msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: bisect.c:974 builtin/merge.c:150 +#: bisect.c:987 builtin/merge.c:152 #, c-format msgid "could not read file '%s'" msgstr "kunde inte läsa filen \"%s\"" -#: bisect.c:1014 +#: bisect.c:1027 msgid "reading bisect refs failed" msgstr "misslyckades läsa bisect-referenser" -#: bisect.c:1044 +#: bisect.c:1057 #, c-format msgid "%s was both %s and %s\n" msgstr "%s var både %s och %s\n" -#: bisect.c:1053 +#: bisect.c:1066 #, c-format msgid "" "No testable commit found.\n" @@ -1811,7 +1803,7 @@ msgstr "" "Ingen testbar incheckning hittades.\n" "Kanske du startade med felaktiga sökvägsparametrar?\n" -#: bisect.c:1082 +#: bisect.c:1095 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1821,48 +1813,48 @@ msgstr[1] "(ungefär %d steg)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1088 +#: bisect.c:1101 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n" msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n" -#: blame.c:2778 +#: blame.c:2777 msgid "--contents and --reverse do not blend well." msgstr "--contents och --reverse fungerar inte så bra tillsammans." -#: blame.c:2792 +#: blame.c:2791 msgid "cannot use --contents with final commit object name" msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt" -#: blame.c:2813 +#: blame.c:2812 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 -#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 -#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 -#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 -#: builtin/shortlog.c:320 +#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138 +#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409 +#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336 +#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:267 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" -#: blame.c:2840 +#: blame.c:2839 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent tillsammans kräver ett intervall på första-förälder-" "kedjan" -#: blame.c:2851 +#: blame.c:2850 #, c-format msgid "no such path %s in %s" msgstr "sökvägen %s i %s finns inte" -#: blame.c:2862 +#: blame.c:2861 #, c-format msgid "cannot read blob %s for path %s" msgstr "kan inte läsa objektet %s för sökvägen %s" @@ -2030,7 +2022,7 @@ msgstr "'%s' ser inte ut som en v2- eller v3-paket-fil (bundle)" msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176 #: builtin/commit.c:814 #, c-format msgid "could not open '%s'" @@ -2093,7 +2085,7 @@ msgstr "version %d för paket (bundle) stöds ej" msgid "cannot write bundle version %d with algorithm %s" msgstr "kan inte skriva paket (bundle) med version %d med algoritmen %s" -#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 +#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -2116,7 +2108,7 @@ msgstr "index-pack dog" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit-graph.c:188 midx.c:46 +#: commit-graph.c:188 midx.c:47 msgid "invalid hash version" msgstr "felaktig hashnings-version" @@ -2180,7 +2172,7 @@ msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig" msgid "could not find commit %s" msgstr "kunde inte hitta incheckningen %s" -#: commit-graph.c:1042 builtin/am.c:1306 +#: commit-graph.c:1042 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" @@ -2247,7 +2239,7 @@ msgstr "Söker ytterligare kanter i incheckingsgraf" msgid "failed to write correct number of base graph ids" msgstr "kunde inte skriva korrekt antal bas-graf-id:n" -#: commit-graph.c:1720 midx.c:826 +#: commit-graph.c:1720 midx.c:819 #, c-format msgid "unable to create leading directories of %s" msgstr "kunde inte skapa inledande kataloger för %s" @@ -2284,77 +2276,77 @@ msgstr "kunde inte byta namn på temporär incheckningsgraffil" msgid "Scanning merged commits" msgstr "Söker sammanslagna incheckningar" -#: commit-graph.c:2026 -#, c-format -msgid "unexpected duplicate commit id %s" -msgstr "oväntat duplicerat inchecknings-id %s" - -#: commit-graph.c:2049 +#: commit-graph.c:2059 msgid "Merging commit-graph" msgstr "Slår ihop incheckningsgraf" -#: commit-graph.c:2259 +#: commit-graph.c:2165 +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:2274 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar" -#: commit-graph.c:2270 +#: commit-graph.c:2285 msgid "too many commits to write graph" msgstr "för många incheckningar för att skriva graf" -#: commit-graph.c:2363 +#: commit-graph.c:2378 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig" -#: commit-graph.c:2373 +#: commit-graph.c:2388 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s" -#: commit-graph.c:2383 commit-graph.c:2398 +#: commit-graph.c:2398 commit-graph.c:2413 #, 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:2390 +#: commit-graph.c:2405 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "kunde inte tolka incheckning %s från incheckningsgraf" -#: commit-graph.c:2408 +#: commit-graph.c:2423 msgid "Verifying commits in commit graph" msgstr "Bekräftar incheckningar i incheckningsgrafen" -#: commit-graph.c:2423 +#: commit-graph.c:2438 #, 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:2430 +#: commit-graph.c:2445 #, 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:2440 +#: commit-graph.c:2455 #, 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:2449 +#: commit-graph.c:2464 #, 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:2463 +#: commit-graph.c:2478 #, 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:2468 +#: commit-graph.c:2483 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2362,7 +2354,7 @@ msgstr "" "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-" "noll på annan plats" -#: commit-graph.c:2472 +#: commit-graph.c:2487 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2370,20 +2362,20 @@ msgstr "" "incheckningsgrafen har generationsnummer skilt från noll för incheckningen " "%s, men noll på annan plats" -#: commit-graph.c:2488 +#: commit-graph.c:2503 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "incheckningsgrafens generation för incheckningen %s är %u != %u" -#: commit-graph.c:2494 +#: commit-graph.c:2509 #, 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:2845 builtin/am.c:373 builtin/am.c:417 -#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 +#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -2487,7 +2479,7 @@ msgstr "nyckeln innehåller inte ett stycke: %s" msgid "key does not contain variable name: %s" msgstr "nyckeln innehåller inte variabelnamn: %s" -#: config.c:408 sequencer.c:2547 +#: config.c:408 sequencer.c:2580 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" @@ -2683,77 +2675,77 @@ msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" msgid "bad config variable '%s' in file '%s' at line %d" msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d" -#: config.c:2470 +#: config.c:2473 #, c-format msgid "invalid section name '%s'" msgstr "felaktigt sektionsnamn \"%s\"" -#: config.c:2502 +#: config.c:2505 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2531 +#: config.c:2534 #, c-format msgid "failed to write new configuration file %s" msgstr "kan inte skriva nya konfigurationsfilen \"%s\"" -#: config.c:2783 config.c:3107 +#: config.c:2786 config.c:3112 #, c-format msgid "could not lock config file %s" msgstr "kunde inte låsa konfigurationsfilen %s" -#: config.c:2794 +#: config.c:2797 #, c-format msgid "opening %s" msgstr "öppnar %s" -#: config.c:2829 builtin/config.c:354 +#: config.c:2834 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "ogiltigt mönster: %s" -#: config.c:2854 +#: config.c:2859 #, c-format msgid "invalid config file %s" msgstr "ogiltig konfigurationsfil: \"%s\"" -#: config.c:2867 config.c:3120 +#: config.c:2872 config.c:3125 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:2878 +#: config.c:2883 #, c-format msgid "unable to mmap '%s'" msgstr "kunde inte utföra mmap på \"%s\"" -#: config.c:2887 config.c:3125 +#: config.c:2892 config.c:3130 #, c-format msgid "chmod on %s failed" msgstr "chmod misslyckades på %s" -#: config.c:2972 config.c:3222 +#: config.c:2977 config.c:3227 #, c-format msgid "could not write config file %s" msgstr "kunde inte skriva konfigurationsfilen %s" -#: config.c:3006 +#: config.c:3011 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 +#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" -#: config.c:3098 +#: config.c:3103 #, c-format msgid "invalid section name: %s" msgstr "felaktigt namn på stycke: %s" -#: config.c:3265 +#: config.c:3270 #, c-format msgid "missing value for '%s'" msgstr "värde saknas för \"%s\"" @@ -3192,6 +3184,26 @@ 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-lib.c:534 +msgid "--merge-base does not work with ranges" +msgstr "--merge-base fungerar inte med intervall" + +#: diff-lib.c:536 +msgid "--merge-base only works with commits" +msgstr "--merge-base fungerar bara med incheckningar" + +#: diff-lib.c:553 +msgid "unable to get HEAD" +msgstr "kan inte hämta HEAD" + +#: diff-lib.c:560 +msgid "no merge base found" +msgstr "ingen sammanslagningsbas hittades" + +#: diff-lib.c:562 +msgid "multiple merge bases found" +msgstr "flera sammanslagningsbaser hittades" + #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<flaggor>] <sökväg> <sökväg>" @@ -3254,35 +3266,35 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:4269 +#: diff.c:4276 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:4618 +#: diff.c:4625 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" -#: diff.c:4621 +#: diff.c:4628 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S och --find-object är ömsesidigt uteslutande" -#: diff.c:4699 +#: diff.c:4706 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:4747 +#: diff.c:4754 #, c-format msgid "invalid --stat value: %s" msgstr "ogiltigt värde för --stat: %s" -#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: diff.c:4759 diff.c:4764 diff.c:4769 diff.c:4774 diff.c:5302 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s förväntar ett numeriskt värde" -#: diff.c:4784 +#: diff.c:4791 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3291,42 +3303,42 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:4869 +#: diff.c:4876 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s" -#: diff.c:4893 +#: diff.c:4900 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "okänt värde efter ws-error-highlight=%.*s" -#: diff.c:4907 +#: diff.c:4914 #, c-format msgid "unable to resolve '%s'" msgstr "kunde inte slå upp \"%s\"" -#: diff.c:4957 diff.c:4963 +#: diff.c:4964 diff.c:4970 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s förväntar formen <n>/<m>" -#: diff.c:4975 +#: diff.c:4982 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s förväntar ett tecken, fick \"%s\"" -#: diff.c:4996 +#: diff.c:5003 #, c-format msgid "bad --color-moved argument: %s" msgstr "felaktigt argument till --color-moved: %s" -#: diff.c:5015 +#: diff.c:5022 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "ogiltigt läge %s\" i --color-moved-ws" -#: diff.c:5055 +#: diff.c:5062 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3334,149 +3346,154 @@ msgstr "" "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och " "\"histogram\"" -#: diff.c:5091 diff.c:5111 +#: diff.c:5098 diff.c:5118 #, c-format msgid "invalid argument to %s" msgstr "ogiltigt argument för %s" -#: diff.c:5248 +#: diff.c:5222 +#, c-format +msgid "invalid regex given to -I: '%s'" +msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\"" + +#: diff.c:5271 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:5304 +#: diff.c:5327 #, c-format msgid "bad --word-diff argument: %s" msgstr "felaktigt argument --word-diff: %s" -#: diff.c:5327 +#: diff.c:5350 msgid "Diff output format options" msgstr "Formatflaggor för diff-utdata" -#: diff.c:5329 diff.c:5335 +#: diff.c:5352 diff.c:5358 msgid "generate patch" msgstr "skapar patch" -#: diff.c:5332 builtin/log.c:176 +#: diff.c:5355 builtin/log.c:178 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: diff.c:5337 diff.c:5451 diff.c:5458 +#: diff.c:5360 diff.c:5474 diff.c:5481 msgid "<n>" msgstr "<n>" -#: diff.c:5338 diff.c:5341 +#: diff.c:5361 diff.c:5364 msgid "generate diffs with <n> lines context" msgstr "skapa diffar med <n> rader sammanhang" -#: diff.c:5343 +#: diff.c:5366 msgid "generate the diff in raw format" msgstr "generera diff i råformat" -#: diff.c:5346 +#: diff.c:5369 msgid "synonym for '-p --raw'" msgstr "synonym till \"-p --raw\"" -#: diff.c:5350 +#: diff.c:5373 msgid "synonym for '-p --stat'" msgstr "synonym till \"-p --stat\"" -#: diff.c:5354 +#: diff.c:5377 msgid "machine friendly --stat" msgstr "maskinläsbar --stat" -#: diff.c:5357 +#: diff.c:5380 msgid "output only the last line of --stat" msgstr "skriv bara ut den sista raden för --stat" -#: diff.c:5359 diff.c:5367 +#: diff.c:5382 diff.c:5390 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5360 +#: diff.c:5383 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:5364 +#: diff.c:5387 msgid "synonym for --dirstat=cumulative" msgstr "synonym för --dirstat=cumulative" -#: diff.c:5368 +#: diff.c:5391 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonym för --dirstat=filer,param1,param2..." -#: diff.c:5372 +#: diff.c:5395 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel" -#: diff.c:5375 +#: diff.c:5398 msgid "condensed summary such as creations, renames and mode changes" msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen" -#: diff.c:5378 +#: diff.c:5401 msgid "show only names of changed files" msgstr "visa endast namnen på ändrade filer" -#: diff.c:5381 +#: diff.c:5404 msgid "show only names and status of changed files" msgstr "visa endast namn och status för ändrade filer" -#: diff.c:5383 +#: diff.c:5406 msgid "<width>[,<name-width>[,<count>]]" msgstr "<bredd>[,<namn-bredd>[,<antal>]]" -#: diff.c:5384 +#: diff.c:5407 msgid "generate diffstat" msgstr "skapa diffstat" -#: diff.c:5386 diff.c:5389 diff.c:5392 +#: diff.c:5409 diff.c:5412 diff.c:5415 msgid "<width>" msgstr "<bredd>" -#: diff.c:5387 +#: diff.c:5410 msgid "generate diffstat with a given width" msgstr "generera en diffstat med given bredd" -#: diff.c:5390 +#: diff.c:5413 msgid "generate diffstat with a given name width" msgstr "generera en diffstat med given namnbredd" -#: diff.c:5393 +#: diff.c:5416 msgid "generate diffstat with a given graph width" msgstr "generera en diffstat med given grafbredd" -#: diff.c:5395 +#: diff.c:5418 msgid "<count>" msgstr "<antal>" -#: diff.c:5396 +#: diff.c:5419 msgid "generate diffstat with limited lines" msgstr "generera diffstat med begränsade rader" -#: diff.c:5399 +#: diff.c:5422 msgid "generate compact summary in diffstat" msgstr "skapa kompakt översikt i diffstat" -#: diff.c:5402 +#: diff.c:5425 msgid "output a binary diff that can be applied" msgstr "skapa en binärdiff som kan appliceras" -#: diff.c:5405 +#: diff.c:5428 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:5407 +#: diff.c:5430 msgid "show colored diff" msgstr "visa färgad diff" -#: diff.c:5408 +#: diff.c:5431 msgid "<kind>" msgstr "<typ>" -#: diff.c:5409 +#: diff.c:5432 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3484,7 +3501,7 @@ msgstr "" "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller " "\"new\" (nya) rader i diffen" -#: diff.c:5412 +#: diff.c:5435 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3492,87 +3509,87 @@ msgstr "" "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw " "eller --numstat" -#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527 +#: diff.c:5438 diff.c:5441 diff.c:5444 diff.c:5553 msgid "<prefix>" msgstr "<prefix>" -#: diff.c:5416 +#: diff.c:5439 msgid "show the given source prefix instead of \"a/\"" msgstr "visa givet källprefix istället för \"a/\"" -#: diff.c:5419 +#: diff.c:5442 msgid "show the given destination prefix instead of \"b/\"" msgstr "visa givet målprefix istället för \"b/\"" -#: diff.c:5422 +#: diff.c:5445 msgid "prepend an additional prefix to every line of output" msgstr "lägg till ytterligare prefix på alla rader i utdata" -#: diff.c:5425 +#: diff.c:5448 msgid "do not show any source or destination prefix" msgstr "visa inte käll- eller målprefix" -#: diff.c:5428 +#: diff.c:5451 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:5432 diff.c:5437 diff.c:5442 +#: diff.c:5455 diff.c:5460 diff.c:5465 msgid "<char>" msgstr "<tecken>" -#: diff.c:5433 +#: diff.c:5456 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:5438 +#: diff.c:5461 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:5443 +#: diff.c:5466 msgid "specify the character to indicate a context instead of ' '" msgstr "ange tecken för att ange sammanhang istället för \" \"" -#: diff.c:5446 +#: diff.c:5469 msgid "Diff rename options" msgstr "Diff-namnbytesflaggor" -#: diff.c:5447 +#: diff.c:5470 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5448 +#: diff.c:5471 msgid "break complete rewrite changes into pairs of delete and create" msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par" -#: diff.c:5452 +#: diff.c:5475 msgid "detect renames" msgstr "detektera namnändringar" -#: diff.c:5456 +#: diff.c:5479 msgid "omit the preimage for deletes" msgstr "ta bort för-version för borttagningar" -#: diff.c:5459 +#: diff.c:5482 msgid "detect copies" msgstr "detektera kopior" -#: diff.c:5463 +#: diff.c:5486 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:5465 +#: diff.c:5488 msgid "disable rename detection" msgstr "inaktivera detektering av namnbyten" -#: diff.c:5468 +#: diff.c:5491 msgid "use empty blobs as rename source" msgstr "använd tomma blob:ar som namnändringskälla" -#: diff.c:5470 +#: diff.c:5493 msgid "continue listing the history of a file beyond renames" msgstr "fortsätt lista historiken för en fil bortom namnändringar" -#: diff.c:5473 +#: diff.c:5496 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3580,159 +3597,163 @@ msgstr "" "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver " "given gräns" -#: diff.c:5475 +#: diff.c:5498 msgid "Diff algorithm options" msgstr "Alternativ för diff-algoritm" -#: diff.c:5477 +#: diff.c:5500 msgid "produce the smallest possible diff" msgstr "skapa minsta möjliga diff" -#: diff.c:5480 +#: diff.c:5503 msgid "ignore whitespace when comparing lines" msgstr "ignorera blanktecken vid radjämförelse" -#: diff.c:5483 +#: diff.c:5506 msgid "ignore changes in amount of whitespace" msgstr "ignorera ändringar i antal blanktecken vid radjämförelse" -#: diff.c:5486 +#: diff.c:5509 msgid "ignore changes in whitespace at EOL" msgstr "ignorera blanktecken vid radslut" -#: diff.c:5489 +#: diff.c:5512 msgid "ignore carrier-return at the end of line" msgstr "ignorera CR-tecken vid radslut" -#: diff.c:5492 +#: diff.c:5515 msgid "ignore changes whose lines are all blank" msgstr "ignorera ändringar i rader som är helt blanka" -#: diff.c:5495 +#: diff.c:5517 diff.c:5539 diff.c:5542 diff.c:5587 +msgid "<regex>" +msgstr "<reguttr>" + +#: diff.c:5518 +msgid "ignore changes whose all lines match <regex>" +msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>" + +#: diff.c:5521 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:5498 +#: diff.c:5524 msgid "generate diff using the \"patience diff\" algorithm" msgstr "skapa diffar med algoritmen \"patience diff\"" -#: diff.c:5502 +#: diff.c:5528 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "skapa diffar med algoritmen \"histogram diff\"" -#: diff.c:5504 +#: diff.c:5530 msgid "<algorithm>" msgstr "<algoritm>" -#: diff.c:5505 +#: diff.c:5531 msgid "choose a diff algorithm" msgstr "välj en diff-algoritm" -#: diff.c:5507 +#: diff.c:5533 msgid "<text>" msgstr "<text>" -#: diff.c:5508 +#: diff.c:5534 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "skapa diffar med algoritmen \"anchored diff\"" -#: diff.c:5510 diff.c:5519 diff.c:5522 +#: diff.c:5536 diff.c:5545 diff.c:5548 msgid "<mode>" msgstr "<läge>" -#: diff.c:5511 +#: diff.c:5537 msgid "show word diff, using <mode> to delimit changed words" msgstr "visa orddiff, där <läge> avgränsar ändrade ord" -#: diff.c:5513 diff.c:5516 diff.c:5561 -msgid "<regex>" -msgstr "<reguttr>" - -#: diff.c:5514 +#: diff.c:5540 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:5517 +#: diff.c:5543 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>" -#: diff.c:5520 +#: diff.c:5546 msgid "moved lines of code are colored differently" msgstr "flyttade kodrader färgas på annat sätt" -#: diff.c:5523 +#: diff.c:5549 msgid "how white spaces are ignored in --color-moved" msgstr "hur blanktecken ignoreras i --color-moved" -#: diff.c:5526 +#: diff.c:5552 msgid "Other diff options" msgstr "Andra diff-flaggor" -#: diff.c:5528 +#: diff.c:5554 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:5532 +#: diff.c:5558 msgid "treat all files as text" msgstr "hantera alla filer som text" -#: diff.c:5534 +#: diff.c:5560 msgid "swap two inputs, reverse the diff" msgstr "växla två indatafiler, vänd diffen" -#: diff.c:5536 +#: diff.c:5562 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "avsluta med 1 vid ändringar, annars 0" -#: diff.c:5538 +#: diff.c:5564 msgid "disable all output of the program" msgstr "slå av alla utdata från programmet" -#: diff.c:5540 +#: diff.c:5566 msgid "allow an external diff helper to be executed" msgstr "tillåt köra en extern diff-hjälpare" -#: diff.c:5542 +#: diff.c:5568 msgid "run external text conversion filters when comparing binary files" msgstr "kör externt textkonverteringsfiler när binärfiler jämförs" -#: diff.c:5544 +#: diff.c:5570 msgid "<when>" msgstr "<när>" -#: diff.c:5545 +#: diff.c:5571 msgid "ignore changes to submodules in the diff generation" msgstr "ignorera ändringar i undermoduler när diffen skapas" -#: diff.c:5548 +#: diff.c:5574 msgid "<format>" msgstr "<format>" -#: diff.c:5549 +#: diff.c:5575 msgid "specify how differences in submodules are shown" msgstr "ange hur ändringar i undermoduler visas" -#: diff.c:5553 +#: diff.c:5579 msgid "hide 'git add -N' entries from the index" msgstr "dölj \"git add -N\"-poster från indexet" -#: diff.c:5556 +#: diff.c:5582 msgid "treat 'git add -N' entries as real in the index" msgstr "tolka \"git add -N\"-poster som äkta i indexet" -#: diff.c:5558 +#: diff.c:5584 msgid "<string>" msgstr "<sträng>" -#: diff.c:5559 +#: diff.c:5585 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:5562 +#: diff.c:5588 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3740,54 +3761,54 @@ msgstr "" "se efter ändringar som ändrar antalet förekomster av angivet reguljärt " "uttryck" -#: diff.c:5565 +#: diff.c:5591 msgid "show all changes in the changeset with -S or -G" msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G" -#: diff.c:5568 +#: diff.c:5594 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:5571 +#: diff.c:5597 msgid "control the order in which files appear in the output" msgstr "styr ordningen i vilken filer visas i utdata" -#: diff.c:5572 +#: diff.c:5598 msgid "<object-id>" msgstr "<objekt-id>" -#: diff.c:5573 +#: diff.c:5599 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:5575 +#: diff.c:5601 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5576 +#: diff.c:5602 msgid "select files by diff type" msgstr "välj filter efter diff-typ" -#: diff.c:5578 +#: diff.c:5604 msgid "<file>" msgstr "<fil>" -#: diff.c:5579 +#: diff.c:5605 msgid "Output to a specific file" msgstr "Skriv utdata till en specifik fil" -#: diff.c:6236 +#: diff.c:6262 msgid "inexact rename detection was skipped due to too many files." msgstr "" "onöjaktig namnbytesdetektering utfördes inte på grund av för många filer." -#: diff.c:6239 +#: diff.c:6265 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:6242 +#: diff.c:6268 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3891,246 +3912,246 @@ msgstr "kunde inte ställa in GIT_DIR till \"%s\"" msgid "too many args to run %s" msgstr "för många flaggor för att köra %s" -#: fetch-pack.c:176 +#: fetch-pack.c:177 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: förväntade grund lista" -#: fetch-pack.c:179 +#: fetch-pack.c:180 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:190 +#: fetch-pack.c:191 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:210 +#: fetch-pack.c:211 #, 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:221 +#: fetch-pack.c:222 msgid "unable to write to remote" msgstr "kunde inte skriva till fjärren" -#: fetch-pack.c:282 +#: fetch-pack.c:283 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc kräver \"multi_ack_detailed\"" -#: fetch-pack.c:375 fetch-pack.c:1397 +#: fetch-pack.c:378 fetch-pack.c:1406 #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" -#: fetch-pack.c:381 fetch-pack.c:1403 +#: fetch-pack.c:384 fetch-pack.c:1412 #, c-format msgid "invalid unshallow line: %s" msgstr "ogiltig \"unshallow\"-rad: %s" -#: fetch-pack.c:383 fetch-pack.c:1405 +#: fetch-pack.c:386 fetch-pack.c:1414 #, c-format msgid "object not found: %s" msgstr "objektet hittades inte: %s" -#: fetch-pack.c:386 fetch-pack.c:1408 +#: fetch-pack.c:389 fetch-pack.c:1417 #, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" -#: fetch-pack.c:388 fetch-pack.c:1410 +#: fetch-pack.c:391 fetch-pack.c:1419 #, c-format msgid "no shallow found: %s" msgstr "ingen \"shallow\" hittades: %s" -#: fetch-pack.c:391 fetch-pack.c:1414 +#: fetch-pack.c:394 fetch-pack.c:1423 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "förväntade shallow/unshallow, fick %s" -#: fetch-pack.c:431 +#: fetch-pack.c:434 #, c-format msgid "got %s %d %s" msgstr "fick %s %d %s" -#: fetch-pack.c:448 +#: fetch-pack.c:451 #, c-format msgid "invalid commit %s" msgstr "ogiltig incheckning %s" -#: fetch-pack.c:479 +#: fetch-pack.c:482 msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:492 progress.c:339 +#: fetch-pack.c:495 progress.c:339 msgid "done" msgstr "klart" -#: fetch-pack.c:504 +#: fetch-pack.c:507 #, c-format msgid "got %s (%d) %s" msgstr "fick %s (%d) %s" -#: fetch-pack.c:540 +#: fetch-pack.c:543 #, c-format msgid "Marking %s as complete" msgstr "Markerar %s som komplett" -#: fetch-pack.c:755 +#: fetch-pack.c:758 #, c-format msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:824 +#: fetch-pack.c:827 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:832 +#: fetch-pack.c:835 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:916 +#: fetch-pack.c:919 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-patch: kunde inte grena av %s" -#: fetch-pack.c:933 +#: fetch-pack.c:937 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:935 +#: fetch-pack.c:939 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:978 +#: fetch-pack.c:982 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998 -#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 -#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030 -#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052 +#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005 +#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021 +#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059 #, c-format msgid "Server supports %s" msgstr "Servern stöder %s" -#: fetch-pack.c:985 +#: fetch-pack.c:992 msgid "Server does not support shallow clients" msgstr "Servern stöder inte klienter med grunda arkiv" -#: fetch-pack.c:1045 +#: fetch-pack.c:1052 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:1050 +#: fetch-pack.c:1057 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:1054 +#: fetch-pack.c:1061 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:1056 +#: fetch-pack.c:1063 msgid "Server does not support this repository's object format" msgstr "Servern stöder inte det här arkivets objektformat" -#: fetch-pack.c:1069 +#: fetch-pack.c:1076 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:1081 fetch-pack.c:1619 +#: fetch-pack.c:1088 fetch-pack.c:1628 msgid "git fetch-pack: fetch failed." msgstr "git fetch-patch: hämtning misslyckades." -#: fetch-pack.c:1205 +#: fetch-pack.c:1214 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "omaka algoritmer: klient %s; server %s" -#: fetch-pack.c:1209 +#: fetch-pack.c:1218 #, c-format msgid "the server does not support algorithm '%s'" msgstr "servern stöder inte algoritmen \"%s\"" -#: fetch-pack.c:1229 +#: fetch-pack.c:1238 msgid "Server does not support shallow requests" msgstr "Servern stöder inte grunda förfrågningar" -#: fetch-pack.c:1236 +#: fetch-pack.c:1245 msgid "Server supports filter" msgstr "Servern stöder filter" -#: fetch-pack.c:1275 +#: fetch-pack.c:1284 msgid "unable to write request to remote" msgstr "kunde inte skriva anrop till fjärren" -#: fetch-pack.c:1293 +#: fetch-pack.c:1302 #, c-format msgid "error reading section header '%s'" msgstr "fel vid läsning av styckehuvudet \"%s\"" -#: fetch-pack.c:1299 +#: fetch-pack.c:1308 #, c-format msgid "expected '%s', received '%s'" msgstr "förväntade \"%s\", tog emot \"%s\"" -#: fetch-pack.c:1360 +#: fetch-pack.c:1369 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "oväntad bekräftelserad: \"%s\"" -#: fetch-pack.c:1365 +#: fetch-pack.c:1374 #, c-format msgid "error processing acks: %d" msgstr "fel vid hantering av bekräftelser: %d" -#: fetch-pack.c:1375 +#: fetch-pack.c:1384 msgid "expected packfile to be sent after 'ready'" msgstr "väntade att paketfil skulle sändas efter \"ready\"" -#: fetch-pack.c:1377 +#: fetch-pack.c:1386 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:1419 +#: fetch-pack.c:1428 #, c-format msgid "error processing shallow info: %d" msgstr "fel vid hantering av grund (\"shallow\") info: %d" -#: fetch-pack.c:1466 +#: fetch-pack.c:1475 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "förväntade wanted-ref, fick %s" -#: fetch-pack.c:1471 +#: fetch-pack.c:1480 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "oväntad wanted-ref: \"%s\"" -#: fetch-pack.c:1476 +#: fetch-pack.c:1485 #, c-format msgid "error processing wanted refs: %d" msgstr "fel vid hantering av önskade referenser: %d" -#: fetch-pack.c:1506 +#: fetch-pack.c:1515 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: förväntade svarsavslutningspaket" -#: fetch-pack.c:1887 +#: fetch-pack.c:1897 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1910 builtin/clone.c:692 +#: fetch-pack.c:1920 builtin/clone.c:693 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: fetch-pack.c:1937 +#: fetch-pack.c:1947 #, c-format msgid "no such remote ref %s" msgstr "ingen sådan fjärreferens: %s" -#: fetch-pack.c:1940 +#: fetch-pack.c:1950 #, 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" @@ -4153,7 +4174,7 @@ msgstr "gpg misslyckades signera data" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors" -#: grep.c:668 +#: grep.c:640 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -4161,18 +4182,18 @@ msgstr "" "angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -" "P under PCRE v2" -#: grep.c:2128 +#: grep.c:2100 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 +#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:2156 +#: grep.c:2128 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" @@ -4263,7 +4284,7 @@ msgstr "Externa kommandon" msgid "Command aliases" msgstr "Kommadoalias" -#: help.c:513 +#: help.c:527 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -4272,32 +4293,32 @@ msgstr "" "\"%s\" verkar vara ett git-kommando, men vi kan inte\n" "köra det. Kanske git-%s är trasigt?" -#: help.c:572 +#: help.c:543 help.c:631 +#, 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 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls." -#: help.c:594 +#: help.c:613 #, 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:599 +#: help.c:618 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Fortsätter under förutsättningen att du menade \"%s\"." -#: help.c:604 +#: help.c:623 #, 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:612 -#, 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:616 +#: help.c:635 msgid "" "\n" "The most similar command is" @@ -4311,16 +4332,16 @@ msgstr[1] "" "\n" "Mest lika kommandon är" -#: help.c:656 +#: help.c:675 msgid "git version [<options>]" msgstr "git version [<flaggor>]" -#: help.c:711 +#: help.c:730 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:715 +#: help.c:734 msgid "" "\n" "Did you mean this?" @@ -4485,6 +4506,21 @@ msgstr "Kunde inte skapa \"%s.lock\": %s" msgid "expected flush after ls-refs arguments" msgstr "förväntade \"flush\" efter ls-refs-argument" +#: merge-ort-wrappers.c:13 merge-recursive.c:3672 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Dina lokala ändringar av följande filer skulle skrivas över av " +"sammanslagning:\n" +" %s" + +#: merge-ort-wrappers.c:33 merge-recursive.c:3436 +#, c-format +msgid "Already up to date!" +msgstr "Redan à jour!" + #: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(felaktig incheckning)\n" @@ -4876,10 +4912,6 @@ msgstr "Lägger till %s" msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3436 -msgid "Already up to date!" -msgstr "Redan à jour!" - #: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" @@ -4900,22 +4932,12 @@ msgstr[1] "hittade %u gemensamma förfäder:" msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:3672 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Dina lokala ändringar av följande filer skulle skrivas över av " -"sammanslagning:\n" -" %s" - #: merge-recursive.c:3769 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 +#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -4923,175 +4945,171 @@ msgstr "Kunde inte skriva indexet." msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930 -#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816 +#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917 +#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817 #: builtin/stash.c:265 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: midx.c:79 +#: midx.c:80 #, c-format msgid "multi-pack-index file %s is too small" msgstr "multi-pack-indexfilen %s är för liten" -#: midx.c:95 +#: midx.c:96 #, 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:100 +#: midx.c:101 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-indexversionen %d stöds inte" -#: midx.c:105 +#: midx.c:106 #, 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:122 +#: midx.c:123 msgid "invalid chunk offset (too large)" msgstr "felaktigt offset för stycke (för stort)" -#: midx.c:146 +#: midx.c:147 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "avslutande multi-pack-index-stycke-id förekommer tidigare än förväntat" -#: midx.c:159 +#: midx.c:160 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index saknar krävd paketnamn-stycke" -#: midx.c:161 +#: midx.c:162 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index saknar krävt OID-utbredningsstycke" -#: midx.c:163 +#: midx.c:164 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke" -#: midx.c:165 +#: midx.c:166 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index saknar krävt objekt-offsetstycke" -#: midx.c:179 +#: midx.c:180 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\"" -#: midx.c:222 +#: midx.c:223 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "bad pack-int-id: %u (%u paket totalt)" -#: midx.c:272 +#: midx.c:273 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:300 -msgid "error preparing packfile from multi-pack-index" -msgstr "fel när paketfiler från multi-pack-index skulle förberedas" - -#: midx.c:485 +#: midx.c:480 #, c-format msgid "failed to add packfile '%s'" msgstr "misslyckades läsa paketfilen \"%s\"" -#: midx.c:491 +#: midx.c:486 #, c-format msgid "failed to open pack-index '%s'" msgstr "misslyckades öppna paketindexet \"%s\"" -#: midx.c:551 +#: midx.c:546 #, c-format msgid "failed to locate object %d in packfile" msgstr "misslyckades hitta objekt %d i paketfilen" -#: midx.c:853 +#: midx.c:846 msgid "Adding packfiles to multi-pack-index" msgstr "Lägger till paketfiler till multi-pack-index" -#: midx.c:886 +#: midx.c:879 #, c-format msgid "did not see pack-file %s to drop" msgstr "såg inte paketfilen %s som skulle kastas" -#: midx.c:938 +#: midx.c:931 msgid "no pack files to index." msgstr "inga paketfiler att indexera." -#: midx.c:990 +#: midx.c:982 msgid "Writing chunks to multi-pack-index" msgstr "Skriver stycken till multi-pack-index" -#: midx.c:1068 +#: midx.c:1060 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "misslyckades städa multi-pack-index på %s" -#: midx.c:1124 +#: midx.c:1116 msgid "multi-pack-index file exists, but failed to parse" msgstr "multi-pack-indexfilen finns, men kunde inte tolkas" -#: midx.c:1132 +#: midx.c:1124 msgid "Looking for referenced packfiles" msgstr "Ser efter refererade packfiler" -#: midx.c:1147 +#: midx.c:1139 #, 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:1152 +#: midx.c:1144 msgid "the midx contains no oid" msgstr "midx saknar oid" -#: midx.c:1161 +#: midx.c:1153 msgid "Verifying OID order in multi-pack-index" msgstr "Bekräftar OID-ordning i multi-pack-index" -#: midx.c:1170 +#: midx.c:1162 #, 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:1190 +#: midx.c:1182 msgid "Sorting objects by packfile" msgstr "Sorterar objekt efter packfil" -#: midx.c:1197 +#: midx.c:1189 msgid "Verifying object offsets" msgstr "Bekräftar offset för objekt" -#: midx.c:1213 +#: midx.c:1205 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "misslyckades läsa paketpost för oid[%d] = %s" -#: midx.c:1219 +#: midx.c:1211 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "misslyckades läsa paketindex för paketfil %s" -#: midx.c:1228 +#: midx.c:1220 #, 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:1253 +#: midx.c:1245 msgid "Counting referenced objects" msgstr "Räknar refererade objekt" -#: midx.c:1263 +#: midx.c:1255 msgid "Finding and deleting unreferenced packfiles" msgstr "Ser efter och tar bort orefererade packfiler" -#: midx.c:1454 +#: midx.c:1446 msgid "could not start pack-objects" msgstr "kunde inte starta pack-objects" -#: midx.c:1474 +#: midx.c:1466 msgid "could not finish pack-objects" msgstr "kunde inte avsluta pack-objects" @@ -5180,16 +5198,16 @@ msgstr "hashvärde stämmer inte överens %s" msgid "unable to get size of %s" msgstr "kan inte hämta storlek på %s" -#: packfile.c:630 +#: packfile.c:615 msgid "offset before end of packfile (broken .idx?)" msgstr "offset före slutet av packfilen (trasig .idx?)" -#: packfile.c:1922 +#: packfile.c:1907 #, 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:1926 +#: packfile.c:1911 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex för %s (trunkerat index?)" @@ -5435,7 +5453,7 @@ msgstr "protokollfel: felaktig radlängdstecken: %.4s" msgid "protocol error: bad line length %d" msgstr "protokollfel: felaktig radlängd: %d" -#: pkt-line.c:373 sideband.c:150 +#: pkt-line.c:373 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "fjärrfel: %s" @@ -5483,7 +5501,7 @@ msgstr "kunde inte starta \"log\"" msgid "could not read `log` output" msgstr "kunde inte läsa utdata från \"log\"" -#: range-diff.c:98 sequencer.c:5283 +#: range-diff.c:98 sequencer.c:5310 #, c-format msgid "could not parse commit '%s'" msgstr "kunde inte tolka incheckningen \"%s\"" @@ -5502,11 +5520,11 @@ msgstr "" msgid "could not parse git header '%.*s'" msgstr "kunde inte tolka git-huvudet \"%.*s\"" -#: range-diff.c:301 +#: range-diff.c:299 msgid "failed to generate diff" msgstr "misslyckades skapa diff" -#: range-diff.c:534 range-diff.c:536 +#: range-diff.c:532 range-diff.c:534 #, c-format msgid "could not parse log for '%s'" msgstr "kunde inte tolka loggen för \"%s\"" @@ -5623,8 +5641,8 @@ msgstr "osorterade köposter för \"%s\"" #: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 #: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 -#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 #: builtin/submodule--helper.c:332 msgid "index file corrupt" @@ -5680,12 +5698,12 @@ msgstr "kunde inte uppdatera delat index \"%s\"" msgid "broken index, expect %s in %s, got %s" msgstr "trasigt index, förväntade %s i %s, fick %s" -#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 +#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" @@ -5819,14 +5837,14 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571 -#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607 +#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270 #, c-format msgid "could not write '%s'" msgstr "kunde inte skriva \"%s\"" -#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 -#: builtin/rebase.c:246 +#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228 +#: builtin/rebase.c:252 #, c-format msgid "could not write '%s'." msgstr "kunde inte skriva \"%s\"." @@ -5860,9 +5878,9 @@ msgstr "" "\" (fel).\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361 -#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233 -#: builtin/rebase.c:258 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394 +#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239 +#: builtin/rebase.c:264 #, c-format msgid "could not read '%s'." msgstr "kunde inte läsa \"%s\"." @@ -6058,61 +6076,61 @@ msgstr "format: atomen %%(end) använd utan motsvarande atom" msgid "malformed format string %s" msgstr "felformad formatsträng %s" -#: ref-filter.c:1541 +#: ref-filter.c:1549 #, c-format msgid "no branch, rebasing %s" msgstr "ingen gren, ombaserar %s" -#: ref-filter.c:1544 +#: ref-filter.c:1552 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "ingen gren, ombaserar frånkopplat HEAD %s" -#: ref-filter.c:1547 +#: ref-filter.c:1555 #, c-format msgid "no branch, bisect started on %s" msgstr "ingen gren, \"bisect\" startad på %s" -#: ref-filter.c:1557 +#: ref-filter.c:1565 msgid "no branch" msgstr "ingen gren" -#: ref-filter.c:1591 ref-filter.c:1800 +#: ref-filter.c:1599 ref-filter.c:1808 #, c-format msgid "missing object %s for %s" msgstr "objektet %s saknas för %s" -#: ref-filter.c:1601 +#: ref-filter.c:1609 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer misslyckades på %s för %s" -#: ref-filter.c:2054 +#: ref-filter.c:2062 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:2143 +#: ref-filter.c:2151 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:2148 refs.c:657 +#: ref-filter.c:2156 refs.c:660 #, c-format msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" -#: ref-filter.c:2464 +#: ref-filter.c:2472 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:2563 +#: ref-filter.c:2571 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: ref-filter.c:2568 +#: ref-filter.c:2576 #, c-format msgid "option `%s' must point to a commit" msgstr "flaggan \"%s\" måste peka på en incheckning" @@ -6122,65 +6140,65 @@ msgstr "flaggan \"%s\" måste peka på en incheckning" msgid "%s does not point to a valid object!" msgstr "\"%s\" pekar inte på ett giltigt objekt!" -#: refs.c:572 +#: refs.c:575 #, c-format msgid "could not retrieve `%s`" msgstr "kunde inte hämta \"%s\"" -#: refs.c:579 +#: refs.c:582 #, c-format msgid "invalid branch name: %s = %s" msgstr "felaktigt namn på gren: %s = %s" -#: refs.c:655 +#: refs.c:658 #, c-format msgid "ignoring dangling symref %s" msgstr "ignorerar dinglande symbolisk referens %s" -#: refs.c:892 +#: refs.c:895 #, c-format msgid "log for ref %s has gap after %s" msgstr "loggen för referensen %s har lucka efter %s" -#: refs.c:898 +#: refs.c:901 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "loggen för referensen %s slutade oväntat på %s" -#: refs.c:957 +#: refs.c:960 #, c-format msgid "log for %s is empty" msgstr "loggen för %s är tom" -#: refs.c:1049 +#: refs.c:1052 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "vägrar uppdatera referens med trasigt namn \"%s\"" -#: refs.c:1120 +#: refs.c:1123 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref misslyckades för referensen \"%s\": %s" -#: refs.c:1944 +#: refs.c:1947 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "flera uppdateringar för referensen \"%s\" tillåts inte" -#: refs.c:2024 +#: refs.c:2027 msgid "ref updates forbidden inside quarantine environment" msgstr "referensuppdateringar förbjudna i karantänmiljö" -#: refs.c:2035 +#: refs.c:2038 msgid "ref updates aborted by hook" msgstr "referensuppdateringar avbrutna av krok" -#: refs.c:2135 refs.c:2165 +#: refs.c:2138 refs.c:2168 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "\"%s\" finns; kan inte skapa \"%s\"" -#: refs.c:2141 refs.c:2176 +#: refs.c:2144 refs.c:2179 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt" @@ -6201,7 +6219,7 @@ msgstr "kunde inte ta bort referensen %s: %s" msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" -#: refspec.c:167 +#: refspec.c:170 #, c-format msgid "invalid refspec '%s'" msgstr "felaktig referensspecifikation: \"%s\"" @@ -6345,94 +6363,94 @@ msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en" 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:1703 remote.c:1804 +#: remote.c:1714 remote.c:1815 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: remote.c:1712 +#: remote.c:1723 #, c-format msgid "no such branch: '%s'" msgstr "okänd gren: \"%s\"" -#: remote.c:1715 +#: remote.c:1726 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppström angiven för grenen \"%s\"" -#: remote.c:1721 +#: remote.c:1732 #, 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:1736 +#: remote.c:1747 #, 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:1748 +#: remote.c:1759 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "grenen \"%s\" har ingen fjärr för \"push\"" -#: remote.c:1758 +#: remote.c:1769 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\"" -#: remote.c:1771 +#: remote.c:1782 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mål (push.default är \"ingenting\")" -#: remote.c:1793 +#: remote.c:1804 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mål" -#: remote.c:1922 +#: remote.c:1933 #, c-format msgid "couldn't find remote ref %s" msgstr "Kunde inte hitta fjärr-referensen %s" -#: remote.c:1935 +#: remote.c:1946 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignorerar märklig referens \"%s\" lokalt" -#: remote.c:2098 +#: remote.c:2109 #, 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:2102 +#: remote.c:2113 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:2105 +#: remote.c:2116 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:2109 +#: remote.c:2120 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n" -#: remote.c:2112 +#: remote.c:2123 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (använd \"%s\" för detaljer)\n" -#: remote.c:2116 +#: remote.c:2127 #, 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:2122 +#: remote.c:2133 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:2125 +#: remote.c:2136 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6442,11 +6460,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2133 +#: remote.c:2144 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:2136 +#: remote.c:2147 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6461,11 +6479,11 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2146 +#: remote.c:2157 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:2337 +#: remote.c:2348 #, c-format msgid "cannot parse expected object name '%s'" msgstr "kan inte tolka förväntat objektnamn \"%s\"" @@ -6543,7 +6561,7 @@ msgstr "kan inte ta bort lös länk \"%s\"" msgid "Recorded preimage for '%s'" msgstr "Sparade förhandsbild för \"%s\"" -#: rerere.c:881 submodule.c:2082 builtin/log.c:1975 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1992 #: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" @@ -6582,43 +6600,43 @@ 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:3426 +#: reset.c:70 reset.c:76 sequencer.c:3460 #, c-format msgid "failed to find tree of %s" msgstr "kunde inte hitta trädet för %s." -#: revision.c:2344 +#: revision.c:2336 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<paketfil> stöds inte längre" -#: revision.c:2364 +#: revision.c:2356 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "okänt värde för --diff-merges: %s" -#: revision.c:2702 +#: revision.c:2694 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2705 +#: revision.c:2697 #, 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:2915 +#: revision.c:2907 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L stöder ännu inte andra diff-format än -p och -s" -#: run-command.c:763 +#: run-command.c:764 msgid "open /dev/null failed" msgstr "misslyckades öppna /dev/null" -#: run-command.c:1270 +#: run-command.c:1271 #, c-format msgid "cannot create async thread: %s" msgstr "kan inte skapa asynkron tråd: %s" -#: run-command.c:1334 +#: run-command.c:1335 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -6627,33 +6645,33 @@ 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:145 +#: send-pack.c:146 msgid "unexpected flush packet while reading remote unpack status" msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus" -#: send-pack.c:147 +#: send-pack.c:148 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "kunde inte tolka fjärruppackningsstatus: %s" -#: send-pack.c:149 +#: send-pack.c:150 #, c-format msgid "remote unpack failed: %s" msgstr "fjärruppackning misslyckades: %s" -#: send-pack.c:372 +#: send-pack.c:374 msgid "failed to sign the push certificate" msgstr "misslyckades underteckna push-certifikatet" -#: send-pack.c:460 +#: send-pack.c:467 msgid "the receiving end does not support this repository's hash algorithm" msgstr "mottagarsidan stöder inte arkivets hashningsalgoritm" -#: send-pack.c:469 +#: send-pack.c:476 msgid "the receiving end does not support --signed push" msgstr "mottagarsidan stöder inte push med --signed" -#: send-pack.c:471 +#: send-pack.c:478 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -6661,47 +6679,47 @@ msgstr "" "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --" "signed" -#: send-pack.c:483 +#: send-pack.c:490 msgid "the receiving end does not support --atomic push" msgstr "mottagarsidan stöder inte push med --atomic" -#: send-pack.c:488 +#: send-pack.c:495 msgid "the receiving end does not support push options" msgstr "mottagarsidan stöder inte push-flaggor" -#: sequencer.c:194 +#: sequencer.c:195 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\"" -#: sequencer.c:308 +#: sequencer.c:323 #, c-format msgid "could not delete '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 +#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:339 +#: sequencer.c:353 msgid "revert" msgstr "revert" -#: sequencer.c:341 +#: sequencer.c:355 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:343 +#: sequencer.c:357 msgid "rebase" msgstr "rebase" -#: sequencer.c:345 +#: sequencer.c:359 #, c-format msgid "unknown action: %d" msgstr "okänd funktion: %d" -#: sequencer.c:404 +#: sequencer.c:418 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6709,7 +6727,7 @@ msgstr "" "efter att ha löst konflikterna, markera de rättade sökvägarna\n" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"" -#: sequencer.c:407 +#: sequencer.c:421 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6719,43 +6737,43 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:420 sequencer.c:3028 +#: sequencer.c:434 sequencer.c:3062 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 -#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 +#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080 +#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" -#: sequencer.c:427 +#: sequencer.c:441 #, c-format msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 -#: sequencer.c:3311 +#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082 +#: sequencer.c:3345 #, c-format msgid "failed to finalize '%s'" msgstr "misslyckades färdigställa \"%s\"" -#: sequencer.c:471 +#: sequencer.c:485 #, c-format msgid "your local changes would be overwritten by %s." msgstr "dina lokala ändringar skulle skrivas över av %s." -#: sequencer.c:475 +#: sequencer.c:489 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:507 +#: sequencer.c:521 #, c-format msgid "%s: fast-forward" msgstr "%s: snabbspola" -#: sequencer.c:546 builtin/tag.c:566 +#: sequencer.c:560 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" @@ -6763,65 +6781,65 @@ msgstr "Felaktigt städningsläge %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:640 +#: sequencer.c:670 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:657 +#: sequencer.c:687 msgid "unable to update cache tree" msgstr "kan inte uppdatera cacheträd" -#: sequencer.c:671 +#: sequencer.c:701 msgid "could not resolve HEAD commit" msgstr "kunde inte bestämma HEAD:s incheckning" -#: sequencer.c:751 +#: sequencer.c:781 #, c-format msgid "no key present in '%.*s'" msgstr "ingen nyckel i \"%.*s\"" -#: sequencer.c:762 +#: sequencer.c:792 #, c-format msgid "unable to dequote value of '%s'" msgstr "kan inte ta bort citering av värdet \"%s\"" -#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724 -#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902 +#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: sequencer.c:809 +#: sequencer.c:839 msgid "'GIT_AUTHOR_NAME' already given" msgstr "\"GIT_AUTHOR_NAME\" har redan angivits" -#: sequencer.c:814 +#: sequencer.c:844 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits" -#: sequencer.c:819 +#: sequencer.c:849 msgid "'GIT_AUTHOR_DATE' already given" msgstr "\"GIT_AUTHOR_DATE\" har redan angivits" -#: sequencer.c:823 +#: sequencer.c:853 #, c-format msgid "unknown variable '%s'" msgstr "okänd variabel \"%s\"" -#: sequencer.c:828 +#: sequencer.c:858 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "\"GIT_AUTHOR_NAME\" saknas" -#: sequencer.c:830 +#: sequencer.c:860 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "\"GIT_AUTHOR_EMAIL\" saknas" -#: sequencer.c:832 +#: sequencer.c:862 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "\"GIT_AUTHOR_DATE\" saknas" -#: sequencer.c:897 +#: sequencer.c:927 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6850,11 +6868,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1178 +#: sequencer.c:1208 msgid "'prepare-commit-msg' hook failed" msgstr "kroken \"prepare-commit-msg\" misslyckades" -#: sequencer.c:1184 +#: sequencer.c:1214 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6881,7 +6899,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1197 +#: sequencer.c:1227 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6906,340 +6924,340 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1239 +#: sequencer.c:1269 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: sequencer.c:1241 +#: sequencer.c:1271 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: sequencer.c:1287 +#: sequencer.c:1317 msgid "unable to resolve HEAD after creating commit" msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning" -#: sequencer.c:1289 +#: sequencer.c:1319 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: sequencer.c:1293 +#: sequencer.c:1323 msgid " (root-commit)" msgstr " (rotincheckning)" -#: sequencer.c:1314 +#: sequencer.c:1344 msgid "could not parse HEAD" msgstr "kunde inte tolka HEAD" -#: sequencer.c:1316 +#: sequencer.c:1346 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s är inte en incheckning!" -#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 +#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: sequencer.c:1373 sequencer.c:2067 +#: sequencer.c:1403 sequencer.c:2100 msgid "unable to parse commit author" msgstr "kunde inte tolka incheckningens författare" -#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 +#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: sequencer.c:1417 sequencer.c:1535 +#: sequencer.c:1447 sequencer.c:1565 #, c-format msgid "unable to read commit message from '%s'" msgstr "kunde inte läsa incheckningsmeddelande från \"%s\"" -#: sequencer.c:1446 sequencer.c:1478 +#: sequencer.c:1476 sequencer.c:1508 #, c-format msgid "invalid author identity '%s'" msgstr "ogiltig författar-identitet \"%s\"" -#: sequencer.c:1452 +#: sequencer.c:1482 msgid "corrupt author: missing date information" msgstr "trasig författare: saknar datuminformation" -#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890 -#: builtin/merge.c:915 +#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904 +#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: sequencer.c:1518 sequencer.c:4237 +#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:1567 +#: sequencer.c:1597 #, c-format msgid "could not parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: sequencer.c:1572 +#: sequencer.c:1602 #, c-format msgid "could not parse parent commit %s" msgstr "kunde inte tolka föräldraincheckningen %s" -#: sequencer.c:1655 sequencer.c:1766 +#: sequencer.c:1685 sequencer.c:1796 #, c-format msgid "unknown command: %d" msgstr "okänt kommando: %d" -#: sequencer.c:1713 sequencer.c:1738 +#: sequencer.c:1743 sequencer.c:1768 #, c-format msgid "This is a combination of %d commits." msgstr "Det här är en kombination av %d incheckningar." -#: sequencer.c:1723 +#: sequencer.c:1753 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:1725 sequencer.c:3338 +#: sequencer.c:1755 sequencer.c:3372 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:1727 +#: sequencer.c:1757 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:1733 +#: sequencer.c:1763 #, c-format msgid "cannot write '%s'" msgstr "kan inte skriva \"%s\"" -#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 +#: sequencer.c:1770 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "Det här är 1:a incheckningsmeddelandet:" -#: sequencer.c:1748 +#: sequencer.c:1778 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:1755 +#: sequencer.c:1785 #, c-format msgid "This is the commit message #%d:" msgstr "Det här är incheckningsmeddelande %d:" -#: sequencer.c:1761 +#: sequencer.c:1791 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Incheckningsmeddelande %d kommer hoppas över:" -#: sequencer.c:1849 +#: sequencer.c:1879 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:1856 +#: sequencer.c:1886 msgid "cannot fixup root commit" msgstr "kan inte göra \"fixup\" på rotincheckning" -#: sequencer.c:1875 +#: sequencer.c:1905 #, 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:1883 sequencer.c:1891 +#: sequencer.c:1913 sequencer.c:1921 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:1897 +#: sequencer.c:1927 #, 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:1916 +#: sequencer.c:1946 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:1981 +#: sequencer.c:2011 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:2038 +#: sequencer.c:2071 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:2039 +#: sequencer.c:2072 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:2059 +#: sequencer.c:2092 #, 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:2117 +#: sequencer.c:2150 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:2124 +#: sequencer.c:2157 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:2201 +#: sequencer.c:2234 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s tar inte argument: \"%s\"" -#: sequencer.c:2210 +#: sequencer.c:2243 #, c-format msgid "missing arguments for %s" msgstr "argument saknas för %s" -#: sequencer.c:2241 +#: sequencer.c:2274 #, c-format msgid "could not parse '%s'" msgstr "kunde inte tolka \"%s\"" -#: sequencer.c:2302 +#: sequencer.c:2335 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:2313 +#: sequencer.c:2346 #, c-format msgid "cannot '%s' without a previous commit" msgstr "kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:2399 +#: sequencer.c:2432 msgid "cancelling a cherry picking in progress" msgstr "avbryter pågående \"cherry-pick\"" -#: sequencer.c:2408 +#: sequencer.c:2441 msgid "cancelling a revert in progress" msgstr "avbryter pågående \"revert\"" -#: sequencer.c:2452 +#: sequencer.c:2485 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:2454 +#: sequencer.c:2487 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: \"%s\"" -#: sequencer.c:2459 +#: sequencer.c:2492 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:2470 +#: sequencer.c:2503 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:2472 +#: sequencer.c:2505 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:2550 +#: sequencer.c:2583 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:2657 +#: sequencer.c:2690 msgid "unusable squash-onto" msgstr "oanvändbar squash-onto" -#: sequencer.c:2677 +#: sequencer.c:2710 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: \"%s\"" -#: sequencer.c:2769 sequencer.c:4609 +#: sequencer.c:2803 sequencer.c:4636 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:2786 +#: sequencer.c:2820 msgid "revert is already in progress" msgstr "en \"revert\" pågår redan" -#: sequencer.c:2788 +#: sequencer.c:2822 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "testa \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2791 +#: sequencer.c:2825 msgid "cherry-pick is already in progress" msgstr "en \"cherry-pick\" pågår redan" -#: sequencer.c:2793 +#: sequencer.c:2827 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2807 +#: sequencer.c:2841 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:2822 +#: sequencer.c:2856 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:2882 sequencer.c:4325 +#: sequencer.c:2916 sequencer.c:4371 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:2884 sequencer.c:2895 +#: sequencer.c:2918 sequencer.c:2929 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:2886 sequencer.c:2930 +#: sequencer.c:2920 sequencer.c:2964 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:2916 builtin/grep.c:745 +#: sequencer.c:2950 builtin/grep.c:756 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:2918 +#: sequencer.c:2952 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:2919 +#: sequencer.c:2953 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:2925 +#: sequencer.c:2959 #, 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:2936 +#: sequencer.c:2970 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:2977 +#: sequencer.c:3011 msgid "no revert in progress" msgstr "ingen \"revers\" pågår" -#: sequencer.c:2986 +#: sequencer.c:3020 msgid "no cherry-pick in progress" msgstr "ingen \"cherry-pick\" pågår" -#: sequencer.c:2996 +#: sequencer.c:3030 msgid "failed to skip the commit" msgstr "kunde inte hoppa över incheckningen" -#: sequencer.c:3003 +#: sequencer.c:3037 msgid "there is nothing to skip" msgstr "ingenting att hoppa över" -#: sequencer.c:3006 +#: sequencer.c:3040 #, c-format msgid "" "have you committed already?\n" @@ -7248,16 +7266,16 @@ msgstr "" "har du redan checkat in?\n" "testa \"git %s --continue\"" -#: sequencer.c:3168 sequencer.c:4217 +#: sequencer.c:3202 sequencer.c:4263 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:3185 +#: sequencer.c:3219 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "kan inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3193 +#: sequencer.c:3227 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7276,27 +7294,27 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:3203 +#: sequencer.c:3237 #, c-format msgid "Could not apply %s... %.*s" msgstr "Kunde inte tillämpa %s... %.*s" -#: sequencer.c:3210 +#: sequencer.c:3244 #, c-format msgid "Could not merge %.*s" msgstr "Kunde inte slå ihop %.*s" -#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 +#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3240 +#: sequencer.c:3274 #, c-format msgid "Executing: %s\n" msgstr "Kör: %s\n" -#: sequencer.c:3255 +#: sequencer.c:3289 #, c-format msgid "" "execution failed: %s\n" @@ -7311,11 +7329,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3261 +#: sequencer.c:3295 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:3267 +#: sequencer.c:3301 #, c-format msgid "" "execution succeeded: %s\n" @@ -7332,90 +7350,90 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3328 +#: sequencer.c:3362 #, c-format msgid "illegal label name: '%.*s'" msgstr "ogiltigt etikettnamn: \"%.*s\"" -#: sequencer.c:3382 +#: sequencer.c:3416 msgid "writing fake root commit" msgstr "skriver fejkad rotincheckning" -#: sequencer.c:3387 +#: sequencer.c:3421 msgid "writing squash-onto" msgstr "skriver squash-onto" -#: sequencer.c:3471 +#: sequencer.c:3505 #, c-format msgid "could not resolve '%s'" msgstr "kunde inte upplösa \"%s\"" -#: sequencer.c:3502 +#: sequencer.c:3538 msgid "cannot merge without a current revision" msgstr "kan inte slå ihop utan en aktuell incheckning" -#: sequencer.c:3524 +#: sequencer.c:3560 #, c-format msgid "unable to parse '%.*s'" msgstr "kan inte tolka \"%.*s\"" -#: sequencer.c:3533 +#: sequencer.c:3569 #, c-format msgid "nothing to merge: '%.*s'" msgstr "inget att slå samman: \"%.*s\"" -#: sequencer.c:3545 +#: sequencer.c:3581 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:3561 +#: sequencer.c:3597 #, c-format msgid "could not get commit message of '%s'" msgstr "kunde inte läsa incheckningsmeddelande för \"%s\"" -#: sequencer.c:3730 +#: sequencer.c:3780 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "kunde inte ens försöka slå ihop \"%.*s\"" -#: sequencer.c:3746 +#: sequencer.c:3796 msgid "merge: Unable to write new index file" msgstr "sammanslagning: Kunde inte skriva ny indexfil" -#: sequencer.c:3820 +#: sequencer.c:3870 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: sequencer.c:3823 +#: sequencer.c:3873 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Oväntat svar från stash: \"%s\"" -#: sequencer.c:3829 +#: sequencer.c:3879 #, c-format msgid "Could not create directory for '%s'" msgstr "Kunde inte skapa katalog för \"%s\"" -#: sequencer.c:3832 +#: sequencer.c:3882 #, c-format msgid "Created autostash: %s\n" msgstr "Skapade autostash: %s\n" -#: sequencer.c:3836 +#: sequencer.c:3886 msgid "could not reset --hard" msgstr "kunde inte utföra \"reset --hard\"" -#: sequencer.c:3861 +#: sequencer.c:3911 #, c-format msgid "Applied autostash.\n" msgstr "Tillämpade autostash.\n" -#: sequencer.c:3873 +#: sequencer.c:3923 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:3876 +#: sequencer.c:3926 #, c-format msgid "" "%s\n" @@ -7426,34 +7444,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:3881 +#: sequencer.c:3931 msgid "Applying autostash resulted in conflicts." msgstr "Tillämpning av autostash gav konflikter." -#: sequencer.c:3882 +#: sequencer.c:3932 msgid "Autostash exists; creating a new stash entry." msgstr "Autostash finns; skapar ny stash-post." -#: sequencer.c:3974 -#, c-format -msgid "%s: not a valid OID" -msgstr "%s: inte ett giltigt OID" - -#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4025 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" -#: sequencer.c:3994 +#: sequencer.c:4040 #, c-format msgid "Stopped at HEAD\n" msgstr "Stoppade på HEAD\n" -#: sequencer.c:3996 +#: sequencer.c:4042 #, c-format msgid "Stopped at %s\n" msgstr "Stoppade på %s\n" -#: sequencer.c:4004 +#: sequencer.c:4050 #, c-format msgid "" "Could not execute the todo command\n" @@ -7474,58 +7487,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4050 +#: sequencer.c:4096 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Ombaserar (%d/%d)%s" -#: sequencer.c:4095 +#: sequencer.c:4141 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:4166 +#: sequencer.c:4212 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:4225 +#: sequencer.c:4271 msgid "could not read orig-head" msgstr "kunde inte läsa orig-head" -#: sequencer.c:4230 +#: sequencer.c:4276 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:4244 +#: sequencer.c:4290 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:4304 +#: sequencer.c:4350 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Lyckades ombasera och uppdatera %s.\n" -#: sequencer.c:4337 +#: sequencer.c:4383 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:4346 +#: sequencer.c:4392 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:4348 +#: sequencer.c:4394 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:4350 +#: sequencer.c:4396 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:4353 +#: sequencer.c:4399 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7535,55 +7548,50 @@ 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:4389 sequencer.c:4428 +#: sequencer.c:4435 sequencer.c:4474 #, c-format msgid "could not write file: '%s'" msgstr "kunde inte skriva fil: \"%s\"" -#: sequencer.c:4444 +#: sequencer.c:4490 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:4451 +#: sequencer.c:4497 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:4477 -#, c-format -msgid "invalid committer '%s'" -msgstr "ogiltig incheckare %s" - -#: sequencer.c:4586 +#: sequencer.c:4613 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:4590 +#: sequencer.c:4617 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:4625 +#: sequencer.c:4652 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" -#: sequencer.c:5102 +#: sequencer.c:5129 msgid "make_script: unhandled options" msgstr "make_script: flaggor som inte stöds" -#: sequencer.c:5105 +#: sequencer.c:5132 msgid "make_script: error preparing revisions" msgstr "make_script: fel när revisioner skulle förberedas" -#: sequencer.c:5347 sequencer.c:5364 +#: sequencer.c:5374 sequencer.c:5391 msgid "nothing to do" msgstr "inget att göra" -#: sequencer.c:5383 +#: sequencer.c:5410 msgid "could not skip unnecessary pick commands" msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon" -#: sequencer.c:5480 +#: sequencer.c:5504 msgid "the script was already rearranged." msgstr "skriptet har redan omordnats." @@ -7750,257 +7758,257 @@ msgstr "\"fork\" misslyckades" msgid "setsid failed" msgstr "\"setsid\" misslyckades" -#: sha1-file.c:470 +#: sha1-file.c:480 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates" -#: sha1-file.c:521 +#: sha1-file.c:531 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "kunde inte normalisera supplerande objektsökväg: %s" -#: sha1-file.c:593 +#: sha1-file.c:603 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: ignorerar supplerande objektlager, för djup nästling" -#: sha1-file.c:600 +#: sha1-file.c:610 #, c-format msgid "unable to normalize object directory: %s" msgstr "kan inte normalisera objektkatalogen: %s" -#: sha1-file.c:643 +#: sha1-file.c:653 msgid "unable to fdopen alternates lockfile" msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil" -#: sha1-file.c:661 +#: sha1-file.c:671 msgid "unable to read alternates file" msgstr "kan inte läsa \"alternates\"-filen" -#: sha1-file.c:668 +#: sha1-file.c:678 msgid "unable to move new alternates file into place" msgstr "kan inte flytta ny \"alternates\"-fil på plats" -#: sha1-file.c:703 +#: sha1-file.c:713 #, c-format msgid "path '%s' does not exist" msgstr "sökvägen \"%s\" finns inte" -#: sha1-file.c:724 +#: sha1-file.c:734 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu." -#: sha1-file.c:730 +#: sha1-file.c:740 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: sha1-file.c:736 +#: sha1-file.c:746 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: sha1-file.c:744 +#: sha1-file.c:754 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: sha1-file.c:804 +#: sha1-file.c:814 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "felaktig rad vid tolkning av supplerande referenser: %s" -#: sha1-file.c:954 +#: sha1-file.c:964 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>" -#: sha1-file.c:975 +#: sha1-file.c:985 msgid "mmap failed" msgstr "mmap misslyckades" -#: sha1-file.c:1139 +#: sha1-file.c:1149 #, c-format msgid "object file %s is empty" msgstr "objektfilen %s är tom" -#: sha1-file.c:1274 sha1-file.c:2467 +#: sha1-file.c:1284 sha1-file.c:2477 #, c-format msgid "corrupt loose object '%s'" msgstr "trasigt löst objekt \"%s\"" -#: sha1-file.c:1276 sha1-file.c:2471 +#: sha1-file.c:1286 sha1-file.c:2481 #, c-format msgid "garbage at end of loose object '%s'" msgstr "skräp i slutet av löst objekt \"%s\"" -#: sha1-file.c:1318 +#: sha1-file.c:1328 msgid "invalid object type" msgstr "felaktig objekttyp" -#: sha1-file.c:1402 +#: sha1-file.c:1412 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "kan inte packa upp %s-huvud med --allow-unknown-type" -#: sha1-file.c:1405 +#: sha1-file.c:1415 #, c-format msgid "unable to unpack %s header" msgstr "kan inte packa upp %s-huvudet" -#: sha1-file.c:1411 +#: sha1-file.c:1421 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "kan inte tolka %s-huvud med --allow-unknown-type" -#: sha1-file.c:1414 +#: sha1-file.c:1424 #, c-format msgid "unable to parse %s header" msgstr "kan inte tolka %s-huvud" -#: sha1-file.c:1641 +#: sha1-file.c:1651 #, c-format msgid "failed to read object %s" msgstr "misslyckades läsa objektet %s" -#: sha1-file.c:1645 +#: sha1-file.c:1655 #, c-format msgid "replacement %s not found for %s" msgstr "ersättningen %s hittades inte för %s" -#: sha1-file.c:1649 +#: sha1-file.c:1659 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "löst objekt %s (lagrat i %s) är trasigt" -#: sha1-file.c:1653 +#: sha1-file.c:1663 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "packat objekt %s (lagrat i %s) är trasigt" -#: sha1-file.c:1758 +#: sha1-file.c:1768 #, c-format msgid "unable to write file %s" msgstr "kunde inte skriva filen %s" -#: sha1-file.c:1765 +#: sha1-file.c:1775 #, c-format msgid "unable to set permission to '%s'" msgstr "kan inte sätta behörigheten till \"%s\"" -#: sha1-file.c:1772 +#: sha1-file.c:1782 msgid "file write error" msgstr "fel vid skrivning av fil" -#: sha1-file.c:1792 +#: sha1-file.c:1802 msgid "error when closing loose object file" msgstr "fel vid stängning av fil för löst objekt" -#: sha1-file.c:1857 +#: sha1-file.c:1867 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s" -#: sha1-file.c:1859 +#: sha1-file.c:1869 msgid "unable to create temporary file" msgstr "kan inte skapa temporär fil" -#: sha1-file.c:1883 +#: sha1-file.c:1893 msgid "unable to write loose object file" msgstr "kunde inte skriva fil för löst objekt" -#: sha1-file.c:1889 +#: sha1-file.c:1899 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)" -#: sha1-file.c:1893 +#: sha1-file.c:1903 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "\"deflateend\" på objektet %s misslyckades (%d)" -#: sha1-file.c:1897 +#: sha1-file.c:1907 #, c-format msgid "confused by unstable object source data for %s" msgstr "förvirrad av instabil objektkälldata för %s" -#: sha1-file.c:1907 builtin/pack-objects.c:1086 +#: sha1-file.c:1917 builtin/pack-objects.c:1086 #, c-format msgid "failed utime() on %s" msgstr "\"utime()\" misslyckades på %s" -#: sha1-file.c:1984 +#: sha1-file.c:1994 #, c-format msgid "cannot read object for %s" msgstr "kan inte läsa objekt för %s" -#: sha1-file.c:2035 +#: sha1-file.c:2045 msgid "corrupt commit" msgstr "trasik incheckning" -#: sha1-file.c:2043 +#: sha1-file.c:2053 msgid "corrupt tag" msgstr "trasig tagg" -#: sha1-file.c:2143 +#: sha1-file.c:2153 #, c-format msgid "read error while indexing %s" msgstr "läsfel vid indexering av %s" -#: sha1-file.c:2146 +#: sha1-file.c:2156 #, c-format msgid "short read while indexing %s" msgstr "för lite lästes vid indexering av %s" -#: sha1-file.c:2219 sha1-file.c:2229 +#: sha1-file.c:2229 sha1-file.c:2239 #, c-format msgid "%s: failed to insert into database" msgstr "%s: misslyckades lägga in i databasen" -#: sha1-file.c:2235 +#: sha1-file.c:2245 #, c-format msgid "%s: unsupported file type" msgstr "%s: filtypen stöds ej" -#: sha1-file.c:2259 +#: sha1-file.c:2269 #, c-format msgid "%s is not a valid object" msgstr "%s är inte ett giltigt objekt" -#: sha1-file.c:2261 +#: sha1-file.c:2271 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt \"%s\"-objekt" -#: sha1-file.c:2288 builtin/index-pack.c:192 +#: sha1-file.c:2298 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "kan inte öppna %s" -#: sha1-file.c:2478 sha1-file.c:2531 +#: sha1-file.c:2488 sha1-file.c:2541 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "hash stämmer inte för %s (förväntade %s)" -#: sha1-file.c:2502 +#: sha1-file.c:2512 #, c-format msgid "unable to mmap %s" msgstr "kan inte utföra \"mmap\" för %s" -#: sha1-file.c:2507 +#: sha1-file.c:2517 #, c-format msgid "unable to unpack header of %s" msgstr "kan inte packa upp huvud för %s" -#: sha1-file.c:2513 +#: sha1-file.c:2523 #, c-format msgid "unable to parse header of %s" msgstr "kan inte tolka huvud för %s" -#: sha1-file.c:2524 +#: sha1-file.c:2534 #, c-format msgid "unable to unpack contents of %s" msgstr "kan inte tolka innehåll i %s" @@ -8154,8 +8162,8 @@ msgid_plural "%u bytes/s" msgstr[0] "%u byte/s" msgstr[1] "%u bytes/s" -#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 -#: builtin/rebase.c:858 +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 +#: builtin/rebase.c:864 #, c-format msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" @@ -8380,7 +8388,7 @@ msgstr "ls-tree returnerade en oväntad returkod %d" #: trailer.c:236 #, c-format msgid "running trailer command '%s' failed" -msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\"" +msgstr "misslyckades utföra släpradskommandot \"%s\"" #: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 #: trailer.c:555 @@ -8388,7 +8396,7 @@ msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\"" msgid "unknown value '%s' for key '%s'" msgstr "okänt värde \"%s\" för nyckeln \"%s\"" -#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 +#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324 #, c-format msgid "more than one %s" msgstr "mer än en %s" @@ -8477,7 +8485,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:1226 +#: transport-helper.c:549 transport-helper.c:1236 #, c-format msgid "could not read ref %s" msgstr "kunde inte läsa referensen %s" @@ -8495,7 +8503,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:1428 +#: transport-helper.c:661 transport.c:1446 msgid "operation not supported by protocol" msgstr "funktionen stöds inte av protokollet" @@ -8506,61 +8514,66 @@ msgstr "kan inte ansluta till undertjänsten %s" #: transport-helper.c:745 msgid "'option' without a matching 'ok/error' directive" -msgstr "\"option\" utan matchande \"ok/error\"-direktiv" +msgstr "\"option\" utan mostsvarande \"ok/error\"-direktiv" #: transport-helper.c:788 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\"" -#: transport-helper.c:841 +#: transport-helper.c:845 #, c-format msgid "helper reported unexpected status of %s" msgstr "hjälparen returnerade oväntad status %s" -#: transport-helper.c:924 +#: transport-helper.c:928 #, c-format msgid "helper %s does not support dry-run" msgstr "hjälparen %s stöder inte dry-run" -#: transport-helper.c:927 +#: transport-helper.c:931 #, c-format msgid "helper %s does not support --signed" msgstr "hjälparen %s stöder inte --signed" -#: transport-helper.c:930 +#: transport-helper.c:934 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "hjälparen %s stöder inte --signed=if-asked" -#: transport-helper.c:935 +#: transport-helper.c:939 #, c-format msgid "helper %s does not support --atomic" msgstr "hjälparen %s stöder inte --atomic" -#: transport-helper.c:941 +#: transport-helper.c:943 +#, c-format +msgid "helper %s does not support --%s" +msgstr "hjälparen %s stöder inte --%s" + +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'push-option'" msgstr "hjälparen %s stöder inte \"push-option\"" -#: transport-helper.c:1040 +#: transport-helper.c:1050 msgid "remote-helper doesn't support push; refspec needed" msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs" -#: transport-helper.c:1045 +#: transport-helper.c:1055 #, c-format msgid "helper %s does not support 'force'" msgstr "hjälparen %s stöder inte \"force\"" -#: transport-helper.c:1092 +#: transport-helper.c:1102 msgid "couldn't run fast-export" msgstr "kunde inte köra fast-export" -#: transport-helper.c:1097 +#: transport-helper.c:1107 msgid "error while running fast-export" msgstr "fel vid körning av fast-export" -#: transport-helper.c:1122 +#: transport-helper.c:1132 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8569,52 +8582,52 @@ msgstr "" "Inga gemensamma referenser och inga angavs; gör inget.\n" "Du kanske borde ange en gren.\n" -#: transport-helper.c:1203 +#: transport-helper.c:1213 #, c-format msgid "unsupported object format '%s'" msgstr "objektformatet \"%s\" stöds ej" -#: transport-helper.c:1212 +#: transport-helper.c:1222 #, c-format msgid "malformed response in ref list: %s" msgstr "felformat svar i referenslistan: %s" -#: transport-helper.c:1364 +#: transport-helper.c:1374 #, c-format msgid "read(%s) failed" msgstr "läs(%s) misslyckades" -#: transport-helper.c:1391 +#: transport-helper.c:1401 #, c-format msgid "write(%s) failed" msgstr "skriv(%s) misslyckades" -#: transport-helper.c:1440 +#: transport-helper.c:1450 #, c-format msgid "%s thread failed" msgstr "%s-tråden misslyckades" -#: transport-helper.c:1444 +#: transport-helper.c:1454 #, c-format msgid "%s thread failed to join: %s" msgstr "%s-tråden misslyckades ansluta: %s" -#: transport-helper.c:1463 transport-helper.c:1467 +#: transport-helper.c:1473 transport-helper.c:1477 #, 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:1504 +#: transport-helper.c:1514 #, c-format msgid "%s process failed to wait" msgstr "processen %s misslyckades vänta" -#: transport-helper.c:1508 +#: transport-helper.c:1518 #, c-format msgid "%s process failed" msgstr "processen %s misslyckades" -#: transport-helper.c:1526 transport-helper.c:1535 +#: transport-helper.c:1536 transport-helper.c:1545 msgid "can't start thread for copying data" msgstr "kan inte skapa tråd för kopiering av data" @@ -8641,29 +8654,29 @@ msgstr "se protocol.version i \"git help config\" för mer information" msgid "server options require protocol version 2 or later" msgstr "serverflaggor kräver protokollversion 2 eller senare" -#: transport.c:712 +#: transport.c:727 msgid "could not parse transport.color.* config" msgstr "kunde inte tolka inställningen för transport.color.*" -#: transport.c:785 +#: transport.c:802 msgid "support for protocol v2 not implemented yet" msgstr "stöd för protokoll v2 ännu ej implementerat" -#: transport.c:919 +#: transport.c:936 #, c-format msgid "unknown value for config '%s': %s" msgstr "okänt värde för inställningen \"%s\": %s" -#: transport.c:985 +#: transport.c:1002 #, c-format msgid "transport '%s' not allowed" msgstr "transporten \"%s\" tillåts inte" -#: transport.c:1038 +#: transport.c:1055 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync stöds inte längre" -#: transport.c:1140 +#: transport.c:1157 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -8672,7 +8685,7 @@ msgstr "" "Följande undermodulsökvägar innehåller ändringar som\n" "inte kan hittas av fjärrarna:\n" -#: transport.c:1144 +#: transport.c:1161 #, c-format msgid "" "\n" @@ -8699,11 +8712,11 @@ msgstr "" "för att sända dem till fjärren.\n" "\n" -#: transport.c:1152 +#: transport.c:1169 msgid "Aborting." msgstr "Avbryter." -#: transport.c:1297 +#: transport.c:1315 msgid "failed to push all needed submodules" msgstr "kunde inte sända alla nödvändiga undermoduler" @@ -8982,7 +8995,7 @@ msgstr "" msgid "Updating index flags" msgstr "Uppdaterar indexflaggor" -#: upload-pack.c:1516 +#: upload-pack.c:1550 msgid "expected flush after fetch arguments" msgstr "förväntade \"flush\" efter \"fetch\"-argument" @@ -9019,7 +9032,7 @@ msgstr "felaktigt \"..\"-sökvägssegment" msgid "Fetching objects" msgstr "Hämtar objekt" -#: worktree.c:236 builtin/am.c:2116 +#: worktree.c:236 builtin/am.c:2103 #, c-format msgid "failed to read '%s'" msgstr "misslyckades läsa \"%s\"" @@ -9625,7 +9638,7 @@ msgstr "dessutom innehåller dit index ändringar som inte har checkats in." msgid "cannot %s: Your index contains uncommitted changes." msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in." -#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#: compat/precompose_utf8.c:58 builtin/clone.c:457 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" @@ -9652,7 +9665,7 @@ msgstr "ta bort \"%s\"\n" msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:272 builtin/rev-parse.c:904 +#: builtin/add.c:272 builtin/rev-parse.c:908 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" @@ -9688,8 +9701,8 @@ 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:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538 -#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 msgid "dry run" msgstr "testkörning" @@ -9697,7 +9710,7 @@ msgstr "testkörning" msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 +#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308 msgid "select hunks interactively" msgstr "välj stycken interaktivt" @@ -9824,13 +9837,13 @@ msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x" -#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 +#: builtin/add.c:507 builtin/checkout.c:1715 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar" -#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509 +#: builtin/add.c:514 builtin/checkout.c:1727 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul kräver --pathspec-from-file" @@ -9849,114 +9862,109 @@ msgstr "" "Slå av detta meddelande genom att köra\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:160 -#, c-format -msgid "invalid committer: %s" -msgstr "ogiltig incheckare: %s" - -#: builtin/am.c:366 +#: builtin/am.c:352 msgid "could not parse author script" msgstr "kunde inte tolka författarskript" -#: builtin/am.c:450 +#: builtin/am.c:436 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "\"%s\" togs bort av kroken applypatch-msg" -#: builtin/am.c:492 +#: builtin/am.c:478 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/am.c:530 +#: builtin/am.c:516 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/am.c:556 +#: builtin/am.c:542 msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:744 +#: builtin/am.c:730 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:809 +#: builtin/am.c:795 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:857 +#: builtin/am.c:843 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:862 builtin/am.c:874 +#: builtin/am.c:848 builtin/am.c:860 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:869 +#: builtin/am.c:855 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:962 +#: builtin/am.c:948 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:967 builtin/clone.c:409 +#: builtin/am.c:953 builtin/clone.c:410 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:972 +#: builtin/am.c:958 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1103 +#: builtin/am.c:1089 #, 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:1104 +#: builtin/am.c:1090 #, 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:1105 +#: builtin/am.c:1091 #, 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:1188 +#: builtin/am.c:1174 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:1216 +#: builtin/am.c:1202 msgid "Patch is empty." msgstr "Patchen är tom." -#: builtin/am.c:1281 +#: builtin/am.c:1267 #, c-format msgid "missing author line in commit %s" msgstr "saknad \"author\"-rad i incheckningen %s" -#: builtin/am.c:1284 +#: builtin/am.c:1270 #, c-format msgid "invalid ident line: %.*s" msgstr "ogiltig ident-rad: %.*s" -#: builtin/am.c:1503 +#: builtin/am.c:1489 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:1505 +#: builtin/am.c:1491 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1524 +#: builtin/am.c:1510 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -9964,25 +9972,25 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1530 +#: builtin/am.c:1516 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1556 +#: builtin/am.c:1542 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1588 +#: builtin/am.c:1574 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1639 builtin/am.c:1643 +#: builtin/am.c:1626 builtin/am.c:1630 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1661 +#: builtin/am.c:1648 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -9990,41 +9998,41 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1671 +#: builtin/am.c:1658 #, 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:1717 builtin/commit.c:395 +#: builtin/am.c:1704 builtin/commit.c:395 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/am.c:1721 +#: builtin/am.c:1708 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1761 builtin/am.c:1829 +#: builtin/am.c:1748 builtin/am.c:1816 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1778 +#: builtin/am.c:1765 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1784 +#: builtin/am.c:1771 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1788 +#: builtin/am.c:1775 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:1832 +#: builtin/am.c:1819 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10034,7 +10042,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:1839 +#: builtin/am.c:1826 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10046,17 +10054,17 @@ msgstr "" "lösta.\n" "Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den." -#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 +#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"." -#: builtin/am.c:1998 +#: builtin/am.c:1985 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2042 +#: builtin/am.c:2029 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10064,155 +10072,155 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2149 +#: builtin/am.c:2136 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt värde för --patch-format: %s" -#: builtin/am.c:2191 +#: builtin/am.c:2178 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "Felaktigt värde för --show-current-patch: %s" -#: builtin/am.c:2195 +#: builtin/am.c:2182 #, 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" -#: builtin/am.c:2226 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2227 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2233 +#: builtin/am.c:2220 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2235 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2237 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 -#: builtin/repack.c:309 builtin/stash.c:816 +#: builtin/am.c:2225 builtin/init-db.c:558 builtin/prune-packed.c:16 +#: builtin/repack.c:335 builtin/stash.c:815 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2240 -msgid "add a Signed-off-by line to the commit message" -msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet" +#: builtin/am.c:2227 +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:2243 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2245 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2247 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2249 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2251 +#: builtin/am.c:2238 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:2254 +#: builtin/am.c:2241 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:2257 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268 -#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 -#: builtin/am.c:2286 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251 +#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:903 builtin/merge.c:260 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324 -#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350 +#: builtin/repack.c:352 builtin/show-branch.c:650 builtin/show-ref.c:172 #: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 #: parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/am.c:2269 builtin/branch.c:659 builtin/bugreport.c:136 #: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 #: builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2283 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2289 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2291 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2294 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2297 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2300 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "återställ originalgrenen och avbryt patchningen." -#: builtin/am.c:2303 +#: builtin/am.c:2290 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:2307 +#: builtin/am.c:2294 msgid "show the patch being applied" msgstr "visa patchen som tillämpas" -#: builtin/am.c:2312 +#: builtin/am.c:2299 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2314 +#: builtin/am.c:2301 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515 -#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530 -#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419 +#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:297 builtin/pull.c:175 builtin/rebase.c:536 +#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 +#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2320 +#: builtin/am.c:2307 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2338 +#: builtin/am.c:2325 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." @@ -10220,16 +10228,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:2345 +#: builtin/am.c:2332 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2360 +#: builtin/am.c:2347 #, 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:2384 +#: builtin/am.c:2371 #, c-format msgid "" "Stray %s directory found.\n" @@ -10238,11 +10246,11 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2390 +#: builtin/am.c:2377 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." -#: builtin/am.c:2400 +#: builtin/am.c:2387 msgid "interactive mode requires patches on the command line" msgstr "interaktivt läge kräver patchar på kommandoraden" @@ -10281,22 +10289,10 @@ msgid "git archive: expected a flush" msgstr "git archive: förväntade en tömning (flush)" #: builtin/bisect--helper.c:23 -msgid "git bisect--helper --next-all" -msgstr "git bisect--helper --next-all" - -#: builtin/bisect--helper.c:24 -msgid "git bisect--helper --write-terms <bad_term> <good_term>" -msgstr "git bisect--helper --write-terms <term-för-fel> <term-för-rätt>" - -#: builtin/bisect--helper.c:25 -msgid "git bisect--helper --bisect-clean-state" -msgstr "git bisect--helper --bisect-clean-state" - -#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --bisect-reset [<incheckning>]" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:24 msgid "" "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " "<bad_term>" @@ -10304,7 +10300,7 @@ msgstr "" "git bisect--helper --bisect-write [--no-log] <tillstånd> <revision> <term-" "för-rätt> <term-för-fel>" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:25 msgid "" "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " "<bad_term>" @@ -10312,12 +10308,12 @@ msgstr "" "git bisect--helper --bisect-check-and-set-terms <kommadno> <term-för-rätt> " "<term-för-fel>" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:26 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:30 +#: builtin/bisect--helper.c:27 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" @@ -10325,7 +10321,7 @@ msgstr "" "git-bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -#: builtin/bisect--helper.c:31 +#: builtin/bisect--helper.c:28 msgid "" "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " @@ -10335,58 +10331,62 @@ msgstr "" "=<term>] [--no-checkout] [--first-parent] [<dålig> [<bra>...]] [--] " "[<sökvägar>...]" -#: builtin/bisect--helper.c:33 +#: builtin/bisect--helper.c:30 msgid "git bisect--helper --bisect-next" msgstr "git bisect--helper --bisect-next" -#: builtin/bisect--helper.c:34 +#: builtin/bisect--helper.c:31 msgid "git bisect--helper --bisect-auto-next" msgstr "git bisect--helper --bisect-auto-next" -#: builtin/bisect--helper.c:35 -msgid "git bisect--helper --bisect-autostart" -msgstr "git bisect--helper --bisect-autostart" +#: builtin/bisect--helper.c:32 +msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" +msgstr "git bisect--helper --bisect-state (bad|new) [<incheckning>]" + +#: builtin/bisect--helper.c:33 +msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" +msgstr "git bisect--helper --bisect-state (good|old) [<incheckning>...]" -#: builtin/bisect--helper.c:97 +#: builtin/bisect--helper.c:108 #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "kan inte kopiera filen \"%s\" i läget \"%s\"" -#: builtin/bisect--helper.c:104 +#: builtin/bisect--helper.c:115 #, c-format msgid "could not write to file '%s'" msgstr "kunde inte skriva till filen \"%s\"" -#: builtin/bisect--helper.c:143 +#: builtin/bisect--helper.c:154 #, c-format msgid "'%s' is not a valid term" msgstr "\"%s\" är inte en giltig term" -#: builtin/bisect--helper.c:147 +#: builtin/bisect--helper.c:158 #, 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:157 +#: builtin/bisect--helper.c:168 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "kan inte ändra betydelsen av termen \"%s\"" -#: builtin/bisect--helper.c:167 +#: builtin/bisect--helper.c:178 msgid "please use two different terms" msgstr "termerna måste vara olika" -#: builtin/bisect--helper.c:207 +#: builtin/bisect--helper.c:194 #, c-format msgid "We are not bisecting.\n" msgstr "Vi utför ingen bisect för tillfället.\n" -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:202 #, c-format msgid "'%s' is not a valid commit" msgstr "\"%s\" är inte en giltig incheckning" -#: builtin/bisect--helper.c:224 +#: builtin/bisect--helper.c:211 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -10394,27 +10394,27 @@ msgstr "" "Kunde inte checka ut original-HEAD \"%s\". Försök \"git bisect reset " "<incheckning>\"." -#: builtin/bisect--helper.c:268 +#: builtin/bisect--helper.c:255 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Felaktigt argument till bisect_write: %s" -#: builtin/bisect--helper.c:273 +#: builtin/bisect--helper.c:260 #, 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:285 +#: builtin/bisect--helper.c:272 #, c-format msgid "couldn't open the file '%s'" msgstr "kunde inte öppna filen \"%s\"" -#: builtin/bisect--helper.c:311 +#: builtin/bisect--helper.c:298 #, 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:338 +#: builtin/bisect--helper.c:325 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10423,7 +10423,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:342 +#: builtin/bisect--helper.c:329 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10434,7 +10434,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:362 +#: builtin/bisect--helper.c:349 #, c-format msgid "bisecting only with a %s commit" msgstr "utför bisect med endast en %s incheckning" @@ -10443,15 +10443,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:370 +#: builtin/bisect--helper.c:357 msgid "Are you sure [Y/n]? " msgstr "Är du säker [Y=ja/N=nej]? " -#: builtin/bisect--helper.c:431 +#: builtin/bisect--helper.c:418 msgid "no terms defined" msgstr "inga termer angivna" -#: builtin/bisect--helper.c:434 +#: builtin/bisect--helper.c:421 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10460,7 +10460,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:444 +#: builtin/bisect--helper.c:431 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10469,54 +10469,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:511 +#: builtin/bisect--helper.c:498 msgid "revision walk setup failed\n" msgstr "misslyckades starta revisionstraversering\n" -#: builtin/bisect--helper.c:533 +#: builtin/bisect--helper.c:520 #, c-format msgid "could not open '%s' for appending" msgstr "kunde inte öppna \"%s\" för tillägg" -#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652 msgid "'' is not a valid term" msgstr "\"\" är inte en giltig term" -#: builtin/bisect--helper.c:674 +#: builtin/bisect--helper.c:662 #, c-format msgid "unrecognized option: '%s'" msgstr "okänd flagga: %s" -#: builtin/bisect--helper.c:678 +#: builtin/bisect--helper.c:666 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "\"%s\" verkar inte vara en giltig revision" -#: builtin/bisect--helper.c:709 +#: builtin/bisect--helper.c:697 msgid "bad HEAD - I need a HEAD" msgstr "felaktigt HEAD - Jag behöver ett HEAD" -#: builtin/bisect--helper.c:724 +#: builtin/bisect--helper.c:712 #, 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:745 +#: builtin/bisect--helper.c:733 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:748 +#: builtin/bisect--helper.c:736 msgid "bad HEAD - strange symbolic ref" msgstr "felaktigt HEAD - konstig symbolisk referens" -#: builtin/bisect--helper.c:775 +#: builtin/bisect--helper.c:756 #, c-format msgid "invalid ref: '%s'" msgstr "ogiltig referens: \"%s\"" -#: builtin/bisect--helper.c:827 +#: builtin/bisect--helper.c:814 msgid "You need to start by \"git bisect start\"\n" msgstr "Du måste starta med \"git bisect start\"\n" @@ -10524,107 +10524,93 @@ 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:838 +#: builtin/bisect--helper.c:825 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:866 -msgid "perform 'git bisect next'" -msgstr "utför 'git bisect next'" - -#: builtin/bisect--helper.c:868 -msgid "write the terms to .git/BISECT_TERMS" -msgstr "skriv termerna i .git/BISECT_TERMS" +#: builtin/bisect--helper.c:843 +msgid "Please call `--bisect-state` with at least one argument" +msgstr "Anropa \"--bisect-state\" med minst ett argument." -#: builtin/bisect--helper.c:870 -msgid "cleanup the bisection state" -msgstr "städar upp bisect-tillstånd" +#: builtin/bisect--helper.c:856 +#, c-format +msgid "'git bisect %s' can take only one argument." +msgstr "\"git bisect %s\" kan bara ta ett argument." -#: builtin/bisect--helper.c:872 -msgid "check for expected revs" -msgstr "kontrollera för förväntade versioner" +#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879 +#, c-format +msgid "Bad rev input: %s" +msgstr "Felaktig rev-indata: %s" -#: builtin/bisect--helper.c:874 +#: builtin/bisect--helper.c:924 msgid "reset the bisection state" msgstr "återställ bisect-tillstånd" -#: builtin/bisect--helper.c:876 +#: builtin/bisect--helper.c:926 msgid "write out the bisection state in BISECT_LOG" msgstr "skriver bisect-tillståndet i BISECT_LOG" -#: builtin/bisect--helper.c:878 +#: builtin/bisect--helper.c:928 msgid "check and set terms in a bisection state" msgstr "visa och ange termer för bisect-tillstånd" -#: builtin/bisect--helper.c:880 +#: builtin/bisect--helper.c:930 msgid "check whether bad or good terms exist" msgstr "se efter om termer för rätt och fel finns" -#: builtin/bisect--helper.c:882 +#: builtin/bisect--helper.c:932 msgid "print out the bisect terms" msgstr "skriv ut termer för bisect" -#: builtin/bisect--helper.c:884 +#: builtin/bisect--helper.c:934 msgid "start the bisect session" msgstr "påbörja bisect-körningen" -#: builtin/bisect--helper.c:886 +#: builtin/bisect--helper.c:936 msgid "find the next bisection commit" msgstr "hitta nästa incheckning i bisect" -#: builtin/bisect--helper.c:888 +#: builtin/bisect--helper.c:938 msgid "verify the next bisection state then checkout the next bisection commit" msgstr "" "kontrollera nästa bisect-tillstånd och checka så ut nästa bisect-incheckning" -#: builtin/bisect--helper.c:890 -msgid "start the bisection if it has not yet been started" -msgstr "påbörja bisect om det inte redan har startats" +#: builtin/bisect--helper.c:940 +msgid "mark the state of ref (or refs)" +msgstr "markera tillståndet för en eller flera referenser" -#: builtin/bisect--helper.c:892 +#: builtin/bisect--helper.c:942 msgid "no log for BISECT_WRITE" msgstr "ingen logg för BISECT_WRITE" -#: builtin/bisect--helper.c:910 -msgid "--write-terms requires two arguments" -msgstr "--write-terms kräver två argument" - -#: builtin/bisect--helper.c:914 -msgid "--bisect-clean-state requires no arguments" -msgstr "--bisect-clean-state tar inga argument" - -#: builtin/bisect--helper.c:921 +#: builtin/bisect--helper.c:957 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:925 +#: builtin/bisect--helper.c:961 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write kräver antingen 4 eller 5 argument" -#: builtin/bisect--helper.c:931 +#: builtin/bisect--helper.c:967 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms kräver tre argument" -#: builtin/bisect--helper.c:937 +#: builtin/bisect--helper.c:973 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check kräver 2 eller 3 argument" -#: builtin/bisect--helper.c:943 +#: builtin/bisect--helper.c:979 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms kräver noll eller ett argument" -#: builtin/bisect--helper.c:952 +#: builtin/bisect--helper.c:988 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next kräver 0 argument" -#: builtin/bisect--helper.c:958 +#: builtin/bisect--helper.c:994 msgid "--bisect-auto-next requires 0 arguments" msgstr "--bisect-auto-next kräver 0 argument" -#: builtin/bisect--helper.c:964 -msgid "--bisect-autostart does not accept arguments" -msgstr "--bisect-autostart tar inga argument" - #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" @@ -10651,128 +10637,129 @@ msgstr "felaktig färg \"%s\" i color.blame.repeatedLines" msgid "invalid value for blame.coloring" msgstr "ogiltigt värde för blame.coloring" -#: builtin/blame.c:845 +#: builtin/blame.c:847 #, c-format msgid "cannot find revision %s to ignore" msgstr "kan inte hitta revision %s att ignorera" -#: builtin/blame.c:867 +#: builtin/blame.c:869 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:870 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:871 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:870 +#: builtin/blame.c:872 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:871 +#: builtin/blame.c:873 msgid "Force progress reporting" msgstr "Tvinga förloppsrapportering" -#: builtin/blame.c:872 +#: builtin/blame.c:874 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:873 +#: builtin/blame.c:875 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:874 +#: builtin/blame.c:876 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:875 +#: builtin/blame.c:877 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:878 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:877 +#: builtin/blame.c:879 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:880 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:879 +#: builtin/blame.c:881 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:880 +#: builtin/blame.c:882 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:881 +#: builtin/blame.c:883 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:884 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:883 builtin/log.c:1808 +#: builtin/blame.c:885 builtin/log.c:1813 msgid "rev" msgstr "rev" -#: builtin/blame.c:883 +#: builtin/blame.c:885 msgid "Ignore <rev> when blaming" msgstr "ignorera <rev> vid klandren" -#: builtin/blame.c:884 +#: builtin/blame.c:886 msgid "Ignore revisions from <file>" msgstr "ignorera revisioner från <fil>" -#: builtin/blame.c:885 +#: builtin/blame.c:887 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:888 msgid "color lines by age" msgstr "färglägg rader efter ålder" -#: builtin/blame.c:887 +#: builtin/blame.c:889 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:890 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:891 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:892 builtin/blame.c:893 msgid "score" msgstr "poäng" -#: builtin/blame.c:890 +#: builtin/blame.c:892 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:891 +#: builtin/blame.c:893 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:892 -msgid "n,m" -msgstr "n,m" +#: builtin/blame.c:894 +msgid "range" +msgstr "intervall" -#: builtin/blame.c:892 -msgid "Process only line range n,m, counting from 1" -msgstr "Behandla endast radintervallet n,m, med början på 1" +#: builtin/blame.c:895 +msgid "Process only line range <start>,<end> or function :<funcname>" +msgstr "" +"Behandla endast intervallet <start>,<slut> eller funktionen :<funknamn>" -#: builtin/blame.c:944 +#: 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" @@ -10784,18 +10771,18 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:995 +#: builtin/blame.c:998 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" -#: builtin/blame.c:1110 +#: 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:1156 +#: builtin/blame.c:1159 msgid "Blaming lines" msgstr "Klandra rader" @@ -11005,7 +10992,7 @@ msgstr "ställ in spårningsläge (se git-pull(1))" msgid "do not use" msgstr "använd ej" -#: builtin/branch.c:626 builtin/rebase.c:526 +#: builtin/branch.c:626 builtin/rebase.c:532 msgid "upstream" msgstr "uppströms" @@ -11116,7 +11103,7 @@ msgstr "sortering och filtrering skiljer gemener och VERSALER" msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/branch.c:682 builtin/clone.c:789 +#: builtin/branch.c:682 builtin/clone.c:790 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" @@ -11266,38 +11253,38 @@ msgstr "" "Se över resten av felrapporten nedan.\n" "Du kan ta bort rader du inte vill dela.\n" -#: builtin/bugreport.c:134 +#: builtin/bugreport.c:135 msgid "specify a destination for the bugreport file" msgstr "ange mål för buggrapporteringsfilen" -#: builtin/bugreport.c:136 +#: builtin/bugreport.c:137 msgid "specify a strftime format suffix for the filename" msgstr "ange ett filändelse i strftime-format" -#: builtin/bugreport.c:158 +#: builtin/bugreport.c:159 #, c-format msgid "could not create leading directories for '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/bugreport.c:165 +#: builtin/bugreport.c:166 msgid "System Info" msgstr "Systeminfo" -#: builtin/bugreport.c:168 +#: builtin/bugreport.c:169 msgid "Enabled Hooks" msgstr "Aktiverade krokar" -#: builtin/bugreport.c:175 +#: builtin/bugreport.c:176 #, c-format msgid "couldn't create a new file at '%s'" msgstr "kunde inte skapa filen på \"%s\"" -#: builtin/bugreport.c:178 +#: builtin/bugreport.c:179 #, c-format msgid "unable to write to %s" msgstr "kunde inte skriva till %s" -#: builtin/bugreport.c:188 +#: builtin/bugreport.c:189 #, c-format msgid "Created new report at '%s'.\n" msgstr "Skapade ny rapport på \"%s\"\n" @@ -11355,11 +11342,11 @@ msgstr "%s är okej\n" msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/bundle.c:171 builtin/remote.c:1687 +#: 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:193 builtin/remote.c:1718 +#: builtin/bundle.c:193 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" @@ -11473,7 +11460,7 @@ msgstr "läs filnamn från standard in" msgid "terminate input and output records by a NUL character" msgstr "avsluta in- och utdataposter med NUL-tecken" -#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538 +#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541 #: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -11527,54 +11514,54 @@ msgstr "kunde inte tolka kontakt: %s" msgid "no contacts specified" msgstr "inga kontakter angavs" -#: builtin/checkout-index.c:131 +#: builtin/checkout-index.c:139 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<flaggor>] [--] [<fil>...]" -#: builtin/checkout-index.c:148 +#: builtin/checkout-index.c:156 msgid "stage should be between 1 and 3 or all" msgstr "etapp måste vara mellan 1 och 3 eller \"all\"" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:173 msgid "check out all files in the index" msgstr "checka ut alla filer i indexet" -#: builtin/checkout-index.c:165 +#: builtin/checkout-index.c:174 msgid "force overwrite of existing files" msgstr "tvinga överskrivning av befintliga filer" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:176 msgid "no warning for existing files and files not in index" msgstr "ingen varning för existerande filer och filer ej i indexet" -#: builtin/checkout-index.c:169 +#: builtin/checkout-index.c:178 msgid "don't checkout new files" msgstr "checka inte ut nya filer" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:180 msgid "update stat information in the index file" msgstr "uppdatera stat-information i indexfilen" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:184 msgid "read list of paths from the standard input" msgstr "läs listan över sökvägar från standard in" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:186 msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" -#: builtin/checkout-index.c:178 builtin/column.c:31 +#: builtin/checkout-index.c:187 builtin/column.c:31 #: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 #: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 -#: builtin/worktree.c:754 +#: builtin/worktree.c:757 msgid "string" msgstr "sträng" -#: builtin/checkout-index.c:179 +#: builtin/checkout-index.c:188 msgid "when creating files, prepend <string>" msgstr "när filer skapas, lägg till <sträng> först" -#: builtin/checkout-index.c:181 +#: builtin/checkout-index.c:190 msgid "copy out the files from named stage" msgstr "kopiera ut filer från namngiven etapp" @@ -11676,16 +11663,16 @@ msgstr "\"%s\" måste användas när \"%s\" inte anges" msgid "'%s' or '%s' cannot be used with %s" msgstr "\"%s\" eller \"%s\" kan inte användas med %s" -#: builtin/checkout.c:528 builtin/checkout.c:535 +#: builtin/checkout.c:541 builtin/checkout.c:548 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:703 +#: builtin/checkout.c:716 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:757 +#: builtin/checkout.c:770 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11694,50 +11681,50 @@ msgstr "" "kan inte fortsätta med köade ändringar i följande filer:\n" "%s" -#: builtin/checkout.c:853 +#: builtin/checkout.c:866 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:895 +#: builtin/checkout.c:908 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:899 builtin/clone.c:720 +#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:903 +#: builtin/checkout.c:916 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:906 +#: builtin/checkout.c:919 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:910 +#: builtin/checkout.c:923 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:912 builtin/checkout.c:1338 +#: builtin/checkout.c:925 builtin/checkout.c:1356 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:914 +#: builtin/checkout.c:927 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:965 +#: builtin/checkout.c:978 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:971 +#: builtin/checkout.c:984 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11760,7 +11747,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:990 +#: builtin/checkout.c:1003 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11787,19 +11774,19 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:1025 +#: builtin/checkout.c:1038 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:1029 +#: builtin/checkout.c:1042 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:1069 builtin/checkout.c:1333 +#: builtin/checkout.c:1082 builtin/checkout.c:1351 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:1146 +#: builtin/checkout.c:1164 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11808,7 +11795,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:1153 +#: builtin/checkout.c:1171 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" @@ -11828,51 +11815,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:1163 +#: builtin/checkout.c:1181 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar" -#: builtin/checkout.c:1229 +#: builtin/checkout.c:1247 msgid "only one reference expected" msgstr "endast en referens förväntades" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1264 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510 +#: builtin/checkout.c:1310 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1305 builtin/checkout.c:1671 +#: builtin/checkout.c:1323 builtin/checkout.c:1689 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1370 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "förväntade gren, fick taggen \"%s\"" -#: builtin/checkout.c:1354 +#: builtin/checkout.c:1372 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "förväntade gren, fick fjärrgrenen \"%s\"" -#: builtin/checkout.c:1355 builtin/checkout.c:1363 +#: builtin/checkout.c:1373 builtin/checkout.c:1381 #, c-format msgid "a branch is expected, got '%s'" msgstr "förväntade gren, fick \"%s\"" -#: builtin/checkout.c:1358 +#: builtin/checkout.c:1376 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "förväntade gren, fick incheckningen \"%s\"" -#: builtin/checkout.c:1374 +#: builtin/checkout.c:1392 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11880,7 +11867,7 @@ msgstr "" "kan inte växla gren vid sammanslagning\n" "Överväg \"git merge --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1378 +#: builtin/checkout.c:1396 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11888,7 +11875,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:1382 +#: builtin/checkout.c:1400 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11896,7 +11883,7 @@ msgstr "" "kan inte växla gren vid ombasering\n" "Överväg \"git rebase --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1386 +#: builtin/checkout.c:1404 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11904,7 +11891,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:1390 +#: builtin/checkout.c:1408 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11912,146 +11899,146 @@ msgstr "" "kan inte växla gren i en \"revert\"\n" "Överväg \"git revert --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1394 +#: builtin/checkout.c:1412 msgid "you are switching branch while bisecting" msgstr "då växlar grenar medan du gör en \"bisect\"" -#: builtin/checkout.c:1401 +#: builtin/checkout.c:1419 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 +#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 -#: builtin/checkout.c:1427 builtin/checkout.c:1432 +#: builtin/checkout.c:1434 builtin/checkout.c:1437 builtin/checkout.c:1440 +#: builtin/checkout.c:1445 builtin/checkout.c:1450 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1429 +#: builtin/checkout.c:1447 #, c-format msgid "'%s' cannot take <start-point>" msgstr "\"%s\" kan inte ta <startpunkt>" -#: builtin/checkout.c:1437 +#: builtin/checkout.c:1455 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1444 +#: builtin/checkout.c:1462 msgid "missing branch or commit argument" msgstr "saknar gren- eller incheckingsargument" -#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84 -#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287 -#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551 -#: builtin/send-pack.c:192 +#: builtin/checkout.c:1504 builtin/clone.c:92 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:575 +#: builtin/send-pack.c:198 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/checkout.c:1487 +#: builtin/checkout.c:1505 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:1488 builtin/log.c:1795 parse-options.h:322 +#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322 msgid "style" msgstr "stil" -#: builtin/checkout.c:1489 +#: builtin/checkout.c:1507 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1501 builtin/worktree.c:558 +#: builtin/checkout.c:1519 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1502 +#: builtin/checkout.c:1520 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1504 +#: builtin/checkout.c:1522 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1524 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1524 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1508 builtin/merge.c:291 +#: builtin/checkout.c:1526 builtin/merge.c:300 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1511 +#: builtin/checkout.c:1529 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:1524 +#: builtin/checkout.c:1542 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1527 +#: builtin/checkout.c:1545 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1531 +#: builtin/checkout.c:1549 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1586 +#: builtin/checkout.c:1604 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1590 +#: builtin/checkout.c:1608 msgid "-p and --overlay are mutually exclusive" msgstr "-p och --overlay är ömsesidigt uteslutande" -#: builtin/checkout.c:1627 +#: builtin/checkout.c:1645 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1632 +#: builtin/checkout.c:1650 #, c-format msgid "missing branch name; try -%c" msgstr "grennamn saknas; försök med -%c" -#: builtin/checkout.c:1664 +#: builtin/checkout.c:1682 #, c-format msgid "could not resolve %s" msgstr "kunde inte upplösa %s" -#: builtin/checkout.c:1680 +#: builtin/checkout.c:1698 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1687 +#: builtin/checkout.c:1705 #, 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:1691 +#: builtin/checkout.c:1709 #, 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:1700 +#: builtin/checkout.c:1718 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file är inkompatibelt med --detach" -#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 +#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file är inkompatibelt med --patch" -#: builtin/checkout.c:1716 +#: builtin/checkout.c:1734 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12059,70 +12046,70 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/checkout.c:1721 +#: builtin/checkout.c:1739 msgid "you must specify path(s) to restore" msgstr "du måste ange katalog(er) att återställa" -#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798 -#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816 +#: builtin/checkout.c:1818 builtin/clone.c:122 builtin/remote.c:170 #: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 #: builtin/worktree.c:556 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1748 +#: builtin/checkout.c:1766 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1750 +#: builtin/checkout.c:1768 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1751 +#: builtin/checkout.c:1769 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1753 +#: builtin/checkout.c:1771 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "förutspå \"git checkout <gren-saknas>\" (förval)" -#: builtin/checkout.c:1754 +#: builtin/checkout.c:1772 msgid "use overlay mode (default)" msgstr "använd överläggsläge (standard)" -#: builtin/checkout.c:1799 +#: builtin/checkout.c:1817 msgid "create and switch to a new branch" msgstr "skapa och växla till en ny gren" -#: builtin/checkout.c:1801 +#: builtin/checkout.c:1819 msgid "create/reset and switch to a branch" msgstr "skapa/nollställ och växla till en gren" -#: builtin/checkout.c:1803 +#: builtin/checkout.c:1821 msgid "second guess 'git switch <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1805 +#: builtin/checkout.c:1823 msgid "throw away local modifications" msgstr "kasta bort lokala ändringar" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1857 msgid "which tree-ish to checkout from" msgstr "vilken träd-igt att checka ut från" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1859 msgid "restore the index" msgstr "återställ indexet" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1861 msgid "restore the working tree (default)" msgstr "återställ arbetskatalogen (förval)" -#: builtin/checkout.c:1845 +#: builtin/checkout.c:1863 msgid "ignore unmerged entries" msgstr "ignorera ej sammanslagna poster" -#: builtin/checkout.c:1846 +#: builtin/checkout.c:1864 msgid "use overlay mode" msgstr "använd överläggsläge" @@ -12163,7 +12150,7 @@ msgstr "misslyckades ta bort %s" msgid "could not lstat %s\n" msgstr "kunde inte ta status (\"lstat\") på %s\n" -#: builtin/clean.c:302 git-add--interactive.perl:595 +#: builtin/clean.c:302 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12176,7 +12163,7 @@ msgstr "" "foo - markera post baserad på unikt prefix\n" " - (tomt) markera ingenting\n" -#: builtin/clean.c:306 git-add--interactive.perl:604 +#: builtin/clean.c:306 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12197,8 +12184,8 @@ msgstr "" "* - välj alla poster\n" " - (tomt) avsluta markering\n" -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 +#: builtin/clean.c:521 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Vadå (%s)?\n" @@ -12268,7 +12255,7 @@ msgid "remove whole directories" msgstr "ta bort hela kataloger" #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183 +#: builtin/grep.c:921 builtin/log.c:183 builtin/log.c:185 #: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" @@ -12310,164 +12297,164 @@ msgstr "-x och -X kan inte användas samtidigt" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553 +#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:553 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:100 +#: builtin/clone.c:101 msgid "to clone from a local repository" msgstr "för att klona från ett lokalt arkiv" -#: builtin/clone.c:102 +#: builtin/clone.c:103 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hårda länkar, kopiera alltid" -#: builtin/clone.c:104 +#: builtin/clone.c:105 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "pathspec" msgstr "sökvägsangivelse" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:110 +#: builtin/clone.c:111 msgid "number of submodules cloned in parallel" msgstr "antal undermoduler som klonas parallellt" -#: builtin/clone.c:111 builtin/init-db.c:550 +#: builtin/clone.c:112 builtin/init-db.c:550 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:112 builtin/init-db.c:551 +#: builtin/clone.c:113 builtin/init-db.c:551 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831 +#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831 #: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/clone.c:119 builtin/submodule--helper.c:1833 #: builtin/submodule--helper.c:2338 msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" -#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 +#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:561 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358 msgid "name" msgstr "namn" -#: builtin/clone.c:120 +#: builtin/clone.c:121 msgid "use <name> instead of 'origin' to track upstream" msgstr "använd <namn> istället för \"origin\" för att spåra uppströms" -#: builtin/clone.c:122 +#: builtin/clone.c:123 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checka ut <gren> istället för fjärrens HEAD" -#: builtin/clone.c:124 +#: builtin/clone.c:125 msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849 +#: builtin/clone.c:126 builtin/fetch.c:173 builtin/grep.c:860 #: builtin/pull.c:208 msgid "depth" msgstr "djup" -#: builtin/clone.c:126 +#: builtin/clone.c:127 msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/clone.c:128 builtin/fetch.c:175 builtin/pack-objects.c:3535 #: builtin/pull.c:211 msgid "time" msgstr "tid" -#: builtin/clone.c:128 +#: builtin/clone.c:129 msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon från en angiven tidpunkt" -#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 +#: builtin/clone.c:130 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317 msgid "revision" msgstr "revision" -#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 +#: builtin/clone.c:131 builtin/fetch.c:178 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" -#: builtin/clone.c:132 builtin/submodule--helper.c:1843 +#: builtin/clone.c:133 builtin/submodule--helper.c:1843 #: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:134 +#: builtin/clone.c:135 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "klona inga taggar och gör att senare hämtningar inte följer dem" -#: builtin/clone.c:136 +#: builtin/clone.c:137 msgid "any cloned submodules will be shallow" msgstr "klonade undermoduler kommer vara grunda" -#: builtin/clone.c:137 builtin/init-db.c:559 +#: builtin/clone.c:138 builtin/init-db.c:559 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:138 builtin/init-db.c:560 +#: builtin/clone.c:139 builtin/init-db.c:560 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" -#: builtin/clone.c:139 +#: builtin/clone.c:140 msgid "key=value" msgstr "nyckel=värde" -#: builtin/clone.c:140 +#: builtin/clone.c:141 msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 -#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190 +#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 msgid "server-specific" msgstr "serverspecifik" -#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 -#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191 +#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 msgid "option to transmit" msgstr "" "inget att checka in\n" "flagga att sända" -#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 -#: builtin/push.c:561 +#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:585 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 -#: builtin/push.c:563 +#: builtin/clone.c:146 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:587 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" -#: builtin/clone.c:149 +#: builtin/clone.c:150 msgid "any cloned submodules will use their remote-tracking branch" msgstr "klonade undermoduler kommer använda sin fjärrspårningsgren" -#: builtin/clone.c:151 +#: builtin/clone.c:152 msgid "initialize sparse-checkout file to include only files at root" msgstr "initiera sparse-checkout-filen till att bara inkludera filer i roten" -#: builtin/clone.c:287 +#: builtin/clone.c:288 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12475,42 +12462,42 @@ msgstr "" "Kunde inte gissa katalognamn.\n" "Ange en katalog på kommandoraden" -#: builtin/clone.c:340 +#: builtin/clone.c:341 #, 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:413 +#: builtin/clone.c:414 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:431 +#: builtin/clone.c:432 #, c-format msgid "failed to start iterator over '%s'" msgstr "misslyckades starta iterator över \"%s\"" -#: builtin/clone.c:462 +#: builtin/clone.c:463 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:466 +#: builtin/clone.c:467 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:471 +#: builtin/clone.c:472 #, c-format msgid "failed to iterate over '%s'" msgstr "misslyckades iterera över \"%s\"" -#: builtin/clone.c:498 +#: builtin/clone.c:499 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:512 +#: builtin/clone.c:513 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12520,142 +12507,147 @@ msgstr "" "Du kan inspektera det som checkades ut med \"git status\"\n" "och försöka med \"git restore -source=HEAD :/\"\n" -#: builtin/clone.c:589 +#: builtin/clone.c:590 #, 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:708 +#: builtin/clone.c:709 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:756 +#: builtin/clone.c:757 msgid "failed to initialize sparse-checkout" msgstr "misslyckades initiera sparse-checkout" -#: builtin/clone.c:779 +#: builtin/clone.c:780 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:811 +#: builtin/clone.c:812 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:868 +#: builtin/clone.c:887 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:931 +#: builtin/clone.c:950 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:933 +#: builtin/clone.c:952 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:970 builtin/receive-pack.c:2434 +#: builtin/clone.c:992 builtin/receive-pack.c:2493 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:974 +#: builtin/clone.c:996 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:987 +#: builtin/clone.c:1009 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:990 +#: builtin/clone.c:1012 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:1006 +#: builtin/clone.c:1025 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:1010 builtin/fetch.c:1841 +#: builtin/clone.c:1029 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:1020 +#: builtin/clone.c:1039 #, 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:1026 +#: builtin/clone.c:1045 #, 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:1040 +#: builtin/clone.c:1059 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 -#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 +#: builtin/clone.c:1074 builtin/clone.c:1095 builtin/difftool.c:271 +#: builtin/log.c:1987 builtin/worktree.c:354 builtin/worktree.c:386 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:1060 +#: builtin/clone.c:1079 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:1080 +#: builtin/clone.c:1099 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:1082 +#: builtin/clone.c:1101 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:1106 +#: builtin/clone.c:1125 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:1170 +#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" + +#: builtin/clone.c:1210 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1172 +#: builtin/clone.c:1212 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:1174 +#: builtin/clone.c:1214 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:1176 +#: builtin/clone.c:1216 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1179 +#: builtin/clone.c:1219 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1184 +#: builtin/clone.c:1224 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1268 builtin/clone.c:1276 +#: builtin/clone.c:1308 builtin/clone.c:1316 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1279 +#: builtin/clone.c:1319 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -12713,7 +12705,7 @@ 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:184 builtin/log.c:1764 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1769 msgid "dir" msgstr "kat" @@ -12808,7 +12800,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "duplicerad förälder %s ignorerades" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555 #, c-format msgid "not a valid object name %s" msgstr "objektnamnet är inte giltigt: %s" @@ -12836,8 +12828,8 @@ msgstr "förälder" msgid "id of a parent commit object" msgstr "id på ett förälderincheckningsobjekt" -#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:281 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470 #: builtin/tag.c:413 msgid "message" msgstr "meddelande" @@ -12850,7 +12842,7 @@ msgstr "incheckningsmeddelande" msgid "read commit log message from file" msgstr "läs incheckningsloggmeddelande från fil" -#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:298 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG-signera incheckning" @@ -13004,7 +12996,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:729 builtin/shortlog.c:478 +#: builtin/commit.c:729 builtin/shortlog.c:425 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" @@ -13111,7 +13103,7 @@ msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -"--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare" +"--author '%s' är inte 'Namn <epost>' och motsvarar ingen befintlig författare" #: builtin/commit.c:1069 #, c-format @@ -13193,8 +13185,8 @@ msgstr "beräkna fullständiga före-/efter-värden" msgid "version" msgstr "version" -#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 -#: builtin/worktree.c:722 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 +#: builtin/worktree.c:725 msgid "machine-readable output" msgstr "maskinläsbar utdata" @@ -13208,7 +13200,7 @@ msgstr "terminera poster med NUL" #: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 #: builtin/fast-export.c:1199 builtin/fast-export.c:1202 -#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336 +#: builtin/fast-export.c:1205 builtin/rebase.c:1406 parse-options.h:336 msgid "mode" msgstr "läge" @@ -13264,7 +13256,7 @@ msgstr "visa diff i mallen för incheckningsmeddelandet" msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 +#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415 msgid "read message from file" msgstr "läs meddelande från fil" @@ -13276,7 +13268,7 @@ msgstr "författare" msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1503 builtin/gc.c:539 +#: builtin/commit.c:1503 builtin/gc.c:542 msgid "date" msgstr "datum" @@ -13312,10 +13304,10 @@ msgstr "" 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:1510 builtin/log.c:1741 builtin/merge.c:292 +#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301 #: builtin/pull.c:145 builtin/revert.c:110 -msgid "add Signed-off-by:" -msgstr "lägg till Signed-off-by:" +msgid "add a Signed-off-by trailer" +msgstr "lägg till Signed-off-by-släprad" #: builtin/commit.c:1511 msgid "use specified template file" @@ -13416,215 +13408,219 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<flaggor>]" -#: builtin/config.c:107 builtin/env--helper.c:27 +#: builtin/config.c:109 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" msgstr "okänt argument för --type, %s" -#: builtin/config.c:119 +#: builtin/config.c:121 msgid "only one type at a time" msgstr "endast en typ åt gången" -#: builtin/config.c:128 +#: builtin/config.c:130 msgid "Config file location" msgstr "Konfigurationsfilens plats" -#: builtin/config.c:129 +#: builtin/config.c:131 msgid "use global config file" msgstr "använd global konfigurationsfil" -#: builtin/config.c:130 +#: builtin/config.c:132 msgid "use system config file" msgstr "använd systemets konfigurationsfil" -#: builtin/config.c:131 +#: builtin/config.c:133 msgid "use repository config file" msgstr "använd arkivets konfigurationsfil" -#: builtin/config.c:132 +#: builtin/config.c:134 msgid "use per-worktree config file" msgstr "använd arbetskatalogens konfigurationsfil" -#: builtin/config.c:133 +#: builtin/config.c:135 msgid "use given config file" msgstr "använd angiven konfigurationsfil" -#: builtin/config.c:134 +#: builtin/config.c:136 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:134 +#: builtin/config.c:136 msgid "read config from given blob object" msgstr "läs konfiguration från givet blob-objekt" -#: builtin/config.c:135 +#: builtin/config.c:137 msgid "Action" msgstr "Åtgärd" -#: builtin/config.c:136 -msgid "get value: name [value-regex]" -msgstr "hämta värde: namn [värde-reguttr]" - -#: builtin/config.c:137 -msgid "get all values: key [value-regex]" -msgstr "hämta alla värden: nyckel [värde-reguttr]" - #: builtin/config.c:138 -msgid "get values for regexp: name-regex [value-regex]" -msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]" +msgid "get value: name [value-pattern]" +msgstr "hämta värde: namn [värde-mönster]" #: builtin/config.c:139 -msgid "get value specific for the URL: section[.var] URL" -msgstr "hämta värde specifikt URL:en: sektion[.var] URL" +msgid "get all values: key [value-pattern]" +msgstr "hämta alla värden: nyckel [värde-mönster]" #: builtin/config.c:140 -msgid "replace all matching variables: name value [value_regex]" -msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]" +msgid "get values for regexp: name-regex [value-pattern]" +msgstr "hämta värden för reguttr: namn-reguttr [värde-mönster]" #: builtin/config.c:141 -msgid "add a new variable: name value" -msgstr "lägg till en ny variabel: namn värde" +msgid "get value specific for the URL: section[.var] URL" +msgstr "hämta värde specifikt URL:en: sektion[.var] URL" #: builtin/config.c:142 -msgid "remove a variable: name [value-regex]" -msgstr "ta bort en variabel: namn [värde-reguttr]" +msgid "replace all matching variables: name value [value-pattern]" +msgstr "ersätt alla motsvarande variabler: namn värde [värde-mönster]" #: builtin/config.c:143 -msgid "remove all matches: name [value-regex]" -msgstr "ta bort alla träffar: namn [värde-reguttr]" +msgid "add a new variable: name value" +msgstr "lägg till en ny variabel: namn värde" #: builtin/config.c:144 +msgid "remove a variable: name [value-pattern]" +msgstr "ta bort en variabel: namn [värde-mönster]" + +#: builtin/config.c:145 +msgid "remove all matches: name [value-pattern]" +msgstr "ta bort alla träffar: namn [värde-mönster]" + +#: builtin/config.c:146 msgid "rename section: old-name new-name" msgstr "byt namn på sektion: gammalt-namn nytt-namn" -#: builtin/config.c:145 +#: builtin/config.c:147 msgid "remove a section: name" msgstr "ta bort en sektion: namn" -#: builtin/config.c:146 +#: builtin/config.c:148 msgid "list all" msgstr "visa alla" -#: builtin/config.c:147 +#: builtin/config.c:149 +msgid "use string equality when comparing values to 'value-pattern'" +msgstr "använd stränglikhet vid när värden jämförs med \"värde-mönster\"" + +#: builtin/config.c:150 msgid "open an editor" msgstr "öppna textredigeringsprogram" -#: builtin/config.c:148 +#: builtin/config.c:151 msgid "find the color configured: slot [default]" msgstr "hitta den inställda färgen: slot [default]" -#: builtin/config.c:149 +#: builtin/config.c:152 msgid "find the color setting: slot [stdout-is-tty]" msgstr "hitta färginställningen: slot [stdout-is-tty]" -#: builtin/config.c:150 +#: builtin/config.c:153 msgid "Type" msgstr "Typ" -#: builtin/config.c:151 builtin/env--helper.c:43 +#: builtin/config.c:154 builtin/env--helper.c:43 msgid "value is given this type" msgstr "värdet har givits denna typ" -#: builtin/config.c:152 +#: builtin/config.c:155 msgid "value is \"true\" or \"false\"" msgstr "värdet är \"true\" eller \"false\"" -#: builtin/config.c:153 +#: builtin/config.c:156 msgid "value is decimal number" msgstr "värdet är ett decimalt tal" -#: builtin/config.c:154 +#: builtin/config.c:157 msgid "value is --bool or --int" msgstr "värdet är --bool eller --int" -#: builtin/config.c:155 +#: builtin/config.c:158 msgid "value is --bool or string" msgstr "värdet är --bool eller sträng" -#: builtin/config.c:156 +#: builtin/config.c:159 msgid "value is a path (file or directory name)" msgstr "värdet är en sökväg (fil- eller katalognamn)" -#: builtin/config.c:157 +#: builtin/config.c:160 msgid "value is an expiry date" msgstr "värdet är ett utgångsdatum" -#: builtin/config.c:158 +#: builtin/config.c:161 msgid "Other" msgstr "Andra" -#: builtin/config.c:159 +#: builtin/config.c:162 msgid "terminate values with NUL byte" msgstr "terminera värden med NUL-byte" -#: builtin/config.c:160 +#: builtin/config.c:163 msgid "show variable names only" msgstr "visa endast variabelnamn" -#: builtin/config.c:161 +#: builtin/config.c:164 msgid "respect include directives on lookup" msgstr "respektera inkluderingsdirektiv vid uppslag" -#: builtin/config.c:162 +#: builtin/config.c:165 msgid "show origin of config (file, standard input, blob, command line)" msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)" -#: builtin/config.c:163 +#: builtin/config.c:166 msgid "show scope of config (worktree, local, global, system, command)" msgstr "" "visa omfång för konfiguration (arbetskatalog, lokalt, globalt, system, " "kommando)" -#: builtin/config.c:164 builtin/env--helper.c:45 +#: builtin/config.c:167 builtin/env--helper.c:45 msgid "value" msgstr "värde" -#: builtin/config.c:164 +#: builtin/config.c:167 msgid "with --get, use default value when missing entry" msgstr "med --get, använd standardvärde vid saknad post" -#: builtin/config.c:178 +#: builtin/config.c:181 #, c-format msgid "wrong number of arguments, should be %d" msgstr "fel antal argument, skulle vara %d" -#: builtin/config.c:180 +#: builtin/config.c:183 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "fel antal argument, skulle vara från %d till %d" -#: builtin/config.c:334 +#: builtin/config.c:339 #, c-format msgid "invalid key pattern: %s" msgstr "felaktigt nyckelmönster: %s" -#: builtin/config.c:370 +#: builtin/config.c:377 #, c-format msgid "failed to format default config value: %s" msgstr "misslyckades formatera standardkonfigurationsvärde: %s" -#: builtin/config.c:434 +#: builtin/config.c:441 #, c-format msgid "cannot parse color '%s'" msgstr "kan inte tolka färgen \"%s\"" -#: builtin/config.c:476 +#: builtin/config.c:483 msgid "unable to parse default color value" msgstr "kan inte tolka standardfärgvärde" -#: builtin/config.c:529 builtin/config.c:789 +#: builtin/config.c:536 builtin/config.c:833 msgid "not in a git directory" msgstr "inte i en git-katalog" -#: builtin/config.c:532 +#: builtin/config.c:539 msgid "writing to stdin is not supported" msgstr "skriva till standard in stöds inte" -#: builtin/config.c:535 +#: builtin/config.c:542 msgid "writing config blobs is not supported" msgstr "skriva konfigurations-blobbar stöds inte" -#: builtin/config.c:620 +#: builtin/config.c:627 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -13639,27 +13635,27 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:644 +#: builtin/config.c:652 msgid "only one config file at a time" msgstr "endast en konfigurationsfil åt gången" -#: builtin/config.c:650 +#: builtin/config.c:658 msgid "--local can only be used inside a git repository" msgstr "--local kan bara användas inuti ett git-arkiv" -#: builtin/config.c:652 +#: builtin/config.c:660 msgid "--blob can only be used inside a git repository" msgstr "--blob kan bara användas inuti ett git-arkiv" -#: builtin/config.c:654 +#: builtin/config.c:662 msgid "--worktree can only be used inside a git repository" msgstr "--worktree kan bara användas inuti ett git-arkiv" -#: builtin/config.c:676 +#: builtin/config.c:684 msgid "$HOME not set" msgstr "$HOME inte satt" -#: builtin/config.c:700 +#: builtin/config.c:708 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -13669,52 +13665,56 @@ msgstr "" "konfigurationsutöknignen worktreeConfig har aktiverats. Läsa stycket\n" "\"KONFIGURATIONSFIL\" i \"git help worktree\" för detaljer" -#: builtin/config.c:735 +#: builtin/config.c:743 msgid "--get-color and variable type are incoherent" msgstr "--get-color och variabeltyp stämmer inte överens" -#: builtin/config.c:740 +#: builtin/config.c:748 msgid "only one action at a time" msgstr "endast en åtgärd åt gången" -#: builtin/config.c:753 +#: builtin/config.c:761 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only gäller bara för --list eller --get-regexp" -#: builtin/config.c:759 +#: builtin/config.c:767 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "" "--show-origin gäller bara för --get, --get-all, --get-regexp och --list" -#: builtin/config.c:765 +#: builtin/config.c:773 msgid "--default is only applicable to --get" msgstr "--default gäller bara för --get" -#: builtin/config.c:778 +#: builtin/config.c:806 +msgid "--fixed-value only applies with 'value-pattern'" +msgstr "--fixed-value gäller endast med \"värde-mönster\"" + +#: builtin/config.c:822 #, c-format msgid "unable to read config file '%s'" msgstr "kan inte konfigurationsfil \"%s\"" -#: builtin/config.c:781 +#: builtin/config.c:825 msgid "error processing config file(s)" msgstr "fel vid hantering av konfigurationsfil(er)" -#: builtin/config.c:791 +#: builtin/config.c:835 msgid "editing stdin is not supported" msgstr "redigering av standard in stöds ej" -#: builtin/config.c:793 +#: builtin/config.c:837 msgid "editing blobs is not supported" msgstr "redigering av blobbar stöds ej" -#: builtin/config.c:807 +#: builtin/config.c:851 #, c-format msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%s\"" -#: builtin/config.c:820 +#: builtin/config.c:864 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -13723,7 +13723,7 @@ msgstr "" "kan inte skriva över flera värden med ett ensamt värde\n" " Använd en regexp, --add eller --replace-all för att ändra %s." -#: builtin/config.c:894 builtin/config.c:905 +#: builtin/config.c:943 builtin/config.c:954 #, c-format msgid "no such section: %s" msgstr "ingen sådan sektion: %s" @@ -13762,6 +13762,11 @@ msgstr "" msgid "credential-cache unavailable; no unix socket support" msgstr "\"credential-cache\" ej tillgänglig; stöd för unix-uttag saknas" +#: builtin/credential-store.c:66 +#, c-format +msgid "unable to get credential storage lock in %d ms" +msgstr "kunde inte erhålla låset för lagring av inlogginsuppgifter på %d ms" + #: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<flaggor>] [<incheckning-igt>...]" @@ -13927,41 +13932,49 @@ 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" +#: builtin/diff-tree.c:155 +msgid "--stdin and --merge-base are mutually exclusive" +msgstr "--stdin och --merge-base är ömsesidigt uteslutande" + +#: builtin/diff-tree.c:157 +msgid "--merge-base only works with two commits" +msgstr "--merge-base fungerar endast med två incheckningar" + #: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "\"%s\": inte en normal fil eller symbolisk länk" -#: builtin/diff.c:241 +#: builtin/diff.c:258 #, c-format msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:375 #, c-format msgid "%s...%s: no merge base" msgstr "%s...%s: ingen sammanslagningsbas" -#: builtin/diff.c:468 +#: builtin/diff.c:485 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:513 +#: builtin/diff.c:530 builtin/grep.c:681 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:524 +#: builtin/diff.c:541 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:529 +#: builtin/diff.c:546 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." -#: builtin/diff.c:563 +#: builtin/diff.c:580 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s: flera sammanslagningsbaser, använder %s" @@ -13991,7 +14004,7 @@ msgstr "kunde inte läsa symbolisk länk-fil %s" 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:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -13999,53 +14012,53 @@ msgstr "" "kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n" "katalogdiffläge (\"-d\" och \"--dir-diff\")." -#: builtin/difftool.c:634 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "bägge filerna ändrade: \"%s\" och \"%s\"." -#: builtin/difftool.c:636 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "filen i arbetskatalogen lämnades kvar." -#: builtin/difftool.c:647 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "temporära filer finns i \"%s\"." -#: builtin/difftool.c:648 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "du kanske vill städa eller rädda dem." -#: builtin/difftool.c:697 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "använd \"diff.guitool\" istället för \"diff.tool\"" -#: builtin/difftool.c:699 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "utför diff för hela katalogen" -#: builtin/difftool.c:701 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "fråga inte vid start av diff-verktyg" -#: builtin/difftool.c:706 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "använd symboliska länkar i katalogdiffläge" -#: builtin/difftool.c:707 +#: builtin/difftool.c:706 msgid "tool" msgstr "verktyg" -#: builtin/difftool.c:708 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "använd angivet diff-verktyg" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 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:713 +#: builtin/difftool.c:712 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -14053,31 +14066,31 @@ msgstr "" "låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde " "skilt från noll" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "ange eget kommando för att visa diffar" -#: builtin/difftool.c:717 +#: builtin/difftool.c:716 msgid "passed to `diff`" msgstr "sändes till \"diff\"" -#: builtin/difftool.c:732 +#: builtin/difftool.c:731 msgid "difftool requires worktree or --no-index" msgstr "difftool kräver en arbetskatalog eller --no-index" -#: builtin/difftool.c:739 +#: builtin/difftool.c:738 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff är inkompatibelt med --no-index" -#: builtin/difftool.c:742 +#: builtin/difftool.c:741 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande" -#: builtin/difftool.c:750 +#: builtin/difftool.c:749 msgid "no <tool> given for --tool=<tool>" msgstr "inget <verktyg> angavs för --tool=<verktyg>" -#: builtin/difftool.c:757 +#: builtin/difftool.c:756 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "inget <kommando> angavs för --extcmd=<kommando>" @@ -14169,7 +14182,7 @@ msgstr "Använd done-funktionen för att avsluta strömmen" msgid "Skip output of blob data" msgstr "Hoppa över skrivning av blob-data" -#: builtin/fast-export.c:1223 builtin/log.c:1811 +#: builtin/fast-export.c:1223 builtin/log.c:1816 msgid "refspec" msgstr "referensspecifikation" @@ -14209,31 +14222,31 @@ 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" -#: builtin/fast-import.c:3086 +#: builtin/fast-import.c:3088 #, c-format msgid "Missing from marks for submodule '%s'" msgstr "Saknar från-märken för undermodulen \"%s\"" -#: builtin/fast-import.c:3088 +#: builtin/fast-import.c:3090 #, c-format msgid "Missing to marks for submodule '%s'" msgstr "Saknar till-märken för undermodulen \"%s\"" -#: builtin/fast-import.c:3223 +#: builtin/fast-import.c:3225 #, c-format msgid "Expected 'mark' command, got %s" msgstr "Förväntade \"mark\"-kommando, fick %s" -#: builtin/fast-import.c:3228 +#: builtin/fast-import.c:3230 #, c-format msgid "Expected 'to' command, got %s" msgstr "Förväntade \"to\"-kommando, fick %s" -#: builtin/fast-import.c:3320 +#: builtin/fast-import.c:3322 msgid "Expected format name:filename for submodule rewrite option" msgstr "Förvändae formatet namn:filnamn för undermodul-omskrivningsflaggan" -#: builtin/fast-import.c:3374 +#: builtin/fast-import.c:3377 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "funktionen \"%s\" förbjuden i indata utan --allow-unsafe-features" @@ -14506,7 +14519,7 @@ msgstr " (%s har blivit dinglande)" msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:1195 builtin/remote.c:1113 +#: builtin/fetch.c:1195 builtin/remote.c:1118 msgid "(none)" msgstr "(ingen)" @@ -14709,6 +14722,22 @@ msgstr "visa endast referenser som innehåller incheckningen" msgid "print only refs which don't contain the commit" msgstr "visa endast referenser som inte innehåller incheckningen" +#: builtin/for-each-repo.c:9 +msgid "git for-each-repo --config=<config> <command-args>" +msgstr "git for-each-repo --config=<konfig> <kommandoargument>" + +#: builtin/for-each-repo.c:37 +msgid "config" +msgstr "konfig" + +#: builtin/for-each-repo.c:38 +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 +msgid "missing --config=<config>" +msgstr "saknar --config=<konfig>" + #: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 msgid "unknown" msgstr "okänd" @@ -14956,31 +14985,31 @@ msgstr "%s: objekt saknas" msgid "invalid parameter: expected sha1, got '%s'" msgstr "ogiltig parameter: förväntade sha1, fick \"%s\"" -#: builtin/gc.c:36 +#: builtin/gc.c:39 msgid "git gc [<options>]" msgstr "git gc [<flaggor>]" -#: builtin/gc.c:91 +#: builtin/gc.c:94 #, c-format msgid "Failed to fstat %s: %s" msgstr "Misslyckades ta status (fstat) på %s: %s" -#: builtin/gc.c:127 +#: builtin/gc.c:130 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "misslyckades tolka \"%s\" värde \"%s\"" -#: builtin/gc.c:476 builtin/init-db.c:58 +#: builtin/gc.c:479 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530 +#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/gc.c:492 +#: builtin/gc.c:495 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -14995,52 +15024,52 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:540 +#: builtin/gc.c:543 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:542 +#: builtin/gc.c:545 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:543 +#: builtin/gc.c:546 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:546 +#: builtin/gc.c:549 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:549 +#: builtin/gc.c:552 msgid "repack all other packs except the largest pack" msgstr "packa om alla paket förutom det största paketet" -#: builtin/gc.c:566 +#: builtin/gc.c:569 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "kunde inte tolka värdet %s för gc.logexpiry" -#: builtin/gc.c:577 +#: builtin/gc.c:580 #, c-format msgid "failed to parse prune expiry value %s" msgstr "kunde inte tolka värdet %s för prune expiry" -#: builtin/gc.c:597 +#: builtin/gc.c:600 #, 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:599 +#: builtin/gc.c:602 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:600 +#: builtin/gc.c:603 #, 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:640 +#: builtin/gc.c:643 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -15048,62 +15077,145 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:695 +#: builtin/gc.c:698 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:705 -msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]" -msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=<uppgift>]" +#: builtin/gc.c:708 +msgid "" +"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" +msgstr "" +"git maintenance run [--auto] [--[no-]quiet] [--task=<uppgift>] [--schedule]" + +#: builtin/gc.c:738 +msgid "--no-schedule is not allowed" +msgstr "--no-schedule tillåts inte" + +#: builtin/gc.c:743 +#, c-format +msgid "unrecognized --schedule argument '%s'" +msgstr "okänt argument för --schedule, %s" -#: builtin/gc.c:812 +#: builtin/gc.c:862 msgid "failed to write commit-graph" msgstr "kunde inte skriva incheckningsgraf" -#: builtin/gc.c:905 +#: builtin/gc.c:901 +msgid "failed to fill remotes" +msgstr "kunde inte fylla fjärrar" + +#: builtin/gc.c:1024 +msgid "failed to start 'git pack-objects' process" +msgstr "kunde inte starta \"git pack-objects\"-process" + +#: builtin/gc.c:1041 +msgid "failed to finish 'git pack-objects' process" +msgstr "kunde inte avsluta \"git pack-objects\"-process" + +#: builtin/gc.c:1093 +msgid "failed to write multi-pack-index" +msgstr "kunde inte skriva multi-pack-index" + +#: builtin/gc.c:1111 +msgid "'git multi-pack-index expire' failed" +msgstr "\"git multi-pack-index expire\" misslyckades" + +#: builtin/gc.c:1172 +msgid "'git multi-pack-index repack' failed" +msgstr "\"git multi-pack-index repack\" misslyckades" + +#: builtin/gc.c:1181 +msgid "" +"skipping incremental-repack task because core.multiPackIndex is disabled" +msgstr "" +"hoppar över \"incremental-repack\"-uppgift eftersom core.multiPackIndex är " +"inaktiverat" + +#: builtin/gc.c:1279 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "låsfilen \"%s\" finns, hoppar över underhåll" -#: builtin/gc.c:932 +#: builtin/gc.c:1309 #, c-format msgid "task '%s' failed" msgstr "uppgiften \"%s\" misslyckades" -#: builtin/gc.c:979 +#: builtin/gc.c:1389 #, c-format msgid "'%s' is not a valid task" msgstr "\"%s\" är inte en giltig uppgift" -#: builtin/gc.c:984 +#: builtin/gc.c:1394 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "uppgiften \"%s\" kan inte väljas flera gånger" -#: builtin/gc.c:999 +#: builtin/gc.c:1409 msgid "run tasks based on the state of the repository" msgstr "kör uppgifter baserad på arkivets tillstånd" -#: builtin/gc.c:1001 +#: builtin/gc.c:1410 +msgid "frequency" +msgstr "frekvens" + +#: builtin/gc.c:1411 +msgid "run tasks based on frequency" +msgstr "kör uppgifter baserat på frekvens" + +#: builtin/gc.c:1414 msgid "do not report progress or other information over stderr" msgstr "rapportera inte framgång eller annan information över standard fel" -#: builtin/gc.c:1002 +#: builtin/gc.c:1415 msgid "task" msgstr "uppgift" -#: builtin/gc.c:1003 +#: builtin/gc.c:1416 msgid "run a specific task" msgstr "utför en specifik uppgift" -#: builtin/gc.c:1026 -msgid "git maintenance run [<options>]" -msgstr "git maintenance run [<flaggor>]" +#: builtin/gc.c:1433 +msgid "use at most one of --auto and --schedule=<frequency>" +msgstr "använd som mest en av --auto och --schedule=<frekvens>" + +#: builtin/gc.c:1467 +msgid "failed to run 'git config'" +msgstr "misslyckades köra \"git config\"" + +#: builtin/gc.c:1512 +msgid "another process is scheduling background maintenance" +msgstr "en annan process schemalägger bakgrundsunderhåll" + +#: builtin/gc.c:1525 +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:1544 +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:1550 +msgid "failed to open stdin of 'crontab'" +msgstr "misslyckades öppna standard in för \"crontab\"" + +#: builtin/gc.c:1592 +msgid "'crontab' died" +msgstr "\"crontab\" dog" + +#: builtin/gc.c:1605 +msgid "failed to add repo to global config" +msgstr "misslyckades lägga till arkiv till global konfiguration" -#: builtin/gc.c:1037 +#: builtin/gc.c:1615 +msgid "git maintenance <subcommand> [<options>]" +msgstr "git maintenance <underkommando> [<flaggor>]" + +#: builtin/gc.c:1634 #, c-format msgid "invalid subcommand: %s" msgstr "felaktigt underkommando: %s" @@ -15142,242 +15254,242 @@ msgstr "kunde inte läsa träd (%s)" msgid "unable to grep from object of type %s" msgstr "kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:725 +#: builtin/grep.c:736 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:824 +#: builtin/grep.c:835 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:826 +#: builtin/grep.c:837 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:828 +#: builtin/grep.c:839 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:830 +#: builtin/grep.c:841 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:832 +#: builtin/grep.c:843 msgid "recursively search in each submodule" msgstr "sök varje undermodul rekursivt" -#: builtin/grep.c:835 +#: builtin/grep.c:846 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:837 +#: builtin/grep.c:848 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:839 +#: builtin/grep.c:850 msgid "match patterns only at word boundaries" -msgstr "matcha endast mönster vid ordgränser" +msgstr "träffa endast mönster vid ordgränser" -#: builtin/grep.c:841 +#: builtin/grep.c:852 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:843 +#: builtin/grep.c:854 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:846 +#: builtin/grep.c:857 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:848 +#: builtin/grep.c:859 msgid "search in subdirectories (default)" msgstr "sök i underkataloger (standard)" -#: builtin/grep.c:850 +#: builtin/grep.c:861 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:854 +#: builtin/grep.c:865 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:857 +#: builtin/grep.c:868 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:860 +#: builtin/grep.c:871 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:863 +#: builtin/grep.c:874 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:866 +#: builtin/grep.c:877 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:867 +#: builtin/grep.c:878 msgid "show column number of first match" msgstr "visa kolumnnummer för första träff" -#: builtin/grep.c:868 +#: builtin/grep.c:879 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:869 +#: builtin/grep.c:880 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:871 +#: builtin/grep.c:882 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:873 +#: builtin/grep.c:884 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:875 +#: builtin/grep.c:886 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:878 +#: builtin/grep.c:889 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:880 +#: builtin/grep.c:891 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:883 +#: builtin/grep.c:894 msgid "show only matching parts of a line" msgstr "visa endast träffade delar av rader" -#: builtin/grep.c:885 +#: builtin/grep.c:896 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:886 +#: builtin/grep.c:897 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:888 +#: builtin/grep.c:899 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:890 +#: builtin/grep.c:901 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:893 +#: builtin/grep.c:904 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:896 +#: builtin/grep.c:907 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:898 +#: builtin/grep.c:909 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:900 +#: builtin/grep.c:911 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:901 +#: builtin/grep.c:912 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:904 +#: builtin/grep.c:915 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:906 +#: builtin/grep.c:917 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:909 +#: builtin/grep.c:920 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:911 +#: builtin/grep.c:922 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:913 +#: builtin/grep.c:924 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:925 +#: builtin/grep.c:936 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:927 +#: builtin/grep.c:938 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:929 +#: builtin/grep.c:940 msgid "show parse tree for grep expression" msgstr "visa analysträd för grep-uttryck" -#: builtin/grep.c:933 +#: builtin/grep.c:944 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:933 +#: builtin/grep.c:944 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:937 +#: builtin/grep.c:948 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:1004 +#: builtin/grep.c:1014 msgid "no pattern given" msgstr "inget mönster angavs" -#: builtin/grep.c:1040 +#: builtin/grep.c:1050 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index och --untracked kan inte användas med revisioner" -#: builtin/grep.c:1048 +#: builtin/grep.c:1058 #, c-format msgid "unable to resolve revision: %s" msgstr "kan inte slå upp revision: %s" -#: builtin/grep.c:1078 +#: builtin/grep.c:1088 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked stöds inte med --recurse-submodules" -#: builtin/grep.c:1082 +#: builtin/grep.c:1092 msgid "invalid option combination, ignoring --threads" msgstr "ogiltig kombination av flaggor, ignorerar --threads" -#: builtin/grep.c:1085 builtin/pack-objects.c:3655 +#: builtin/grep.c:1095 builtin/pack-objects.c:3655 msgid "no threads support, ignoring --threads" msgstr "trådstöd saknas, ignorerar --threads" -#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 +#: builtin/grep.c:1098 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:1122 +#: builtin/grep.c:1132 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1148 +#: builtin/grep.c:1158 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached och --untracked kan inte användas med --no-index" -#: builtin/grep.c:1154 +#: builtin/grep.c:1164 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:1162 +#: builtin/grep.c:1172 msgid "both --cached and trees are given" msgstr "både --cached och träd angavs" @@ -15570,7 +15682,7 @@ msgstr "paket för stort för nuvarande definition av off_t" msgid "pack exceeds maximum allowed size" msgstr "paket är större än tillåten maximal storlek" -#: builtin/index-pack.c:342 builtin/repack.c:254 +#: builtin/index-pack.c:342 builtin/repack.c:286 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" @@ -16037,126 +16149,130 @@ msgstr "--trailer med --only-input ger ingen mening" msgid "no input file given for in-place editing" msgstr "ingen indatafil angiven för redigering på plats" -#: builtin/log.c:56 +#: builtin/log.c:58 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" -#: builtin/log.c:57 +#: builtin/log.c:59 msgid "git show [<options>] <object>..." msgstr "git show [<flaggor>] <objekt>..." -#: builtin/log.c:110 +#: builtin/log.c:112 #, c-format msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:177 +#: builtin/log.c:179 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:178 +#: builtin/log.c:180 msgid "Use mail map file" msgstr "Använd e-postmappningsfil" -#: builtin/log.c:181 +#: builtin/log.c:183 msgid "only decorate refs that match <pattern>" msgstr "dekorera endast referenser som motsvarar <mönster>" -#: builtin/log.c:183 +#: builtin/log.c:185 msgid "do not decorate refs that match <pattern>" msgstr "dekorera inte referenser som motsvarar <mönster>" -#: builtin/log.c:184 +#: builtin/log.c:186 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:187 -msgid "Process line range n,m in file, counting from 1" -msgstr "Behandla radintervallet n,m i filen, med början på 1" +#: builtin/log.c:189 +msgid "" +"Trace the evolution of line range <start>,<end> or function :<funcname> in " +"<file>" +msgstr "" +"Spåra utvecklingen av intervallet <start>,<slut> eller funktionen :" +"<funknamn> i <fil>" + +#: builtin/log.c:212 +msgid "-L<range>:<file> cannot be used with pathspec" +msgstr "-L<intervall>:<fil> kan inte användas med sökvägsspecifikation" -#: builtin/log.c:297 +#: builtin/log.c:302 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:555 +#: builtin/log.c:564 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:570 builtin/log.c:665 +#: builtin/log.c:579 builtin/log.c:674 #, c-format msgid "could not read object %s" msgstr "kunde inte läsa objektet %s" -#: builtin/log.c:690 +#: builtin/log.c:699 #, c-format msgid "unknown type: %d" msgstr "okänd typ: %d" -#: builtin/log.c:839 +#: builtin/log.c:848 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s: ogiltigt omslag från beskrivningsläge" -#: builtin/log.c:846 +#: builtin/log.c:855 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:965 -msgid "name of output directory is too long" -msgstr "namnet på utdatakatalogen är för långt" - -#: builtin/log.c:981 +#: builtin/log.c:984 #, c-format msgid "cannot open patch file %s" msgstr "kan inte öppna patchfilen %s" -#: builtin/log.c:998 +#: builtin/log.c:1001 msgid "need exactly one range" msgstr "behöver precis ett intervall" -#: builtin/log.c:1008 +#: builtin/log.c:1011 msgid "not a range" msgstr "inte ett intervall" -#: builtin/log.c:1172 +#: builtin/log.c:1175 msgid "cover letter needs email format" msgstr "omslagsbrevet behöver e-postformat" -#: builtin/log.c:1178 +#: builtin/log.c:1181 msgid "failed to create cover-letter file" msgstr "misslyckades skapa fil för omslagsbrev" -#: builtin/log.c:1259 +#: builtin/log.c:1262 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1286 +#: builtin/log.c:1289 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1344 +#: builtin/log.c:1347 msgid "two output directories?" msgstr "två utdatakataloger?" -#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 +#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332 #, c-format msgid "unknown commit %s" msgstr "okänd incheckning %s" -#: builtin/log.c:1506 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1509 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:1515 +#: builtin/log.c:1518 msgid "could not find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1525 +#: builtin/log.c:1528 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" @@ -16166,280 +16282,284 @@ 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:1548 +#: builtin/log.c:1551 msgid "failed to find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1565 +#: builtin/log.c:1568 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1575 +#: builtin/log.c:1578 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1633 +#: builtin/log.c:1636 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1690 +#: builtin/log.c:1693 msgid "failed to infer range-diff origin of current series" msgstr "misslyckades räkna ut intervalldiff-ursprung för aktuell serie" -#: builtin/log.c:1692 +#: builtin/log.c:1695 #, 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:1736 +#: builtin/log.c:1739 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:1739 +#: builtin/log.c:1742 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1743 +#: builtin/log.c:1746 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1745 +#: builtin/log.c:1748 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1747 +#: builtin/log.c:1750 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1748 +#: builtin/log.c:1751 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1749 +#: builtin/log.c:1752 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1751 +#: builtin/log.c:1754 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1753 +#: builtin/log.c:1756 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1755 +#: builtin/log.c:1758 +msgid "max length of output filename" +msgstr "maximal längd för utdatafilnamn" + +#: builtin/log.c:1760 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Använd [RFC PATCH] istället för [PATCH]" -#: builtin/log.c:1758 +#: builtin/log.c:1763 msgid "cover-from-description-mode" msgstr "cover-from-description-läge" -#: builtin/log.c:1759 +#: builtin/log.c:1764 msgid "generate parts of a cover letter based on a branch's description" msgstr "skapa delar av omslagsbrevet baserat på grenbeskrivelsen" -#: builtin/log.c:1761 +#: builtin/log.c:1766 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1764 +#: builtin/log.c:1769 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1767 +#: builtin/log.c:1772 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1770 +#: builtin/log.c:1775 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1772 +#: builtin/log.c:1777 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1774 +#: builtin/log.c:1779 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1776 +#: builtin/log.c:1781 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1778 +#: builtin/log.c:1783 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1779 +#: builtin/log.c:1784 msgid "header" msgstr "huvud" -#: builtin/log.c:1780 +#: builtin/log.c:1785 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1781 builtin/log.c:1782 +#: builtin/log.c:1786 builtin/log.c:1787 msgid "email" msgstr "epost" -#: builtin/log.c:1781 +#: builtin/log.c:1786 msgid "add To: header" msgstr "lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1782 +#: builtin/log.c:1787 msgid "add Cc: header" msgstr "lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1783 +#: builtin/log.c:1788 msgid "ident" msgstr "ident" -#: builtin/log.c:1784 +#: builtin/log.c:1789 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:1786 +#: builtin/log.c:1791 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1787 +#: builtin/log.c:1792 msgid "make first mail a reply to <message-id>" msgstr "gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1788 builtin/log.c:1791 +#: builtin/log.c:1793 builtin/log.c:1796 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1789 +#: builtin/log.c:1794 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1792 +#: builtin/log.c:1797 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1796 +#: builtin/log.c:1801 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1798 +#: builtin/log.c:1803 msgid "signature" msgstr "signatur" -#: builtin/log.c:1799 +#: builtin/log.c:1804 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1800 +#: builtin/log.c:1805 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1801 +#: builtin/log.c:1806 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1804 +#: builtin/log.c:1809 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1805 +#: builtin/log.c:1810 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1807 +#: builtin/log.c:1812 msgid "show progress while generating patches" msgstr "visa förloppsindikator medan patchar skapas" -#: builtin/log.c:1809 +#: builtin/log.c:1814 msgid "show changes against <rev> in cover letter or single patch" msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch" -#: builtin/log.c:1812 +#: builtin/log.c:1817 msgid "show changes against <refspec> in cover letter or single patch" msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch" -#: builtin/log.c:1814 +#: builtin/log.c:1819 msgid "percentage by which creation is weighted" msgstr "procent som skapelse vägs med" -#: builtin/log.c:1896 +#: builtin/log.c:1905 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1911 +#: builtin/log.c:1920 msgid "-n and -k are mutually exclusive" msgstr "-n och -k kan inte användas samtidigt" -#: builtin/log.c:1913 +#: builtin/log.c:1922 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt" -#: builtin/log.c:1921 +#: builtin/log.c:1930 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1923 +#: builtin/log.c:1932 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1925 +#: builtin/log.c:1934 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1958 -msgid "standard output, or directory, which one?" -msgstr "standard ut, eller katalog, vilken ska det vara?" +#: builtin/log.c:1956 +msgid "--stdout, --output, and --output-directory are mutually exclusive" +msgstr "--stdout, --output, och --output-directory är ömsesidigt uteslutande" -#: builtin/log.c:2062 +#: builtin/log.c:2079 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff kräver --cover-letter eller ensam patch" -#: builtin/log.c:2066 +#: builtin/log.c:2083 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:2067 +#: builtin/log.c:2084 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff mot v%d:" -#: builtin/log.c:2073 +#: builtin/log.c:2090 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor kräver --range-diff" -#: builtin/log.c:2077 +#: builtin/log.c:2094 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff kräver --cover-letter eller ensam patch" -#: builtin/log.c:2085 +#: builtin/log.c:2102 msgid "Range-diff:" msgstr "Intervall-diff:" -#: builtin/log.c:2086 +#: builtin/log.c:2103 #, c-format msgid "Range-diff against v%d:" msgstr "Intervall-diff mot v%d:" -#: builtin/log.c:2097 +#: builtin/log.c:2114 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:2133 +#: builtin/log.c:2150 msgid "Generating patches" msgstr "Skapar patchar" -#: builtin/log.c:2177 +#: builtin/log.c:2194 msgid "failed to create output files" msgstr "misslyckades skapa utdatafiler" -#: builtin/log.c:2236 +#: builtin/log.c:2253 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:2290 +#: builtin/log.c:2307 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -16563,7 +16683,7 @@ msgstr "" msgid "do not print remote URL" msgstr "visa inte fjärr-URL" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398 msgid "exec" msgstr "exec" @@ -16747,192 +16867,192 @@ msgstr "kunde inte bestämma referensen \"%s\"" msgid "Merging %s with %s\n" msgstr "Slår ihop %s med %s\n" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<flaggor>] [<incheckning>...]" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:58 +#: builtin/merge.c:59 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:120 +#: builtin/merge.c:122 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:143 +#: builtin/merge.c:145 #, c-format msgid "option `%s' requires a value" msgstr "flaggan \"%s\" behöver ett värde" -#: builtin/merge.c:189 +#: builtin/merge.c:198 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:190 +#: builtin/merge.c:199 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:195 +#: builtin/merge.c:204 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:246 builtin/pull.c:133 +#: builtin/merge.c:255 builtin/pull.c:133 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:249 builtin/pull.c:136 +#: builtin/merge.c:258 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:250 builtin/pull.c:139 +#: builtin/merge.c:259 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:252 builtin/pull.c:142 +#: builtin/merge.c:261 builtin/pull.c:142 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:255 builtin/pull.c:148 +#: builtin/merge.c:264 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:257 builtin/pull.c:151 +#: builtin/merge.c:266 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:259 builtin/pull.c:154 +#: builtin/merge.c:268 builtin/pull.c:154 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:261 +#: builtin/merge.c:270 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:263 builtin/pull.c:161 +#: builtin/merge.c:272 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:267 builtin/pull.c:164 +#: builtin/merge.c:276 builtin/pull.c:164 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:268 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 +#: builtin/merge.c:277 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:269 builtin/pull.c:169 +#: builtin/merge.c:278 builtin/pull.c:169 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:270 builtin/pull.c:172 +#: builtin/merge.c:279 builtin/pull.c:172 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:271 builtin/pull.c:173 +#: builtin/merge.c:280 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:273 +#: builtin/merge.c:282 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:280 +#: builtin/merge.c:289 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:282 +#: builtin/merge.c:291 msgid "--abort but leave index and working tree alone" msgstr "--abort men lämna index och arbetskatalog ensamma" -#: builtin/merge.c:284 +#: builtin/merge.c:293 msgid "continue the current in-progress merge" msgstr "fortsätt den pågående sammanslagningen" -#: builtin/merge.c:286 builtin/pull.c:180 +#: builtin/merge.c:295 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" -#: builtin/merge.c:293 +#: builtin/merge.c:302 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "förbigå pre-merge-commit- och commit-msg-krokar" -#: builtin/merge.c:310 +#: builtin/merge.c:319 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:315 +#: builtin/merge.c:324 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:320 +#: builtin/merge.c:329 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:342 builtin/merge.c:359 +#: builtin/merge.c:351 builtin/merge.c:368 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:389 +#: builtin/merge.c:398 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:400 +#: builtin/merge.c:409 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:450 +#: builtin/merge.c:459 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:501 +#: builtin/merge.c:510 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:588 +#: builtin/merge.c:597 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:713 +#: builtin/merge.c:723 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:726 +#: builtin/merge.c:736 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:741 +#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:793 +#: builtin/merge.c:807 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:802 +#: builtin/merge.c:816 #, 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:808 +#: builtin/merge.c:822 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" @@ -16943,11 +17063,11 @@ msgstr "" "temagren.\n" "\n" -#: builtin/merge.c:813 +#: builtin/merge.c:827 msgid "An empty message aborts the commit.\n" msgstr "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/merge.c:816 +#: builtin/merge.c:830 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -16956,73 +17076,73 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:869 +#: builtin/merge.c:883 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:884 +#: builtin/merge.c:898 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:945 +#: builtin/merge.c:959 #, 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:984 +#: builtin/merge.c:998 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:986 +#: builtin/merge.c:1000 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:988 +#: builtin/merge.c:1002 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:993 +#: builtin/merge.c:1007 #, 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:1050 +#: builtin/merge.c:1064 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1153 +#: builtin/merge.c:1167 #, 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:1187 +#: builtin/merge.c:1201 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1291 +#: builtin/merge.c:1311 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1295 +#: builtin/merge.c:1315 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1313 +#: builtin/merge.c:1333 msgid "--quit expects no arguments" msgstr "--quit tar inga argument" -#: builtin/merge.c:1326 +#: builtin/merge.c:1346 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1330 +#: builtin/merge.c:1350 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1346 +#: builtin/merge.c:1366 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17030,7 +17150,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1353 +#: builtin/merge.c:1373 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17038,96 +17158,96 @@ msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1356 +#: builtin/merge.c:1376 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:1370 +#: builtin/merge.c:1390 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1372 +#: builtin/merge.c:1392 msgid "You cannot combine --squash with --commit." msgstr "Du kan inte kombinera --squash med --commit." -#: builtin/merge.c:1388 +#: builtin/merge.c:1408 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1405 +#: builtin/merge.c:1425 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1407 +#: builtin/merge.c:1427 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:1412 +#: builtin/merge.c:1432 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1414 +#: builtin/merge.c:1434 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:1495 +#: builtin/merge.c:1515 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1504 +#: builtin/merge.c:1524 msgid "Already up to date." msgstr "Redan à jour." -#: builtin/merge.c:1514 +#: builtin/merge.c:1534 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1560 +#: builtin/merge.c:1580 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1567 +#: builtin/merge.c:1587 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1612 msgid "Already up to date. Yeeah!" msgstr "Redan à jour. Toppen!" -#: builtin/merge.c:1598 +#: builtin/merge.c:1618 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1626 builtin/merge.c:1691 +#: builtin/merge.c:1646 builtin/merge.c:1711 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1630 +#: builtin/merge.c:1650 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1682 +#: builtin/merge.c:1702 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1684 +#: builtin/merge.c:1704 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1693 +#: builtin/merge.c:1713 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Använder %s för att förbereda lösning för hand.\n" -#: builtin/merge.c:1707 +#: builtin/merge.c:1727 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -17274,7 +17394,7 @@ msgstr "%s, källa=%s, mål=%s" msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" @@ -17734,7 +17854,7 @@ msgstr "anteckningar-ref" msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1034 builtin/stash.c:1605 +#: builtin/notes.c:1034 builtin/stash.c:1604 #, c-format msgid "unknown subcommand: %s" msgstr "okänt underkommando: %s" @@ -18175,7 +18295,7 @@ msgstr "Alternativ gällande sammanslagning" msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" -#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126 msgid "allow fast-forward" msgstr "tillåt snabbspolning" @@ -18263,15 +18383,15 @@ 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:469 builtin/rebase.c:1240 git-parse-remote.sh:73 +#: builtin/pull.c:469 builtin/rebase.c:1246 msgid "You are not currently on a branch." msgstr "Du är inte på någon gren för närvarande." -#: builtin/pull.c:471 builtin/pull.c:486 git-parse-remote.sh:79 +#: builtin/pull.c:471 builtin/pull.c:486 msgid "Please specify which branch you want to rebase against." msgstr "Ange vilken gren du vill ombasera mot." -#: builtin/pull.c:473 builtin/pull.c:488 git-parse-remote.sh:82 +#: builtin/pull.c:473 builtin/pull.c:488 msgid "Please specify which branch you want to merge with." msgstr "Ange vilken gren du vill slå samman med." @@ -18280,20 +18400,19 @@ msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." #: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 -#: builtin/rebase.c:1246 git-parse-remote.sh:64 +#: builtin/rebase.c:1252 msgid "<remote>" msgstr "<fjärr>" #: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 -#: git-parse-remote.sh:65 msgid "<branch>" msgstr "<gren>" -#: builtin/pull.c:484 builtin/rebase.c:1238 git-parse-remote.sh:75 +#: builtin/pull.c:484 builtin/rebase.c:1244 msgid "There is no tracking information for the current branch." msgstr "Det finns ingen spårningsinformation för aktuell gren." -#: builtin/pull.c:493 git-parse-remote.sh:95 +#: builtin/pull.c:493 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:" @@ -18312,23 +18431,23 @@ msgstr "" msgid "unable to access commit %s" msgstr "kunde inte komma åt incheckningen %s" -#: builtin/pull.c:894 +#: builtin/pull.c:915 msgid "ignoring --verify-signatures for rebase" msgstr "ignorera --verify-signatures för ombasering" -#: builtin/pull.c:954 +#: builtin/pull.c:972 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:958 +#: builtin/pull.c:976 msgid "pull with rebase" msgstr "pull med ombasering" -#: builtin/pull.c:959 +#: builtin/pull.c:977 msgid "please commit or stash them." msgstr "checka in eller använd \"stash\" på dem." -#: builtin/pull.c:984 +#: builtin/pull.c:1002 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -18339,7 +18458,7 @@ msgstr "" "snabbspolar din arbetskatalog från\n" "incheckningen %s." -#: builtin/pull.c:990 +#: builtin/pull.c:1008 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -18356,15 +18475,15 @@ msgstr "" "$ git reset --hard\n" "för att återgå." -#: builtin/pull.c:1005 +#: builtin/pull.c:1023 msgid "Cannot merge multiple branches into empty head." msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: builtin/pull.c:1009 +#: builtin/pull.c:1027 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpå flera grenar." -#: builtin/pull.c:1017 +#: builtin/pull.c:1041 msgid "cannot rebase with locally recorded submodule modifications" msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" @@ -18518,99 +18637,115 @@ msgstr "" "pekar på något som inte är en incheckning, utan att använda flaggan\n" "\"--force\".\n" -#: builtin/push.c:351 +#: builtin/push.c:294 +msgid "" +"Updates were rejected because the tip of the remote-tracking\n" +"branch has been updated since the last checkout. You may want\n" +"to integrate those changes locally (e.g., 'git pull ...')\n" +"before forcing an update.\n" +msgstr "" +"Uppdateringar avvisades då änden på den fjärrspårande grenen\n" +"har uppdaterats sedan senaste utcheckning. Integrera\n" +"fjärrändringarna lokalt (t.ex \"git pull ....\") innan du\n" +"tvingar en uppdatering.\n" + +#: builtin/push.c:364 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:358 +#: builtin/push.c:371 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:532 +#: builtin/push.c:553 msgid "repository" msgstr "arkiv" -#: builtin/push.c:533 builtin/send-pack.c:183 +#: builtin/push.c:554 builtin/send-pack.c:189 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:534 builtin/send-pack.c:185 +#: builtin/push.c:555 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:536 +#: builtin/push.c:557 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:537 +#: builtin/push.c:558 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:540 builtin/send-pack.c:186 +#: builtin/push.c:561 builtin/send-pack.c:192 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:541 builtin/send-pack.c:198 +#: builtin/push.c:562 builtin/send-pack.c:204 msgid "<refname>:<expect>" msgstr "<refnamn>:<förvänta>" -#: builtin/push.c:542 builtin/send-pack.c:199 +#: builtin/push.c:563 builtin/send-pack.c:205 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:545 +#: builtin/push.c:566 builtin/send-pack.c:208 +msgid "require remote updates to be integrated locally" +msgstr "kräv att fjärruppdateringar har integrerats lokalt" + +#: builtin/push.c:569 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:546 builtin/send-pack.c:193 +#: builtin/push.c:570 builtin/send-pack.c:199 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180 -#: builtin/send-pack.c:181 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 +#: builtin/send-pack.c:187 msgid "receive pack program" msgstr "program för att ta emot paket" -#: builtin/push.c:549 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:552 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:554 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "förbigå pre-push-krok" -#: builtin/push.c:555 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:557 builtin/send-pack.c:187 +#: builtin/push.c:581 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "GPG-signera insändningen" -#: builtin/push.c:559 builtin/send-pack.c:194 +#: builtin/push.c:583 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "begär atomiska transaktioner på fjärrsidan" -#: builtin/push.c:577 +#: 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:579 +#: builtin/push.c:603 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" -#: builtin/push.c:599 +#: builtin/push.c:623 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:600 +#: builtin/push.c:624 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -18631,27 +18766,27 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:615 +#: builtin/push.c:639 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:617 +#: builtin/push.c:641 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:621 +#: builtin/push.c:645 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:623 +#: builtin/push.c:647 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:626 +#: builtin/push.c:650 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:630 +#: builtin/push.c:657 msgid "push options must not have new line characters" msgstr "push-flaggor kan inte innehålla radbrytning" @@ -18797,193 +18932,193 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238 +#: builtin/rebase.c:193 builtin/rebase.c:217 builtin/rebase.c:244 #, c-format msgid "unusable todo list: '%s'" msgstr "oanvändbar todo-lista: %s" -#: builtin/rebase.c:304 +#: builtin/rebase.c:310 #, c-format msgid "could not create temporary %s" msgstr "kunde inte skapa temporär %s" -#: builtin/rebase.c:310 +#: builtin/rebase.c:316 msgid "could not mark as interactive" msgstr "kunde inte markera som interaktiv" -#: builtin/rebase.c:364 +#: builtin/rebase.c:369 msgid "could not generate todo list" msgstr "Kunde inte skapa attgöra-lista" -#: builtin/rebase.c:405 +#: builtin/rebase.c:411 msgid "a base commit must be provided with --upstream or --onto" msgstr "en basincheckning måste anges med --upstream eller --onto" -#: builtin/rebase.c:474 +#: builtin/rebase.c:480 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<flaggor>]" -#: builtin/rebase.c:487 builtin/rebase.c:1382 +#: builtin/rebase.c:493 builtin/rebase.c:1388 msgid "keep commits which start empty" msgstr "behåller incheckningar som är tomma från början" -#: builtin/rebase.c:491 builtin/revert.c:128 +#: builtin/rebase.c:497 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "tillåt incheckningar med tomt meddelande" -#: builtin/rebase.c:493 +#: builtin/rebase.c:499 msgid "rebase merge commits" msgstr "ombasera sammanslagningar" -#: builtin/rebase.c:495 +#: builtin/rebase.c:501 msgid "keep original branch points of cousins" msgstr "behåll ursprungliga förgreningspunkter för kusiner" -#: builtin/rebase.c:497 +#: builtin/rebase.c:503 msgid "move commits that begin with squash!/fixup!" msgstr "flytta incheckningar som inleds med squash!/fixup!" -#: builtin/rebase.c:498 +#: builtin/rebase.c:504 msgid "sign commits" msgstr "signera incheckningar" -#: builtin/rebase.c:500 builtin/rebase.c:1321 +#: builtin/rebase.c:506 builtin/rebase.c:1327 msgid "display a diffstat of what changed upstream" msgstr "vis diffstat för vad som ändrats uppströms" -#: builtin/rebase.c:502 +#: builtin/rebase.c:508 msgid "continue rebase" msgstr "fortsätt ombasering" -#: builtin/rebase.c:504 +#: builtin/rebase.c:510 msgid "skip commit" msgstr "hoppa över incheckning" -#: builtin/rebase.c:505 +#: builtin/rebase.c:511 msgid "edit the todo list" msgstr "redigera attgöra-listan" -#: builtin/rebase.c:507 +#: builtin/rebase.c:513 msgid "show the current patch" msgstr "visa nuvarande patch" -#: builtin/rebase.c:510 +#: builtin/rebase.c:516 msgid "shorten commit ids in the todo list" msgstr "förkorta inchecknings-id i todo-listan" -#: builtin/rebase.c:512 +#: builtin/rebase.c:518 msgid "expand commit ids in the todo list" msgstr "utöka inchecknings-id i todo-listan" -#: builtin/rebase.c:514 +#: builtin/rebase.c:520 msgid "check the todo list" msgstr "kontrollera todo-listan" -#: builtin/rebase.c:516 +#: builtin/rebase.c:522 msgid "rearrange fixup/squash lines" msgstr "ordna om fixup-/squash-rader" -#: builtin/rebase.c:518 +#: builtin/rebase.c:524 msgid "insert exec commands in todo list" msgstr "lägg in exec-kommandon i todo-listan" -#: builtin/rebase.c:519 +#: builtin/rebase.c:525 msgid "onto" msgstr "ovanpå" -#: builtin/rebase.c:522 +#: builtin/rebase.c:528 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:522 +#: builtin/rebase.c:528 msgid "restrict revision" msgstr "begränsa revision" -#: builtin/rebase.c:524 +#: builtin/rebase.c:530 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:525 +#: builtin/rebase.c:531 msgid "squash onto" msgstr "tryck ihop ovanpå" -#: builtin/rebase.c:527 +#: builtin/rebase.c:533 msgid "the upstream commit" msgstr "uppströmsincheckningen" -#: builtin/rebase.c:529 +#: builtin/rebase.c:535 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:529 +#: builtin/rebase.c:535 msgid "head name" msgstr "namn på huvud" -#: builtin/rebase.c:534 +#: builtin/rebase.c:540 msgid "rebase strategy" msgstr "sammanslagningsstrategi" -#: builtin/rebase.c:535 +#: builtin/rebase.c:541 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:536 +#: builtin/rebase.c:542 msgid "strategy options" msgstr "strategiflaggor" -#: builtin/rebase.c:537 +#: builtin/rebase.c:543 msgid "switch-to" msgstr "switch-to" -#: builtin/rebase.c:538 +#: builtin/rebase.c:544 msgid "the branch or commit to checkout" msgstr "gren eller inchecking att checka ut" -#: builtin/rebase.c:539 +#: builtin/rebase.c:545 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:539 +#: builtin/rebase.c:545 msgid "onto name" msgstr "på-namn" -#: builtin/rebase.c:540 +#: builtin/rebase.c:546 msgid "cmd" msgstr "kmd" -#: builtin/rebase.c:540 +#: builtin/rebase.c:546 msgid "the command to run" msgstr "kommando att köra" -#: builtin/rebase.c:543 builtin/rebase.c:1415 +#: builtin/rebase.c:549 builtin/rebase.c:1421 msgid "automatically re-schedule any `exec` that fails" msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt" -#: builtin/rebase.c:559 +#: builtin/rebase.c:565 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges" -#: builtin/rebase.c:575 +#: builtin/rebase.c:581 #, c-format msgid "%s requires the merge backend" msgstr "%s kräver \"merge\"-bakändan" -#: builtin/rebase.c:618 +#: builtin/rebase.c:624 #, c-format msgid "could not get 'onto': '%s'" msgstr "kunde inte hämta \"onto\": \"%s\"" -#: builtin/rebase.c:635 +#: builtin/rebase.c:641 #, c-format msgid "invalid orig-head: '%s'" msgstr "ogiltigt orig-head: \"%s\"" -#: builtin/rebase.c:660 +#: builtin/rebase.c:666 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\"" -#: builtin/rebase.c:805 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:811 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -18997,7 +19132,7 @@ msgstr "" "För att avbryta och återgå till där du var före ombaseringen, kör \"git " "rebase --abort\"." -#: builtin/rebase.c:888 +#: builtin/rebase.c:894 #, c-format msgid "" "\n" @@ -19016,7 +19151,7 @@ msgstr "" "\n" "Därför kan inte git ombasera dessa." -#: builtin/rebase.c:1214 +#: builtin/rebase.c:1220 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" @@ -19024,7 +19159,7 @@ msgid "" msgstr "" "okänd tom-typ \"%s\"; giltiga värden är \"drop\", \"keep\" och \"ask\"." -#: builtin/rebase.c:1232 +#: builtin/rebase.c:1238 #, c-format msgid "" "%s\n" @@ -19041,7 +19176,7 @@ msgstr "" " git rebase '<gren>'\n" "\n" -#: builtin/rebase.c:1248 +#: builtin/rebase.c:1254 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -19054,148 +19189,148 @@ msgstr "" " git branch --set-upstream-to=%s/<gren> %s\n" "\n" -#: builtin/rebase.c:1278 +#: builtin/rebase.c:1284 msgid "exec commands cannot contain newlines" msgstr "exec-kommandon kan inte innehålla nyradstecken" -#: builtin/rebase.c:1282 +#: builtin/rebase.c:1288 msgid "empty exec command" msgstr "tomt exec-kommando" -#: builtin/rebase.c:1312 +#: builtin/rebase.c:1318 msgid "rebase onto given branch instead of upstream" msgstr "ombasera mot given grenen istället för uppström" -#: builtin/rebase.c:1314 +#: builtin/rebase.c:1320 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:1316 +#: builtin/rebase.c:1322 msgid "allow pre-rebase hook to run" msgstr "tillåt pre-rebase-krok att köra" -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1324 msgid "be quiet. implies --no-stat" msgstr "var tyst. implicerar --no-stat" -#: builtin/rebase.c:1324 +#: builtin/rebase.c:1330 msgid "do not show diffstat of what changed upstream" msgstr "visa inte en diffstat för vad som ändrats uppströms" -#: builtin/rebase.c:1327 -msgid "add a Signed-off-by: line to each commit" -msgstr "lägg \"Signed-off-by:\"-rad till varje incheckning" +#: builtin/rebase.c:1333 +msgid "add a Signed-off-by trailer to each commit" +msgstr "lägg \"Signed-off-by:\"-släprad till varje incheckning" -#: builtin/rebase.c:1330 +#: builtin/rebase.c:1336 msgid "make committer date match author date" msgstr "sätt incheckningsdatum till författardatum" -#: builtin/rebase.c:1332 +#: builtin/rebase.c:1338 msgid "ignore author date and use current date" msgstr "ignorera författardatum och använd nuvarande" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1340 msgid "synonym of --reset-author-date" msgstr "synonym för --reset-author-date" -#: builtin/rebase.c:1336 builtin/rebase.c:1340 +#: builtin/rebase.c:1342 builtin/rebase.c:1346 msgid "passed to 'git apply'" msgstr "sänds till \"git apply\"" -#: builtin/rebase.c:1338 +#: builtin/rebase.c:1344 msgid "ignore changes in whitespace" msgstr "ignorera ändringar i blanksteg" -#: builtin/rebase.c:1342 builtin/rebase.c:1345 +#: builtin/rebase.c:1348 builtin/rebase.c:1351 msgid "cherry-pick all commits, even if unchanged" msgstr "utför cherry-pick på alla incheckningar, även om oändrad" -#: builtin/rebase.c:1347 +#: builtin/rebase.c:1353 msgid "continue" msgstr "fortsätt" -#: builtin/rebase.c:1350 +#: builtin/rebase.c:1356 msgid "skip current patch and continue" msgstr "hoppa över nuvarande patch och fortsätt" -#: builtin/rebase.c:1352 +#: builtin/rebase.c:1358 msgid "abort and check out the original branch" msgstr "avbryt och checka ut ursprungsgrenen" -#: builtin/rebase.c:1355 +#: builtin/rebase.c:1361 msgid "abort but keep HEAD where it is" msgstr "avbryt men behåll HEAD där det är" -#: builtin/rebase.c:1356 +#: builtin/rebase.c:1362 msgid "edit the todo list during an interactive rebase" msgstr "redigera attgöra-listan under interaktiv ombasering." -#: builtin/rebase.c:1359 +#: builtin/rebase.c:1365 msgid "show the patch file being applied or merged" msgstr "visa patchen som tillämpas eller slås samman" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1368 msgid "use apply strategies to rebase" msgstr "använd appliceringstrategier för ombasering" -#: builtin/rebase.c:1366 +#: builtin/rebase.c:1372 msgid "use merging strategies to rebase" msgstr "använd sammanslagningsstrategier för ombasering" -#: builtin/rebase.c:1370 +#: builtin/rebase.c:1376 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:1374 +#: builtin/rebase.c:1380 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:1379 +#: builtin/rebase.c:1385 msgid "how to handle commits that become empty" msgstr "hur incheckningar som blir tomma ska hanteras" -#: builtin/rebase.c:1386 +#: builtin/rebase.c:1392 msgid "move commits that begin with squash!/fixup! under -i" msgstr "flytta incheckningar som börjar med squash!/fixup! under -i" -#: builtin/rebase.c:1393 +#: builtin/rebase.c:1399 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:1397 +#: builtin/rebase.c:1403 msgid "allow rebasing commits with empty messages" msgstr "tillåt ombasering av incheckningar med tomt meddelande" -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1407 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:1404 +#: builtin/rebase.c:1410 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:1406 +#: builtin/rebase.c:1412 msgid "use the given merge strategy" msgstr "använd angiven sammanslagningsstrategi" -#: builtin/rebase.c:1408 builtin/revert.c:115 +#: builtin/rebase.c:1414 builtin/revert.c:115 msgid "option" msgstr "alternativ" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1415 msgid "pass the argument through to the merge strategy" msgstr "sänd flaggan till sammanslagningsstrategin" -#: builtin/rebase.c:1412 +#: builtin/rebase.c:1418 msgid "rebase all reachable commits up to the root(s)" msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1423 msgid "apply all changes, even those already present upstream" msgstr "applicera alla ändringar, även de som redan finns uppströms" -#: builtin/rebase.c:1434 +#: builtin/rebase.c:1440 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -19203,41 +19338,41 @@ msgstr "" "stödet för rebase.useBuiltin har tagits bort!\n" "Se posten för det i \"git help config\" för detaljer." -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1446 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:1481 +#: builtin/rebase.c:1487 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:1486 +#: builtin/rebase.c:1492 msgid "cannot combine '--keep-base' with '--onto'" msgstr "kan inte kombinera \"--keep-base\" med \"--onto\"" -#: builtin/rebase.c:1488 +#: builtin/rebase.c:1494 msgid "cannot combine '--keep-base' with '--root'" msgstr "kan inte kombinera \"--keep-base\" med \"--root\"" -#: builtin/rebase.c:1492 +#: builtin/rebase.c:1498 msgid "cannot combine '--root' with '--fork-point'" msgstr "kan inte kombinera \"--root\" med \"--fork-point\"" -#: builtin/rebase.c:1495 +#: builtin/rebase.c:1501 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: builtin/rebase.c:1499 +#: builtin/rebase.c:1505 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:1522 +#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1540 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -19245,16 +19380,16 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: builtin/rebase.c:1553 +#: builtin/rebase.c:1559 msgid "could not discard worktree changes" msgstr "kunde inte kasta ändringar i arbetskatalogen" -#: builtin/rebase.c:1572 +#: builtin/rebase.c:1578 #, c-format msgid "could not move back to %s" msgstr "kunde inte flytta tillbaka till %s" -#: builtin/rebase.c:1618 +#: builtin/rebase.c:1624 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -19275,134 +19410,134 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där.\n" -#: builtin/rebase.c:1646 +#: builtin/rebase.c:1652 msgid "switch `C' expects a numerical value" msgstr "flaggan \"C\" förväntar ett numeriskt värde" -#: builtin/rebase.c:1688 +#: builtin/rebase.c:1694 #, c-format msgid "Unknown mode: %s" msgstr "Okänt läge: %s" -#: builtin/rebase.c:1727 +#: builtin/rebase.c:1733 msgid "--strategy requires --merge or --interactive" msgstr "--strategy kräver --merge eller --interactive" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1763 msgid "cannot combine apply options with merge options" msgstr "kan inte kombinera apply-flaggor med merge-flaggor" -#: builtin/rebase.c:1770 +#: builtin/rebase.c:1776 #, c-format msgid "Unknown rebase backend: %s" msgstr "Okänd rebase-bakända: %s" -#: builtin/rebase.c:1795 +#: builtin/rebase.c:1806 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec kräver --exec eller --interactive" -#: builtin/rebase.c:1815 +#: builtin/rebase.c:1826 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\"" -#: builtin/rebase.c:1819 +#: builtin/rebase.c:1830 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec" "\"" -#: builtin/rebase.c:1843 +#: builtin/rebase.c:1854 #, c-format msgid "invalid upstream '%s'" msgstr "felaktig uppström \"%s\"" -#: builtin/rebase.c:1849 +#: builtin/rebase.c:1860 msgid "Could not create new root commit" msgstr "kunde inte skapa ny rotincheckning" -#: builtin/rebase.c:1875 +#: builtin/rebase.c:1886 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "\"%s\": behöver precis en sammanslagningsbas med gren" -#: builtin/rebase.c:1878 +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "\"%s\": behöver precis en sammanslagningsbas" -#: builtin/rebase.c:1886 +#: builtin/rebase.c:1897 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "Pekar inte på en giltig incheckning: \"%s\"" -#: builtin/rebase.c:1912 +#: builtin/rebase.c:1923 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\"" -#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/rebase.c:1931 builtin/submodule--helper.c:40 #: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/rebase.c:1931 +#: builtin/rebase.c:1942 msgid "Could not resolve HEAD to a revision" msgstr "Kunde inte bestämma HEAD:s incheckning" -#: builtin/rebase.c:1952 +#: builtin/rebase.c:1963 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: builtin/rebase.c:1988 +#: builtin/rebase.c:1999 #, c-format msgid "could not switch to %s" msgstr "kunde inte växla till %s" -#: builtin/rebase.c:1999 +#: builtin/rebase.c:2010 msgid "HEAD is up to date." msgstr "HEAD är à jour." -#: builtin/rebase.c:2001 +#: builtin/rebase.c:2012 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Aktuell gren %s är à jour.\n" -#: builtin/rebase.c:2009 +#: builtin/rebase.c:2020 msgid "HEAD is up to date, rebase forced." msgstr "HEAD är à jour, ombasering framtvingad." -#: builtin/rebase.c:2011 +#: builtin/rebase.c:2022 #, 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:2019 +#: builtin/rebase.c:2030 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: builtin/rebase.c:2026 +#: builtin/rebase.c:2037 #, c-format msgid "Changes to %s:\n" msgstr "Ändringar till %s:\n" -#: builtin/rebase.c:2029 +#: builtin/rebase.c:2040 #, c-format msgid "Changes from %s to %s:\n" msgstr "Ändringar från %s till %s:\n" -#: builtin/rebase.c:2054 +#: builtin/rebase.c:2065 #, 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:2063 +#: builtin/rebase.c:2074 msgid "Could not detach HEAD" msgstr "Kunde inte koppla från HEAD" -#: builtin/rebase.c:2072 +#: builtin/rebase.c:2083 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Snabbspolade %s till %s.\n" @@ -19411,7 +19546,7 @@ msgstr "Snabbspolade %s till %s.\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-katalog>" -#: builtin/receive-pack.c:1224 +#: builtin/receive-pack.c:1276 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" @@ -19441,7 +19576,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:1244 +#: builtin/receive-pack.c:1296 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" @@ -19462,11 +19597,11 @@ msgstr "" "\n" "För att undvika detta meddelande kan du sätta det till \"refuse\"." -#: builtin/receive-pack.c:2422 +#: builtin/receive-pack.c:2481 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:2436 +#: builtin/receive-pack.c:2495 msgid "You must specify a directory." msgstr "Du måste ange en katalog." @@ -19662,40 +19797,35 @@ 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:697 +#: builtin/remote.c:195 builtin/remote.c:700 #, c-format msgid "remote %s already exists." msgstr "fjärrarkivet %s finns redan." -#: builtin/remote.c:199 builtin/remote.c:701 -#, c-format -msgid "'%s' is not a valid remote name" -msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" - -#: builtin/remote.c:239 +#: builtin/remote.c:240 #, c-format msgid "Could not setup master '%s'" msgstr "Kunde inte skapa master \"%s\"" -#: builtin/remote.c:354 +#: builtin/remote.c:355 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Kunde inte hämta mappning för referensspecifikation %s" -#: builtin/remote.c:453 builtin/remote.c:461 +#: builtin/remote.c:454 builtin/remote.c:462 msgid "(matching)" -msgstr "(matchande)" +msgstr "(träffande)" -#: builtin/remote.c:465 +#: builtin/remote.c:466 msgid "(delete)" msgstr "(ta bort)" -#: builtin/remote.c:654 +#: builtin/remote.c:655 #, c-format msgid "could not set '%s'" msgstr "kunde inte ställa in \"%s\"" -#: builtin/remote.c:659 +#: builtin/remote.c:660 #, c-format msgid "" "The %s configuration remote.pushDefault in:\n" @@ -19706,17 +19836,17 @@ msgstr "" "\t%s:%d\n" "anger nu den icke-existerande fjärren \"%s\"" -#: builtin/remote.c:690 builtin/remote.c:833 builtin/remote.c:941 +#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946 #, c-format msgid "No such remote: '%s'" msgstr "Ingen sådan fjärr: \"%s\"" -#: builtin/remote.c:707 +#: builtin/remote.c:710 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\"" -#: builtin/remote.c:727 +#: builtin/remote.c:730 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -19727,17 +19857,17 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nödvändigt." -#: builtin/remote.c:767 +#: builtin/remote.c:770 #, c-format msgid "deleting '%s' failed" msgstr "misslyckades ta bort \"%s\"" -#: builtin/remote.c:801 +#: builtin/remote.c:804 #, c-format msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:877 +#: builtin/remote.c:882 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -19751,118 +19881,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:891 +#: builtin/remote.c:896 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:994 +#: builtin/remote.c:999 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ny (nästa hämtning sparar i remotes/%s)" -#: builtin/remote.c:997 +#: builtin/remote.c:1002 msgid " tracked" msgstr " spårad" -#: builtin/remote.c:999 +#: builtin/remote.c:1004 msgid " stale (use 'git remote prune' to remove)" msgstr " förlegad (använd \"git remote prune\" för att ta bort)" -#: builtin/remote.c:1001 +#: builtin/remote.c:1006 msgid " ???" msgstr " ???" -#: builtin/remote.c:1042 +#: builtin/remote.c:1047 #, 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:1051 +#: builtin/remote.c:1056 #, c-format msgid "rebases interactively onto remote %s" msgstr "ombaseras interaktivt på fjärren %s" -#: builtin/remote.c:1053 +#: builtin/remote.c:1058 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "ombaseras interaktivt (med sammanslagningar) på fjärren %s" -#: builtin/remote.c:1056 +#: builtin/remote.c:1061 #, c-format msgid "rebases onto remote %s" msgstr "ombaseras på fjärren %s" -#: builtin/remote.c:1060 +#: builtin/remote.c:1065 #, c-format msgid " merges with remote %s" msgstr " sammanslås med fjärren %s" -#: builtin/remote.c:1063 +#: builtin/remote.c:1068 #, c-format msgid "merges with remote %s" msgstr "sammanslås med fjärren %s" -#: builtin/remote.c:1066 +#: builtin/remote.c:1071 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s och med fjärren %s\n" -#: builtin/remote.c:1109 +#: builtin/remote.c:1114 msgid "create" msgstr "skapa" -#: builtin/remote.c:1112 +#: builtin/remote.c:1117 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1116 +#: builtin/remote.c:1121 msgid "up to date" msgstr "àjour" -#: builtin/remote.c:1119 +#: builtin/remote.c:1124 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1122 +#: builtin/remote.c:1127 msgid "local out of date" msgstr "lokal föråldrad" -#: builtin/remote.c:1129 +#: builtin/remote.c:1134 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1132 +#: builtin/remote.c:1137 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sänder till %-*s (%s)" -#: builtin/remote.c:1136 +#: builtin/remote.c:1141 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1139 +#: builtin/remote.c:1144 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" -#: builtin/remote.c:1207 +#: builtin/remote.c:1212 msgid "do not query remotes" msgstr "fråga inte fjärrar" -#: builtin/remote.c:1234 +#: builtin/remote.c:1239 #, c-format msgid "* remote %s" msgstr "* fjärr %s" -#: builtin/remote.c:1235 +#: builtin/remote.c:1240 #, c-format msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391 +#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396 msgid "(no URL)" msgstr "(ingen URL)" @@ -19870,176 +20000,176 @@ msgstr "(ingen URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1250 builtin/remote.c:1252 +#: builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258 +#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1254 +#: builtin/remote.c:1259 msgid "(not queried)" msgstr "(inte förfrågad)" -#: builtin/remote.c:1256 +#: builtin/remote.c:1261 msgid "(unknown)" msgstr "(okänd)" -#: builtin/remote.c:1260 +#: builtin/remote.c:1265 #, 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:1272 +#: builtin/remote.c:1277 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Fjärrgren:%s" msgstr[1] " Fjärrgrenar:%s" -#: builtin/remote.c:1275 builtin/remote.c:1301 +#: builtin/remote.c:1280 builtin/remote.c:1306 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1284 +#: builtin/remote.c:1289 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:1292 +#: builtin/remote.c:1297 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1298 +#: builtin/remote.c:1303 #, 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:1319 +#: builtin/remote.c:1324 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" -#: builtin/remote.c:1321 +#: builtin/remote.c:1326 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1336 +#: builtin/remote.c:1341 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1338 +#: builtin/remote.c:1343 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:1348 +#: builtin/remote.c:1353 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1356 +#: builtin/remote.c:1361 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1358 +#: builtin/remote.c:1363 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1376 +#: builtin/remote.c:1381 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1377 +#: builtin/remote.c:1382 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1387 +#: builtin/remote.c:1392 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1388 +#: builtin/remote.c:1393 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1404 +#: builtin/remote.c:1409 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1407 +#: builtin/remote.c:1412 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1452 +#: builtin/remote.c:1457 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637 +#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" -#: builtin/remote.c:1531 +#: builtin/remote.c:1539 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1538 +#: builtin/remote.c:1546 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1555 +#: builtin/remote.c:1563 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:1557 +#: builtin/remote.c:1565 msgid "return all URLs" msgstr "returnera alla URL:er" -#: builtin/remote.c:1585 +#: builtin/remote.c:1595 #, c-format msgid "no URLs configured for remote '%s'" msgstr "ingen URL:er angivna för fjärren \"%s\"" -#: builtin/remote.c:1611 +#: builtin/remote.c:1621 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1613 +#: builtin/remote.c:1623 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1615 +#: builtin/remote.c:1625 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1622 +#: builtin/remote.c:1632 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1661 +#: builtin/remote.c:1673 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1669 +#: builtin/remote.c:1681 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1671 +#: builtin/remote.c:1683 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" @@ -20060,130 +20190,116 @@ msgstr "" msgid "could not start pack-objects to repack promisor objects" msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt" -#: builtin/repack.c:236 builtin/repack.c:421 +#: builtin/repack.c:268 builtin/repack.c:447 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:260 +#: builtin/repack.c:295 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:297 +#: builtin/repack.c:323 msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" -#: builtin/repack.c:299 +#: builtin/repack.c:325 msgid "same as -a, and turn unreachable objects loose" msgstr "samma som -a, och gör onåbara objekt lösa" -#: builtin/repack.c:302 +#: builtin/repack.c:328 msgid "remove redundant packs, and run git-prune-packed" msgstr "ta bort överflödiga paket, och kör git-prune-packed" -#: builtin/repack.c:304 +#: builtin/repack.c:330 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "sänd --no-reuse-delta till git-pack-objects" -#: builtin/repack.c:306 +#: builtin/repack.c:332 msgid "pass --no-reuse-object to git-pack-objects" msgstr "sänd --no-reuse-object till git-pack-objects" -#: builtin/repack.c:308 +#: builtin/repack.c:334 msgid "do not run git-update-server-info" msgstr "kör inte git-update-server-info" -#: builtin/repack.c:311 +#: builtin/repack.c:337 msgid "pass --local to git-pack-objects" msgstr "sänd --local till git-pack-objects" -#: builtin/repack.c:313 +#: builtin/repack.c:339 msgid "write bitmap index" msgstr "skriv bitkartindex" -#: builtin/repack.c:315 +#: builtin/repack.c:341 msgid "pass --delta-islands to git-pack-objects" msgstr "sänd --delta-islands till git-pack-objects" -#: builtin/repack.c:316 +#: builtin/repack.c:342 msgid "approxidate" msgstr "cirkadatum" -#: builtin/repack.c:317 +#: builtin/repack.c:343 msgid "with -A, do not loosen objects older than this" msgstr "med -A, lös inte upp objekt äldre än detta" -#: builtin/repack.c:319 +#: builtin/repack.c:345 msgid "with -a, repack unreachable objects" msgstr "med -a, packa om onåbara objekt" -#: builtin/repack.c:321 +#: builtin/repack.c:347 msgid "size of the window used for delta compression" msgstr "storlek på fönster använt för deltakomprimering" -#: builtin/repack.c:322 builtin/repack.c:328 +#: builtin/repack.c:348 builtin/repack.c:354 msgid "bytes" msgstr "byte" -#: builtin/repack.c:323 +#: builtin/repack.c:349 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:325 +#: builtin/repack.c:351 msgid "limits the maximum delta depth" msgstr "begränsa maximalt deltadjup" -#: builtin/repack.c:327 +#: builtin/repack.c:353 msgid "limits the maximum number of threads" msgstr "begränsar maximalt antal trådar" -#: builtin/repack.c:329 +#: builtin/repack.c:355 msgid "maximum size of each packfile" msgstr "maximal storlek på varje paketfil" -#: builtin/repack.c:331 +#: builtin/repack.c:357 msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:333 +#: builtin/repack.c:359 msgid "do not repack this pack" msgstr "packa inte om detta paket" -#: builtin/repack.c:343 +#: builtin/repack.c:369 msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" -#: builtin/repack.c:347 +#: builtin/repack.c:373 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable och -A kan inte användas samtidigt" -#: builtin/repack.c:430 +#: builtin/repack.c:456 msgid "Nothing new to pack." msgstr "Inget nytt att packa." #: builtin/repack.c:486 #, c-format -msgid "" -"WARNING: Some packs in use have been renamed by\n" -"WARNING: prefixing old- to their name, in order to\n" -"WARNING: replace them with the new version of the\n" -"WARNING: file. But the operation failed, and the\n" -"WARNING: attempt to rename them back to their\n" -"WARNING: original names also failed.\n" -"WARNING: Please rename them in %s manually:\n" -msgstr "" -"VARNING: Namnen på några paket har bytts genom att\n" -"VARNING: lägga till old- före namnen, för att byta\n" -"VARNING: dem mot den nya versionen av filen. Men\n" -"VARNING: operationen misslyckades, och försöket att\n" -"VARNING: byta tillbaka till det ursprungliga\n" -"VARNING: namnet misslyckades också.\n" -"VARNING: Byt namn på dem i %s manuellt:\n" +msgid "missing required file: %s" +msgstr "nödvändig fil saknas: %s" -#: builtin/repack.c:534 +#: builtin/repack.c:488 #, c-format -msgid "failed to remove '%s'" -msgstr "misslyckades ta bort \"%s\"" +msgid "could not unlink: %s" +msgstr "kunde inte ta bort: \"%s\"" #: builtin/replace.c:22 msgid "git replace [-f] <object> <replacement>" @@ -20513,8 +20629,8 @@ msgstr "HEAD är nu på %s" 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:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:594 +#: builtin/stash.c:618 msgid "be quiet, only report errors" msgstr "var tyst, rapportera endast fel" @@ -20723,11 +20839,11 @@ msgstr "behåll incheckningar som börjar som tomma" msgid "keep redundant, empty commits" msgstr "behåll redundanta, tomma incheckningar" -#: builtin/revert.c:232 +#: builtin/revert.c:239 msgid "revert failed" msgstr "\"revert\" misslyckades" -#: builtin/revert.c:245 +#: builtin/revert.c:252 msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" @@ -20826,76 +20942,76 @@ msgstr "" "[<ref>...]\n" " --all och explicit angiven <ref> är ömsesidigt uteslutande." -#: builtin/send-pack.c:182 +#: builtin/send-pack.c:188 msgid "remote name" msgstr "fjärrnamn" -#: builtin/send-pack.c:195 +#: builtin/send-pack.c:201 msgid "use stateless RPC protocol" msgstr "använd tillståndslöst RPC-protokoll" -#: builtin/send-pack.c:196 +#: builtin/send-pack.c:202 msgid "read refs from stdin" msgstr "läs referenser från standard in" -#: builtin/send-pack.c:197 +#: builtin/send-pack.c:203 msgid "print status from remote helper" msgstr "visa status från fjärrhjälpare" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:16 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" -#: builtin/shortlog.c:16 +#: builtin/shortlog.c:17 msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shortlog [<flaggor>]" -#: builtin/shortlog.c:134 +#: builtin/shortlog.c:135 msgid "using multiple --group options with stdin is not supported" msgstr "mer än en --group-flagga stöds inte med standard in" -#: builtin/shortlog.c:144 +#: builtin/shortlog.c:145 msgid "using --group=trailer with stdin is not supported" msgstr "att använda --group=trailer stöds inte med standard in" -#: builtin/shortlog.c:388 +#: builtin/shortlog.c:335 #, c-format msgid "unknown group type: %s" msgstr "okänd grupptyp: %s" -#: builtin/shortlog.c:416 +#: builtin/shortlog.c:363 msgid "Group by committer rather than author" msgstr "Gruppera efter incheckare istället för författare" -#: builtin/shortlog.c:419 +#: builtin/shortlog.c:366 msgid "sort output according to the number of commits per author" msgstr "sortera utdata enligt antal incheckningar per författare" -#: builtin/shortlog.c:421 +#: builtin/shortlog.c:368 msgid "Suppress commit descriptions, only provides commit count" msgstr "Undertryck beskrivningar, visa bara antal incheckningar" -#: builtin/shortlog.c:423 +#: builtin/shortlog.c:370 msgid "Show the email address of each author" msgstr "Visa e-postadress för varje författare" -#: builtin/shortlog.c:424 +#: builtin/shortlog.c:371 msgid "<w>[,<i1>[,<i2>]]" msgstr "<w>[,<i1>[,<i2>]]" -#: builtin/shortlog.c:425 +#: builtin/shortlog.c:372 msgid "Linewrap output" msgstr "Radbryt utdata" -#: builtin/shortlog.c:427 +#: builtin/shortlog.c:374 msgid "field" msgstr "föt" -#: builtin/shortlog.c:428 +#: builtin/shortlog.c:375 msgid "Group by field" msgstr "Gruppera efter fält" -#: builtin/shortlog.c:456 +#: builtin/shortlog.c:403 msgid "too many arguments given outside repository" msgstr "för många flaggor givna utanför arkivet" @@ -21258,7 +21374,7 @@ msgid "could not generate diff %s^!." msgstr "kunde inte skapa diff %s^!." #: builtin/stash.c:422 -msgid "conflicts in index.Try without --index." +msgid "conflicts in index. Try without --index." msgstr "konflikter i indexet. Testa utan --index." #: builtin/stash.c:428 @@ -21278,120 +21394,120 @@ msgstr "Slår ihop %s med %s" msgid "Index was not unstashed." msgstr "Indexet har inte tagits upp ur \"stash\":en" -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:522 builtin/stash.c:620 msgid "attempt to recreate the index" msgstr "försök återskapa indexet" -#: builtin/stash.c:555 +#: builtin/stash.c:566 #, c-format msgid "Dropped %s (%s)" msgstr "Kastade %s (%s)" -#: builtin/stash.c:558 +#: builtin/stash.c:569 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Kunde inte kasta \"stash\"-post" -#: builtin/stash.c:583 +#: builtin/stash.c:582 #, c-format msgid "'%s' is not a stash reference" msgstr "\"%s\" är inte en \"stash\"-referens" -#: builtin/stash.c:633 +#: builtin/stash.c:632 msgid "The stash entry is kept in case you need it again." msgstr "Stash-posten behålls ifall du behöver den igen." -#: builtin/stash.c:656 +#: builtin/stash.c:655 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: builtin/stash.c:800 builtin/stash.c:837 +#: builtin/stash.c:799 builtin/stash.c:836 #, c-format msgid "Cannot update %s with %s" msgstr "Kan inte uppdatera %s med %s" -#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537 +#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536 msgid "stash message" msgstr "\"stash\"-meddelande" -#: builtin/stash.c:828 +#: builtin/stash.c:827 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" kräver ett <incheckning>-argument" -#: builtin/stash.c:1043 +#: builtin/stash.c:1042 msgid "No changes selected" msgstr "Inga ändringar valda" -#: builtin/stash.c:1143 +#: builtin/stash.c:1142 msgid "You do not have the initial commit yet" msgstr "Du har inte den första incheckningen ännu" -#: builtin/stash.c:1170 +#: builtin/stash.c:1169 msgid "Cannot save the current index state" msgstr "Kan inte spara aktuellt tillstånd för indexet" -#: builtin/stash.c:1179 +#: builtin/stash.c:1178 msgid "Cannot save the untracked files" msgstr "Kan inte spara ospårade filer" -#: builtin/stash.c:1190 builtin/stash.c:1199 +#: builtin/stash.c:1189 builtin/stash.c:1198 msgid "Cannot save the current worktree state" msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" -#: builtin/stash.c:1227 +#: builtin/stash.c:1226 msgid "Cannot record working tree state" msgstr "Kan inte registrera tillstånd för arbetskatalog" -#: builtin/stash.c:1276 +#: builtin/stash.c:1275 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:1292 +#: builtin/stash.c:1291 msgid "Did you forget to 'git add'?" msgstr "Glömde du använda \"git add\"?" -#: builtin/stash.c:1307 +#: builtin/stash.c:1306 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" -#: builtin/stash.c:1314 +#: builtin/stash.c:1313 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: builtin/stash.c:1329 +#: builtin/stash.c:1328 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" -#: builtin/stash.c:1334 +#: builtin/stash.c:1333 #, c-format msgid "Saved working directory and index state %s" msgstr "Sparade arbetskatalogen och indexstatus %s" -#: builtin/stash.c:1424 +#: builtin/stash.c:1423 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: builtin/stash.c:1463 builtin/stash.c:1528 +#: builtin/stash.c:1462 builtin/stash.c:1527 msgid "keep index" msgstr "behåll indexet" -#: builtin/stash.c:1465 builtin/stash.c:1530 +#: builtin/stash.c:1464 builtin/stash.c:1529 msgid "stash in patch mode" msgstr "\"stash\" i \"patch\"-läge" -#: builtin/stash.c:1466 builtin/stash.c:1531 +#: builtin/stash.c:1465 builtin/stash.c:1530 msgid "quiet mode" msgstr "tyst läge" -#: builtin/stash.c:1468 builtin/stash.c:1533 +#: builtin/stash.c:1467 builtin/stash.c:1532 msgid "include untracked files in stash" msgstr "ta med ospårade filer i \"stash\"" -#: builtin/stash.c:1470 builtin/stash.c:1535 +#: builtin/stash.c:1469 builtin/stash.c:1534 msgid "include ignore files" msgstr "ta med ignorerade filer" -#: builtin/stash.c:1570 +#: builtin/stash.c:1569 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -21897,7 +22013,7 @@ msgstr "git submodule--helper config --unset <namn>" msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2665 git-submodule.sh:151 +#: builtin/submodule--helper.c:2665 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "se till att .gitmodules finns i arbetskatalogen" @@ -21936,7 +22052,7 @@ msgstr "--branch eller --default krävs" msgid "--branch and --default are mutually exclusive" msgstr "--branch och --default är ömsesidigt uteslutande" -#: builtin/submodule--helper.c:2792 git.c:438 git.c:710 +#: builtin/submodule--helper.c:2792 git.c:438 git.c:711 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" @@ -21967,11 +22083,11 @@ msgstr "ta bort symbolisk referens" msgid "shorten ref output" msgstr "förkorta ref-utdata" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 msgid "reason" msgstr "skäl" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 msgid "reason of the update" msgstr "skäl till uppdateringen" @@ -22119,7 +22235,7 @@ msgstr "använd annan nyckel för att signera taggen" msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:422 builtin/update-ref.c:492 +#: builtin/tag.c:422 builtin/update-ref.c:505 msgid "create a reflog" msgstr "skapa en reflog" @@ -22469,19 +22585,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:487 +#: builtin/update-ref.c:500 msgid "delete the reference" msgstr "ta bort referensen" -#: builtin/update-ref.c:489 +#: builtin/update-ref.c:502 msgid "update <refname> not the one it points to" msgstr "uppdatera <refnamn> inte det den pekar på" -#: builtin/update-ref.c:490 +#: builtin/update-ref.c:503 msgid "stdin has NUL-terminated arguments" msgstr "standard in har NUL-terminerade argument" -#: builtin/update-ref.c:491 +#: builtin/update-ref.c:504 msgid "read updates from stdin" msgstr "läs uppdateringar från standard in" @@ -22573,7 +22689,7 @@ msgstr "git worktree remove [<flaggor>] <arbetskatalog>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <sökväg>" -#: builtin/worktree.c:60 builtin/worktree.c:970 +#: builtin/worktree.c:60 builtin/worktree.c:973 #, c-format msgid "failed to delete '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -22699,7 +22815,7 @@ msgstr "ställ in spårningsläge (se git-branch(1))" #: builtin/worktree.c:566 msgid "try to match the new branch name with a remote-tracking branch" -msgstr "försök matcha namn på ny gren mot en fjärrspårande gren" +msgstr "försök träffa namn på ny gren mot en fjärrspårande gren" #: builtin/worktree.c:574 msgid "-b, -B, and --detach are mutually exclusive" @@ -22709,54 +22825,54 @@ msgstr "-b, -B och --detach är ömsesidigt uteslutande" 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:755 +#: builtin/worktree.c:758 msgid "reason for locking" msgstr "orsak till lås" -#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 -#: builtin/worktree.c:998 +#: builtin/worktree.c:770 builtin/worktree.c:803 builtin/worktree.c:877 +#: builtin/worktree.c:1001 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:769 builtin/worktree.c:802 +#: builtin/worktree.c:772 builtin/worktree.c:805 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:774 +#: builtin/worktree.c:777 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:776 +#: builtin/worktree.c:779 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:804 +#: builtin/worktree.c:807 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" -#: builtin/worktree.c:845 +#: builtin/worktree.c:848 msgid "working trees containing submodules cannot be moved or removed" msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort" -#: builtin/worktree.c:853 +#: builtin/worktree.c:856 msgid "force move even if worktree is dirty or locked" msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst" -#: builtin/worktree.c:876 builtin/worktree.c:1000 +#: builtin/worktree.c:879 builtin/worktree.c:1003 #, c-format msgid "'%s' is a main working tree" msgstr "\"%s\" är inte en huvudarbetskatalog" -#: builtin/worktree.c:881 +#: builtin/worktree.c:884 #, c-format msgid "could not figure out destination name from '%s'" msgstr "kunde inte lista ut målnamn från \"%s\"" -#: builtin/worktree.c:894 +#: builtin/worktree.c:897 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -22765,7 +22881,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:896 +#: builtin/worktree.c:899 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -22773,38 +22889,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:899 +#: builtin/worktree.c:902 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s" -#: builtin/worktree.c:904 +#: builtin/worktree.c:907 #, c-format msgid "failed to move '%s' to '%s'" msgstr "misslyckades flytta \"%s\" till \"%s\"" -#: builtin/worktree.c:950 +#: builtin/worktree.c:953 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "misslyckades köra \"git status\" på \"%s\"" -#: builtin/worktree.c:954 +#: builtin/worktree.c:957 #, 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:959 +#: builtin/worktree.c:962 #, 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:982 +#: builtin/worktree.c:985 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:1005 +#: builtin/worktree.c:1008 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -22813,7 +22929,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:1007 +#: builtin/worktree.c:1010 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -22821,17 +22937,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:1010 +#: builtin/worktree.c:1013 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s" -#: builtin/worktree.c:1034 +#: builtin/worktree.c:1037 #, c-format msgid "repair: %s: %s" msgstr "reparera: %s: %s" -#: builtin/worktree.c:1037 +#: builtin/worktree.c:1040 #, c-format msgid "error: %s: %s" msgstr "fel: %s: %s" @@ -22862,6 +22978,14 @@ msgstr "" msgid "not a git repository" msgstr "inte ett git-arkiv" +#: t/helper/test-fast-rebase.c:141 +msgid "unhandled options" +msgstr "flaggor som inte hanterats" + +#: t/helper/test-fast-rebase.c:146 +msgid "error preparing revisions" +msgstr "fel när revisioner skulle förberedas" + #: t/helper/test-reach.c:154 #, c-format msgid "commit %s is not marked reachable" @@ -22979,17 +23103,17 @@ msgstr "okänt skrivfel på standard ut" msgid "close failed on standard output" msgstr "stäng misslyckades på standard ut" -#: git.c:819 +#: git.c:820 #, 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:869 +#: git.c:870 #, c-format msgid "cannot handle %s as a builtin" msgstr "kan inte hantera %s som inbyggd" -#: git.c:882 +#: git.c:883 #, c-format msgid "" "usage: %s\n" @@ -22998,13 +23122,13 @@ msgstr "" "användning: %s\n" "\n" -#: git.c:902 +#: git.c:903 #, 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:914 +#: git.c:915 #, c-format msgid "failed to run command '%s': %s\n" msgstr "misslyckades köra kommandot \"%s\": %s\n" @@ -23056,134 +23180,134 @@ msgstr "" " bad om: %s\n" " omdirigering: %s" -#: remote-curl.c:174 +#: remote-curl.c:183 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "felaktig citering på värde för push-option: \"%s\"" -#: remote-curl.c:298 +#: remote-curl.c:307 #, 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:399 +#: remote-curl.c:408 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:430 +#: remote-curl.c:439 #, c-format msgid "invalid server response; got '%s'" msgstr "ogiltigt svar från servern; fick \"%s\"" -#: remote-curl.c:490 +#: remote-curl.c:499 #, c-format msgid "repository '%s' not found" msgstr "arkivet \"%s\" hittades inte" -#: remote-curl.c:494 +#: remote-curl.c:503 #, c-format msgid "Authentication failed for '%s'" msgstr "Autentisering misslyckades \"%s\"" -#: remote-curl.c:498 +#: remote-curl.c:507 #, c-format msgid "unable to access '%s': %s" msgstr "kan inte komma åt \"%s\": %s" -#: remote-curl.c:504 +#: remote-curl.c:513 #, c-format msgid "redirecting to %s" msgstr "omdirigerar till %s" -#: remote-curl.c:633 +#: remote-curl.c:642 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:645 +#: remote-curl.c:654 msgid "remote server sent stateless separator" msgstr "fjärrservern sände tillståndslös avdelare" -#: remote-curl.c:715 +#: remote-curl.c:724 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:745 +#: remote-curl.c:754 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "remote-curl: felaktig radlängdstecken: %.4s" -#: remote-curl.c:747 +#: remote-curl.c:756 msgid "remote-curl: unexpected response end packet" msgstr "remote-curl: oväntat svarsavslutningspaketet" -#: remote-curl.c:823 +#: remote-curl.c:832 #, c-format msgid "RPC failed; %s" msgstr "RPC misslyckades; %s" -#: remote-curl.c:863 +#: remote-curl.c:872 msgid "cannot handle pushes this big" msgstr "kan inte hantera så stora sändningar" -#: remote-curl.c:978 +#: remote-curl.c:987 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "kan inte packa upp anrop; zlib-deflate-fel %d" -#: remote-curl.c:982 +#: remote-curl.c:991 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "kan inte packa upp anrop; zlib-slutfel %d" -#: remote-curl.c:1032 +#: remote-curl.c:1041 #, c-format msgid "%d bytes of length header were received" msgstr "%d byte av längd-huvudet togs emot" -#: remote-curl.c:1034 +#: remote-curl.c:1043 #, c-format msgid "%d bytes of body are still expected" msgstr "%d byte av kroppen väntas fortfarande" -#: remote-curl.c:1123 +#: remote-curl.c:1132 msgid "dumb http transport does not support shallow capabilities" msgstr "dum http-transport stöder inte grunda arkiv" -#: remote-curl.c:1138 +#: remote-curl.c:1147 msgid "fetch failed." msgstr "mottagning misslyckades." -#: remote-curl.c:1184 +#: remote-curl.c:1193 msgid "cannot fetch by sha1 over smart http" msgstr "kan inte hämta med sha1 över smart http" -#: remote-curl.c:1228 remote-curl.c:1234 +#: remote-curl.c:1237 remote-curl.c:1243 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "protokollfel: förväntade sha/ref, fick \"%s\"" -#: remote-curl.c:1246 remote-curl.c:1361 +#: remote-curl.c:1255 remote-curl.c:1373 #, c-format msgid "http transport does not support %s" msgstr "http-transporten stöder inte %s" -#: remote-curl.c:1282 +#: remote-curl.c:1291 msgid "git-http-push failed" msgstr "git-http-push misslyckades" -#: remote-curl.c:1467 +#: remote-curl.c:1479 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: användning: git remote-curl <fjärr> [<url>]" -#: remote-curl.c:1499 +#: remote-curl.c:1511 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:1506 +#: remote-curl.c:1518 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: försökte ta emot utan lokalt arkiv" -#: remote-curl.c:1547 +#: remote-curl.c:1559 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: okänt kommando \"%s\" från git" @@ -23455,175 +23579,174 @@ msgid "Output information on each ref" msgstr "Visa information för varje referens" #: command-list.h:99 +msgid "Run a Git command on a list of repositories" +msgstr "Kör ett Git-kommando på en lista över arkiv" + +#: command-list.h:100 msgid "Prepare patches for e-mail submission" msgstr "Förbered patchar för insändning via e-post" -#: command-list.h:100 +#: command-list.h:101 msgid "Verifies the connectivity and validity of the objects in the database" msgstr "Bekräftar konnektivitet och validitet för objektet i databasen" -#: command-list.h:101 +#: command-list.h:102 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "Städa onödiga filer och optimera det lokala arkivet" -#: command-list.h:102 +#: command-list.h:103 msgid "Extract commit ID from an archive created using git-archive" msgstr "Hämta inchecknings-id från ett arkiv skapat med git-archive" -#: command-list.h:103 +#: command-list.h:104 msgid "Print lines matching a pattern" msgstr "Visa rader som motsvarar mönster" -#: command-list.h:104 +#: command-list.h:105 msgid "A portable graphical interface to Git" msgstr "Ett portabelt grafiskt gränssnitt för Git" -#: command-list.h:105 +#: command-list.h:106 msgid "Compute object ID and optionally creates a blob from a file" msgstr "Beräkna objekt-id och möjligen skapa en blob från en fil" -#: command-list.h:106 +#: command-list.h:107 msgid "Display help information about Git" msgstr "Visa hjälpinformation om Git" -#: command-list.h:107 +#: command-list.h:108 msgid "Server side implementation of Git over HTTP" msgstr "Serversideimplementation av Git över HTTP" -#: command-list.h:108 +#: command-list.h:109 msgid "Download from a remote Git repository via HTTP" msgstr "Hämta objekt och referenser från annat Git-arkiv över HTTP" -#: command-list.h:109 +#: command-list.h:110 msgid "Push objects over HTTP/DAV to another repository" msgstr "Sänd objekt över HTTP/DAV till ett annat arkiv" -#: command-list.h:110 +#: command-list.h:111 msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "Sänd en samling patchar från stdin till en IMAP-mapp" -#: command-list.h:111 +#: command-list.h:112 msgid "Build pack index file for an existing packed archive" msgstr "SKapa pack-indexfiler för ett befintligt packat arkiv" -#: command-list.h:112 +#: command-list.h:113 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Skapa tomt Git-arkiv eller ominitiera ett befintligt" -#: command-list.h:113 +#: command-list.h:114 msgid "Instantly browse your working repository in gitweb" msgstr "Omedelbart bläddra i din arbetskatalog med gitweb" -#: command-list.h:114 +#: command-list.h:115 msgid "Add or parse structured information in commit messages" msgstr "" "Lägg till eller tolka strukturerad information i incheckningsmeddelanden" -#: command-list.h:115 +#: command-list.h:116 msgid "The Git repository browser" msgstr "Bläddraren för Git-arkiv" -#: command-list.h:116 +#: command-list.h:117 msgid "Show commit logs" msgstr "Visa incheckningsloggar" -#: command-list.h:117 +#: command-list.h:118 msgid "Show information about files in the index and the working tree" msgstr "Visa information om filer i indexet och arbetskatalogen" -#: command-list.h:118 +#: command-list.h:119 msgid "List references in a remote repository" msgstr "Lista referenser i ett fjärrarkiv" -#: command-list.h:119 +#: command-list.h:120 msgid "List the contents of a tree object" msgstr "Visa innehållet i ett trädobjekt" -#: command-list.h:120 +#: command-list.h:121 msgid "Extracts patch and authorship from a single e-mail message" msgstr "Hämta patch och ägarskap från ett enkelt e-postmeddelande" -#: command-list.h:121 +#: command-list.h:122 msgid "Simple UNIX mbox splitter program" msgstr "Enkelt program för att dela en UNIX mbox" -#: command-list.h:122 +#: command-list.h:123 msgid "Run tasks to optimize Git repository data" msgstr "Utför uppgifter för att optimera Git-arkivdata" -#: command-list.h:123 +#: command-list.h:124 msgid "Join two or more development histories together" msgstr "Slå ihop två eller flera utvecklingshistorier" -#: command-list.h:124 +#: command-list.h:125 msgid "Find as good common ancestors as possible for a merge" msgstr "Hitta en så bra anfader som möjligt för sammanslagning" -#: command-list.h:125 +#: command-list.h:126 msgid "Run a three-way file merge" msgstr "Kör en trevägs-filsammanslagning" -#: command-list.h:126 +#: command-list.h:127 msgid "Run a merge for files needing merging" msgstr "Kör en sammanslagning för filer som behöver det" -#: command-list.h:127 +#: command-list.h:128 msgid "The standard helper program to use with git-merge-index" msgstr "Förvalt hjälpprogram att använda tillsammans med git-merge-index" -#: command-list.h:128 +#: command-list.h:129 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "Kör verktyg för lösning av sammanslagningskonflikter" -#: command-list.h:129 +#: command-list.h:130 msgid "Show three-way merge without touching index" msgstr "Visa trevägssammanslagning utan att röra indexet" -#: command-list.h:130 +#: command-list.h:131 msgid "Write and verify multi-pack-indexes" msgstr "Skriv och verifiera multi-pack-index" -#: command-list.h:131 +#: command-list.h:132 msgid "Creates a tag object" msgstr "Skapar ett taggobjekt" -#: command-list.h:132 +#: command-list.h:133 msgid "Build a tree-object from ls-tree formatted text" msgstr "Bygg ett trädobjekt från ls-tree-formaterad text" -#: command-list.h:133 +#: command-list.h:134 msgid "Move or rename a file, a directory, or a symlink" msgstr "Flytta eller byt namn på en fil, katalog eller symbolisk länk" -#: command-list.h:134 +#: command-list.h:135 msgid "Find symbolic names for given revs" msgstr "Hitta symboliska namn för givna referenser" -#: command-list.h:135 +#: command-list.h:136 msgid "Add or inspect object notes" msgstr "Lägg till eller inspektera objektanteckningar" -#: command-list.h:136 +#: command-list.h:137 msgid "Import from and submit to Perforce repositories" msgstr "Importera från eller sänd till Perforce-arkiv" -#: command-list.h:137 +#: command-list.h:138 msgid "Create a packed archive of objects" msgstr "Skapa ett packat arkiv med objekt" -#: command-list.h:138 +#: command-list.h:139 msgid "Find redundant pack files" msgstr "Hitta redundanta pack-filer" -#: command-list.h:139 +#: command-list.h:140 msgid "Pack heads and tags for efficient repository access" msgstr "Packa huvuden och taggar för effektiv arkivåtkomst" -#: command-list.h:140 -msgid "Routines to help parsing remote repository access parameters" -msgstr "" -"Rutiner för att göra det lättare att tolka åtkomstparametrar för fjärrarkiv" - #: command-list.h:141 msgid "Compute unique ID for a patch" msgstr "Beräkna unik ID för en patch" @@ -23932,49 +24055,34 @@ msgstr "Introduktion till Git" msgid "An overview of recommended workflows with Git" msgstr "Översikt över rekommenderade arbetsflöden med Git" -#: git-bisect.sh:79 +#: git-bisect.sh:48 #, sh-format msgid "Bad rev input: $arg" msgstr "Felaktig rev-indata: $arg" -#: git-bisect.sh:99 -#, sh-format -msgid "Bad rev input: $bisected_head" -msgstr "Felaktig rev-indata: $bisected_head" - -#: git-bisect.sh:108 -#, sh-format -msgid "Bad rev input: $rev" -msgstr "Felaktig rev-indata: $rev" - -#: git-bisect.sh:117 -#, sh-format -msgid "'git bisect $TERM_BAD' can take only one argument." -msgstr "\"git bisect $TERM_BAD\" kan bara ta ett argument." - -#: git-bisect.sh:149 +#: git-bisect.sh:82 msgid "No logfile given" msgstr "Ingen loggfil angiven" -#: git-bisect.sh:150 +#: git-bisect.sh:83 #, sh-format msgid "cannot read $file for replaying" msgstr "kan inte läsa $file för uppspelning" -#: git-bisect.sh:173 +#: git-bisect.sh:105 msgid "?? what are you talking about?" msgstr "?? vad menar du?" -#: git-bisect.sh:183 +#: git-bisect.sh:115 msgid "bisect run failed: no command provided." msgstr "bisect-körning misslyckades: inget kommando gavs." -#: git-bisect.sh:188 +#: git-bisect.sh:120 #, sh-format msgid "running $command" msgstr "kör $command" -#: git-bisect.sh:195 +#: git-bisect.sh:127 #, sh-format msgid "" "bisect run failed:\n" @@ -23983,24 +24091,24 @@ msgstr "" "\"bisect\"-körningen misslyckades:\n" "felkod $res från \"$command\" är < 0 eller >= 128" -#: git-bisect.sh:221 +#: git-bisect.sh:152 msgid "bisect run cannot continue any more" msgstr "\"bisect\"-körningen kan inte fortsätta längre" -#: git-bisect.sh:227 +#: git-bisect.sh:158 #, sh-format msgid "" "bisect run failed:\n" -"'bisect_state $state' exited with error code $res" +"'bisect-state $state' exited with error code $res" msgstr "" "\"bisect\"-körningen misslyckades:\n" -"\"bisect_state $state\" avslutades med felkoden $res" +"\"bisect-state $state\" avslutades med felkoden $res" -#: git-bisect.sh:234 +#: git-bisect.sh:165 msgid "bisect run success" msgstr "\"bisect\"-körningen lyckades" -#: git-bisect.sh:242 +#: git-bisect.sh:173 msgid "We are not bisecting." msgstr "Vi utför ingen bisect för tillfället." @@ -24044,46 +24152,46 @@ 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:180 +#: 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:190 +#: 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:209 +#: git-submodule.sh:208 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:212 +#: 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:219 +#: 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:250 +#: 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:252 +#: 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:260 +#: 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:262 +#: git-submodule.sh:261 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -24101,37 +24209,37 @@ msgstr "" "arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n" "flaggan \"--name\"." -#: git-submodule.sh:268 +#: 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:280 +#: git-submodule.sh:279 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:285 +#: git-submodule.sh:284 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:294 +#: git-submodule.sh:293 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:567 +#: git-submodule.sh:568 #, 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:577 +#: git-submodule.sh:578 #, 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:582 +#: git-submodule.sh:583 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -24140,7 +24248,7 @@ msgstr "" "Kan inte hitta aktuell revision för ${remote_name}/${branch} i " "undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:600 +#: git-submodule.sh:601 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -24149,7 +24257,7 @@ msgstr "" "Kan inte hämta i undermodulsökväg \"$displaypath\"; försökte hämta $sha1 " "direkt:" -#: git-submodule.sh:606 +#: git-submodule.sh:607 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -24158,57 +24266,52 @@ msgstr "" "Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. " "Direkt hämtning av incheckningen misslyckades." -#: git-submodule.sh:613 +#: 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:614 +#: git-submodule.sh:615 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:618 +#: 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:619 +#: 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:624 +#: 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:625 +#: git-submodule.sh:626 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:630 +#: 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:631 +#: git-submodule.sh:632 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" -#: git-submodule.sh:662 +#: git-submodule.sh:663 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-parse-remote.sh:89 -#, sh-format -msgid "See git-${cmd}(1) for details." -msgstr "Se git-${cmd}(1) för detaljer." - #: git-rebase--preserve-merges.sh:109 msgid "Applied autostash." msgstr "Tillämpade autostash." @@ -24601,14 +24704,14 @@ msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:634 +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "rörde %d sökväg\n" msgstr[1] "rörde %d sökvägar\n" -#: git-add--interactive.perl:1058 +#: git-add--interactive.perl:1056 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -24616,7 +24719,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "köas omedelbart." -#: git-add--interactive.perl:1061 +#: git-add--interactive.perl:1059 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -24624,7 +24727,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "läggas till i \"stash\" omedelbart." -#: git-add--interactive.perl:1064 +#: git-add--interactive.perl:1062 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -24632,8 +24735,8 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "tas bort från kön omedelbart." -#: git-add--interactive.perl:1067 git-add--interactive.perl:1076 -#: git-add--interactive.perl:1082 +#: git-add--interactive.perl:1065 git-add--interactive.perl:1074 +#: git-add--interactive.perl:1080 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -24641,8 +24744,8 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "markeras för applicering omedelbart." -#: git-add--interactive.perl:1070 git-add--interactive.perl:1073 -#: git-add--interactive.perl:1079 +#: git-add--interactive.perl:1068 git-add--interactive.perl:1071 +#: git-add--interactive.perl:1077 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -24650,12 +24753,12 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "markeras för kasta omedelbart." -#: git-add--interactive.perl:1116 +#: git-add--interactive.perl:1114 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s" -#: git-add--interactive.perl:1123 +#: git-add--interactive.perl:1121 #, perl-format msgid "" "---\n" @@ -24668,12 +24771,12 @@ msgstr "" "Ta bort \"%s\" rader genom att radera dem.\n" "Rader som börjar med %s kommer att tas bort.\n" -#: git-add--interactive.perl:1145 +#: git-add--interactive.perl:1143 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s" -#: git-add--interactive.perl:1253 +#: git-add--interactive.perl:1251 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -24687,7 +24790,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:1259 +#: git-add--interactive.perl:1257 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -24701,7 +24804,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:1265 +#: git-add--interactive.perl:1263 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -24715,7 +24818,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:1271 +#: git-add--interactive.perl:1269 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -24729,7 +24832,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:1277 git-add--interactive.perl:1295 +#: git-add--interactive.perl:1275 git-add--interactive.perl:1293 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -24743,7 +24846,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:1283 +#: git-add--interactive.perl:1281 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -24757,7 +24860,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:1289 +#: git-add--interactive.perl:1287 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -24771,7 +24874,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:1301 +#: git-add--interactive.perl:1299 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -24785,7 +24888,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:1316 +#: git-add--interactive.perl:1314 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -24807,90 +24910,90 @@ msgstr "" "e - redigera aktuellt stycke manuellt\n" "? - visa hjälp\n" -#: git-add--interactive.perl:1347 +#: git-add--interactive.perl:1345 msgid "The selected hunks do not apply to the index!\n" msgstr "Markerade stycken kan inte appliceras på indexet!\n" -#: git-add--interactive.perl:1362 +#: git-add--interactive.perl:1360 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorerar ej sammanslagen: %s\n" -#: git-add--interactive.perl:1481 +#: git-add--interactive.perl:1479 #, 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:1482 +#: git-add--interactive.perl:1480 #, 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:1483 +#: git-add--interactive.perl:1481 #, 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:1484 +#: git-add--interactive.perl:1482 #, 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:1601 +#: git-add--interactive.perl:1599 msgid "No other hunks to goto\n" msgstr "Inga andra stycken att gå till\n" -#: git-add--interactive.perl:1619 +#: git-add--interactive.perl:1617 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Ogiltigt siffervärde: \"%s\"\n" -#: git-add--interactive.perl:1624 +#: git-add--interactive.perl:1622 #, 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:1659 +#: git-add--interactive.perl:1657 msgid "No other hunks to search\n" msgstr "Inga andra stycken att söka efter\n" -#: git-add--interactive.perl:1676 +#: git-add--interactive.perl:1674 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n" -#: git-add--interactive.perl:1686 +#: git-add--interactive.perl:1684 msgid "No hunk matches the given pattern\n" msgstr "Inga stycken motsvarar givet mönster\n" -#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 +#: git-add--interactive.perl:1696 git-add--interactive.perl:1718 msgid "No previous hunk\n" msgstr "Inget föregående stycke\n" -#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 +#: git-add--interactive.perl:1705 git-add--interactive.perl:1724 msgid "No next hunk\n" msgstr "Inget följande stycke\n" -#: git-add--interactive.perl:1732 +#: git-add--interactive.perl:1730 msgid "Sorry, cannot split this hunk\n" msgstr "Beklagar, kan inte dela stycket\n" -#: git-add--interactive.perl:1738 +#: git-add--interactive.perl:1736 #, 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:1748 +#: git-add--interactive.perl:1746 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:1813 +#: git-add--interactive.perl:1811 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -24907,19 +25010,19 @@ msgstr "" "diff - visa diff mellan HEAD och index\n" "add untracked - lägg till innehåll i ospårade filer till köade ändringar\n" -#: git-add--interactive.perl:1830 git-add--interactive.perl:1835 -#: git-add--interactive.perl:1838 git-add--interactive.perl:1845 -#: git-add--interactive.perl:1848 git-add--interactive.perl:1855 -#: git-add--interactive.perl:1859 git-add--interactive.perl:1865 +#: 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 msgid "missing --" msgstr "saknad --" -#: git-add--interactive.perl:1861 +#: git-add--interactive.perl:1866 #, perl-format msgid "unknown --patch mode: %s" msgstr "okänt läge för --patch: %s" -#: git-add--interactive.perl:1867 git-add--interactive.perl:1873 +#: git-add--interactive.perl:1872 git-add--interactive.perl:1878 #, perl-format msgid "invalid argument %s, expecting --" msgstr "felaktigt argument %s, förväntar --" @@ -25301,6 +25404,112 @@ msgstr "" msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "store only" +#~ msgstr "endast spara" + +#~ msgid "compress faster" +#~ msgstr "komprimera snabbare" + +#~ msgid "compress better" +#~ msgstr "komprimera bättre" + +#~ msgid "unexpected duplicate commit id %s" +#~ msgstr "oväntat duplicerat inchecknings-id %s" + +#~ msgid "error preparing packfile from multi-pack-index" +#~ msgstr "fel när paketfiler från multi-pack-index skulle förberedas" + +#~ msgid "%s: not a valid OID" +#~ msgstr "%s: inte ett giltigt OID" + +#~ msgid "invalid committer '%s'" +#~ msgstr "ogiltig incheckare %s" + +#~ msgid "invalid committer: %s" +#~ msgstr "ogiltig incheckare: %s" + +#~ msgid "git bisect--helper --next-all" +#~ msgstr "git bisect--helper --next-all" + +#~ msgid "git bisect--helper --write-terms <bad_term> <good_term>" +#~ msgstr "git bisect--helper --write-terms <term-för-fel> <term-för-rätt>" + +#~ msgid "git bisect--helper --bisect-clean-state" +#~ msgstr "git bisect--helper --bisect-clean-state" + +#~ msgid "git bisect--helper --bisect-autostart" +#~ msgstr "git bisect--helper --bisect-autostart" + +#~ msgid "perform 'git bisect next'" +#~ msgstr "utför 'git bisect next'" + +#~ msgid "write the terms to .git/BISECT_TERMS" +#~ msgstr "skriv termerna i .git/BISECT_TERMS" + +#~ msgid "cleanup the bisection state" +#~ msgstr "städar upp bisect-tillstånd" + +#~ msgid "check for expected revs" +#~ msgstr "kontrollera för förväntade versioner" + +#~ msgid "start the bisection if it has not yet been started" +#~ msgstr "påbörja bisect om det inte redan har startats" + +#~ msgid "--write-terms requires two arguments" +#~ msgstr "--write-terms kräver två argument" + +#~ msgid "--bisect-clean-state requires no arguments" +#~ msgstr "--bisect-clean-state tar inga argument" + +#~ msgid "--bisect-autostart does not accept arguments" +#~ msgstr "--bisect-autostart tar inga argument" + +#~ msgid "n,m" +#~ msgstr "n,m" + +#~ msgid "Process line range n,m in file, counting from 1" +#~ msgstr "Behandla radintervallet n,m i filen, med början på 1" + +#~ msgid "name of output directory is too long" +#~ msgstr "namnet på utdatakatalogen är för långt" + +#~ msgid "standard output, or directory, which one?" +#~ msgstr "standard ut, eller katalog, vilken ska det vara?" + +#~ msgid "" +#~ "WARNING: Some packs in use have been renamed by\n" +#~ "WARNING: prefixing old- to their name, in order to\n" +#~ "WARNING: replace them with the new version of the\n" +#~ "WARNING: file. But the operation failed, and the\n" +#~ "WARNING: attempt to rename them back to their\n" +#~ "WARNING: original names also failed.\n" +#~ "WARNING: Please rename them in %s manually:\n" +#~ msgstr "" +#~ "VARNING: Namnen på några paket har bytts genom att\n" +#~ "VARNING: lägga till old- före namnen, för att byta\n" +#~ "VARNING: dem mot den nya versionen av filen. Men\n" +#~ "VARNING: operationen misslyckades, och försöket att\n" +#~ "VARNING: byta tillbaka till det ursprungliga\n" +#~ "VARNING: namnet misslyckades också.\n" +#~ "VARNING: Byt namn på dem i %s manuellt:\n" + +#~ msgid "failed to remove '%s'" +#~ msgstr "misslyckades ta bort \"%s\"" + +#~ msgid "Routines to help parsing remote repository access parameters" +#~ msgstr "" +#~ "Rutiner för att göra det lättare att tolka åtkomstparametrar för " +#~ "fjärrarkiv" + +#~ msgid "Bad rev input: $bisected_head" +#~ msgstr "Felaktig rev-indata: $bisected_head" + +#~ msgid "Bad rev input: $rev" +#~ msgstr "Felaktig rev-indata: $rev" + +#~ msgid "See git-${cmd}(1) for details." +#~ msgstr "Se git-${cmd}(1) för detaljer." + #~ msgid "unknown hash algorithm length" #~ msgstr "okänd hashningsalgoritmlängd" @@ -25595,9 +25804,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ "$sm_path\n" #~ "Använd -f om du verkligen vill lägga till den." -#~ msgid "unable to get tree for %s" -#~ msgstr "kunde inte hämta trädet på %s" - #~ msgid "Use an experimental heuristic to improve diffs" #~ msgstr "Använd en experimentell algoritm för att förbättra diffar" @@ -25961,7 +26167,7 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ "\t%.*s" #~ msgid "BUG: returned path string doesn't match cwd?" -#~ msgstr "BUG: returnerad sökvägssträng matchar inte cwd?" +#~ msgstr "BUG: returnerad sökvägssträng motsvarar inte cwd?" #~ msgid "Error in object" #~ msgstr "Fel i objekt" @@ -26416,9 +26622,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "removing '%s' failed" #~ msgstr "misslyckades ta bort \"%s\"" -#~ msgid "Please call 'bisect_state' with at least one argument." -#~ msgstr "Anropa \"bisect_state\" med minst ett argument." - #~ msgid "" #~ "If you want to reuse this local git directory instead of cloning again " #~ "from" @@ -26919,9 +27122,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "--orphan and -b|-B are mutually exclusive" #~ msgstr "--orphan och -b|-B kan inte användas samtidigt" -#~ msgid "--orphan cannot be used with -t" -#~ msgstr "--orphan kan inte användas med -t" - #~ msgid "git checkout: -f and -m are incompatible" #~ msgstr "git checkout: -f och -m är inkompatibla" |